Skip to content

Commit be961f3

Browse files
author
wonder
committedNov 7, 2009
merge from trunk r11900:11950
git-svn-id: http://svn.osgeo.org/qgis/branches/symbology-ng-branch@11969 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent 97a84db commit be961f3

File tree

85 files changed

+89182
-63857
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

85 files changed

+89182
-63857
lines changed
 

‎DONORS

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,9 @@ Alexandre Leroux
2121
Andreas Neumann
2222
Associazione Monte Porzio Cultura
2323
Carl Nelson
24+
Christopher Kahler
2425
D R Arbib
26+
Dirk Pflugmacher
2527
David Enns|http://www.mapitout.com/
2628
Ecotrust|http://www.ecotrust.org/
2729
Emanuele Zamprogno

‎debian/control

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ Build-Depends: debhelper (>= 5.0.51~), libgdal1-dev, libpq-dev,
99
libqt4-qt3support (>=4.2.0), libqt4-sql (>=4.2.0), python-qt4 (>=4.1.0), python-qt4-dev (>=4.1.0),
1010
python-sip4-dev (>= 4.5.0), libfontconfig1-dev, libxi-dev, libxrandr-dev, libxrender-dev, libice-dev,
1111
libsm-dev, pyqt4-dev-tools
12-
Build-Conflicts: libqgis1.4.0-dev, qgis-dev
12+
Build-Conflicts: libqgis-dev, qgis-dev
1313
Standards-Version: 3.8.3
1414
XS-Python-Version: current
1515
Homepage: http://qgis.org/
@@ -50,7 +50,7 @@ Description: Quantum GIS - shared libraries
5050
This package contains the shared core and gui library that provide an
5151
interface for plugins and stand-alone applications.
5252

53-
Package: libqgis1.4.0-dev
53+
Package: libqgis-dev
5454
Architecture: any
5555
Section: libdevel
5656
Depends: libqgis1.4.0 (= ${binary:Version}), libgdal1-dev,
@@ -59,8 +59,8 @@ Depends: libqgis1.4.0 (= ${binary:Version}), libgdal1-dev,
5959
libqt4-dev (>=4.2.0), libqt4-gui (>=4.2.0), libqt4-qt3support (>=4.2.0),
6060
libqt4-sql (>=4.2.0), python-qt4 (>=4.1.0), python-qt4-dev (>=4.1.0),
6161
qt4-designer (>=4.2.0)
62-
Provides: libqgis-dev, qgis-dev
63-
Replaces: libqgis-dev, qgis-dev, libqgis1-dev
62+
Provides: qgis-dev
63+
Replaces: qgis-dev, libqgis1-dev, libqgis1.4.0-dev
6464
Description: Quantum GIS - development files
6565
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
6666
and display databases of geographic information.
@@ -70,7 +70,7 @@ Description: Quantum GIS - development files
7070

7171
Package: qgis-plugin-grass
7272
Architecture: any
73-
Depends: qgis (= ${binary:Version}), qgis-plugin-grass-common (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}, libgdal1-1.6.0-grass, grass64
73+
Depends: qgis (= ${binary:Version}), qgis-plugin-grass-common (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}, libgdal1-1.6.0-grass, grass640-5+39438
7474
Description: GRASS plugin for Quantum GIS
7575
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
7676
and display databases of geographic information.

0 commit comments

Comments
 (0)