[QGIS Commit] r14119 - trunk/qgis/debian

svn_qgis at osgeo.org svn_qgis at osgeo.org
Sun Aug 22 04:15:42 EDT 2010


Author: jef
Date: 2010-08-22 08:15:42 +0000 (Sun, 22 Aug 2010)
New Revision: 14119

Modified:
   trunk/qgis/debian/control.hardy
   trunk/qgis/debian/control.intrepid
   trunk/qgis/debian/control.jaunty
   trunk/qgis/debian/control.karmic
   trunk/qgis/debian/control.lenny
   trunk/qgis/debian/control.lucid
   trunk/qgis/debian/control.maverick
   trunk/qgis/debian/control.sid
   trunk/qgis/debian/control.squeeze
Log:
debian packaging fixes

Modified: trunk/qgis/debian/control.hardy
===================================================================
--- trunk/qgis/debian/control.hardy	2010-08-21 15:02:15 UTC (rev 14118)
+++ trunk/qgis/debian/control.hardy	2010-08-22 08:15:42 UTC (rev 14119)
@@ -3,9 +3,10 @@
 Priority: extra
 Maintainer: Quantum GIS developers <qgis-developer at lists.osgeo.org>
 Build-Depends: debhelper (>= 5.0.51~), libgdal1-dev, libpq-dev, 
- libgeos-dev (>= 3.0.0), grass-dev, libsqlite3-dev, libgsl0-dev, proj, libexpat1-dev, 
- flex, bison, python-dev, cmake (>=2.4.3), python-sip4 (>= 4.5.0), python-central (>=0.5), python,
- sip4 (>= 4.5), libqt4-core (>=4.2.0), libqt4-dev (>=4.2.0), libqt4-gui (>=4.2.0),
+ libgeos-dev (>= 3.0.0), grass-dev, libsqlite3-dev, libgsl0-dev, proj,
+ libexpat1-dev, flex, bison, python-dev, cmake (>=2.4.3),
+ python-sip4 (>= 4.5.0), python-central (>=0.5), python, sip4 (>= 4.5),
+ libqt4-core (>=4.2.0), libqt4-dev (>=4.2.0), libqt4-gui (>=4.2.0),
  libqt4-sql (>=4.2.0), python-qt4 (>=4.1.0), python-qt4-dev (>=4.1.0),
  python-sip4-dev (>= 4.5.0), pyqt4-dev-tools, fcgi-dev, subversion
 Build-Conflicts: libqgis-dev, qgis-dev

Modified: trunk/qgis/debian/control.intrepid
===================================================================
--- trunk/qgis/debian/control.intrepid	2010-08-21 15:02:15 UTC (rev 14118)
+++ trunk/qgis/debian/control.intrepid	2010-08-22 08:15:42 UTC (rev 14119)
@@ -3,11 +3,13 @@
 Priority: extra
 Maintainer: Quantum GIS developers <qgis-developer at lists.osgeo.org>
 Build-Depends: debhelper (>= 5.0.51~), libgdal1-dev, libpq-dev, 
- libgeos-dev (>= 3.0.0), grass-dev, libsqlite3-dev, libgsl0-dev, proj, libexpat1-dev, 
- flex, bison, python-dev, cmake (>=2.4.3), python-sip4 (>= 4.5.0), python-central (>=0.5), python,
- sip4 (>= 4.5), libqt4-core (>=4.2.0), libqt4-dev (>=4.2.0), libqt4-gui (>=4.2.0),
+ libgeos-dev (>= 3.0.0), grass-dev, libsqlite3-dev, libgsl0-dev, proj,
+ libexpat1-dev, flex, bison, python-dev, cmake (>=2.4.3),
+ python-sip4 (>= 4.5.0), python-central (>=0.5), python, sip4 (>= 4.5),
+ libqt4-core (>=4.2.0), libqt4-dev (>=4.2.0), libqt4-gui (>=4.2.0),
  libqt4-sql (>=4.2.0), python-qt4 (>=4.1.0), python-qt4-dev (>=4.1.0),
- python-sip4-dev (>= 4.5.0), pyqt4-dev-tools, libqwt5-qt4-dev, libfcgi-dev, subversion
+ python-sip4-dev (>= 4.5.0), pyqt4-dev-tools, libqwt5-qt4-dev, libfcgi-dev,
+ subversion
 Build-Conflicts: libqgis-dev, qgis-dev
 Standards-Version: 3.8.0
 XS-Python-Version: current
@@ -15,7 +17,7 @@
 
 Package: qgis
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, qgis-common (= ${source:Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}, qgis-providers (= ${binary:Version}), qgis-common (= ${source:Version})
 Recommends: qgis-plugin-grass, python-qgis
 Suggests: gpsbabel
 Conflicts: uim-qt3
@@ -59,7 +61,7 @@
  libqt4-sql (>=4.2.0), python-qt4 (>=4.1.0), python-qt4-dev (>=4.1.0),
  qt4-designer (>=4.2.0)
 Provides: qgis-dev
-Replaces: libqgis-dev, qgis-dev, libqgis1-dev
+Replaces: qgis-dev, libqgis1-dev
 Description: Quantum GIS - development files
  Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
  and display databases of geographic information.

Modified: trunk/qgis/debian/control.jaunty
===================================================================
--- trunk/qgis/debian/control.jaunty	2010-08-21 15:02:15 UTC (rev 14118)
+++ trunk/qgis/debian/control.jaunty	2010-08-22 08:15:42 UTC (rev 14119)
@@ -3,11 +3,13 @@
 Priority: extra
 Maintainer: Quantum GIS developers <qgis-developer at lists.osgeo.org>
 Build-Depends: debhelper (>= 5.0.51~), libgdal1-dev, libpq-dev, 
- libgeos-dev (>= 3.0.0), grass-dev, libsqlite3-dev, libgsl0-dev, proj, libexpat1-dev, 
- flex, bison, python-dev, cmake (>=2.4.3), python-sip4 (>= 4.5.0), python-central (>=0.5), python,
- sip4 (>= 4.5), libqt4-core (>=4.2.0), libqt4-dev (>=4.2.0), libqt4-gui (>=4.2.0),
+ libgeos-dev (>= 3.0.0), grass-dev, libsqlite3-dev, libgsl0-dev, proj,
+ libexpat1-dev, flex, bison, python-dev, cmake (>=2.4.3),
+ python-sip4 (>= 4.5.0), python-central (>=0.5), python, sip4 (>= 4.5),
+ libqt4-core (>=4.2.0), libqt4-dev (>=4.2.0), libqt4-gui (>=4.2.0),
  libqt4-sql (>=4.2.0), python-qt4 (>=4.1.0), python-qt4-dev (>=4.1.0),
- python-sip4-dev (>= 4.5.0), pyqt4-dev-tools, libqwt5-qt4-dev, libfcgi-dev, subversion
+ python-sip4-dev (>= 4.5.0), pyqt4-dev-tools, libqwt5-qt4-dev, libfcgi-dev,
+ subversion
 Build-Conflicts: libqgis-dev, qgis-dev
 Standards-Version: 3.8.0
 XS-Python-Version: current
@@ -15,7 +17,7 @@
 
 Package: qgis
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, qgis-common (= ${source:Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}, qgis-providers (= ${binary:Version}), qgis-common (= ${source:Version})
 Recommends: qgis-plugin-grass, python-qgis
 Suggests: gpsbabel
 Conflicts: uim-qt3

Modified: trunk/qgis/debian/control.karmic
===================================================================
--- trunk/qgis/debian/control.karmic	2010-08-21 15:02:15 UTC (rev 14118)
+++ trunk/qgis/debian/control.karmic	2010-08-22 08:15:42 UTC (rev 14119)
@@ -3,11 +3,13 @@
 Priority: extra
 Maintainer: Quantum GIS developers <qgis-developer at lists.osgeo.org>
 Build-Depends: debhelper (>= 5.0.51~), libgdal1-dev, libpq-dev, 
- libgeos-dev (>= 3.0.0), grass-dev, libsqlite3-dev, libgsl0-dev, proj, libexpat1-dev, 
- flex, bison, python-dev, cmake (>=2.4.3), python-sip4 (>= 4.5.0), python-central (>=0.5), python,
- sip4 (>= 4.5), libqt4-core (>=4.2.0), libqt4-dev (>=4.2.0), libqt4-gui (>=4.2.0),
+ libgeos-dev (>= 3.0.0), grass-dev, libsqlite3-dev, libgsl0-dev, proj,
+ libexpat1-dev, flex, bison, python-dev, cmake (>=2.4.3),
+ python-sip4 (>= 4.5.0), python-central (>=0.5), python, sip4 (>= 4.5),
+ libqt4-core (>=4.2.0), libqt4-dev (>=4.2.0), libqt4-gui (>=4.2.0),
  libqt4-sql (>=4.2.0), python-qt4 (>=4.1.0), python-qt4-dev (>=4.1.0),
- python-sip4-dev (>= 4.5.0), pyqt4-dev-tools, libqwt5-qt4-dev, libfcgi-dev, subversion
+ python-sip4-dev (>= 4.5.0), pyqt4-dev-tools, libqwt5-qt4-dev, libfcgi-dev,
+ subversion
 Build-Conflicts: libqgis-dev, qgis-dev
 Standards-Version: 3.8.0
 XS-Python-Version: current
@@ -15,7 +17,7 @@
 
 Package: qgis
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, qgis-common (= ${source:Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}, qgis-providers (= ${binary:Version}), qgis-common (= ${source:Version})
 Recommends: qgis-plugin-grass, python-qgis
 Suggests: gpsbabel
 Conflicts: uim-qt3

Modified: trunk/qgis/debian/control.lenny
===================================================================
--- trunk/qgis/debian/control.lenny	2010-08-21 15:02:15 UTC (rev 14118)
+++ trunk/qgis/debian/control.lenny	2010-08-22 08:15:42 UTC (rev 14119)
@@ -3,11 +3,13 @@
 Priority: extra
 Maintainer: Quantum GIS developers <qgis-developer at lists.osgeo.org>
 Build-Depends: debhelper (>= 5.0.51~), libgdal1-dev, libpq-dev, 
- libgeos-dev (>= 3.0.0), grass-dev, libsqlite3-dev, libgsl0-dev, proj, libexpat1-dev, 
- flex, bison, python-dev, cmake (>=2.4.3), python-sip4 (>= 4.5.0), python-central (>=0.5), python,
- sip4 (>= 4.5), libqt4-core (>=4.2.0), libqt4-dev (>=4.2.0), libqt4-gui (>=4.2.0),
+ libgeos-dev (>= 3.0.0), grass-dev, libsqlite3-dev, libgsl0-dev, proj,
+ libexpat1-dev, flex, bison, python-dev, cmake (>=2.4.3),
+ python-sip4 (>= 4.5.0), python-central (>=0.5), python, sip4 (>= 4.5),
+ libqt4-core (>=4.2.0), libqt4-dev (>=4.2.0), libqt4-gui (>=4.2.0),
  libqt4-sql (>=4.2.0), python-qt4 (>=4.1.0), python-qt4-dev (>=4.1.0),
- python-sip4-dev (>= 4.5.0), pyqt4-dev-tools, libqwt5-qt4-dev, pkg-config, libfcgi-dev, subversion
+ python-sip4-dev (>= 4.5.0), pyqt4-dev-tools, libqwt5-qt4-dev, pkg-config,
+ libfcgi-dev, subversion
 Build-Conflicts: libqgis-dev, qgis-dev
 Standards-Version: 3.8.0
 XS-Python-Version: current
@@ -15,7 +17,7 @@
 
 Package: qgis
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, qgis-common (= ${source:Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}, qgis-providers (= ${binary:Version}), qgis-common (= ${source:Version})
 Recommends: qgis-plugin-grass, python-qgis
 Suggests: gpsbabel
 Conflicts: uim-qt3
@@ -104,8 +106,8 @@
 Package: python-qgis-common
 Section: python
 Architecture: all
+Provides: ${python:Provides}
 Depends: gdal-bin, python-gdal
-Provides: ${python:Provides}
 XB-Python-Version: ${python:Versions}
 Description: Python bindings to Quantum GIS - architecture-independent files
  Quantum GIS is a Geographic Information System (GIS) which manages, analyzes

Modified: trunk/qgis/debian/control.lucid
===================================================================
--- trunk/qgis/debian/control.lucid	2010-08-21 15:02:15 UTC (rev 14118)
+++ trunk/qgis/debian/control.lucid	2010-08-22 08:15:42 UTC (rev 14119)
@@ -3,12 +3,11 @@
 Priority: extra
 Maintainer: Quantum GIS developers <qgis-developer at lists.osgeo.org>
 Build-Depends: debhelper (>= 7), libgdal1-dev, libpq-dev, 
- libgeos-dev (>= 3.0.0), grass-dev, libsqlite3-dev, libgsl0-dev, libproj-dev, libexpat1-dev, 
- flex, bison, python-dev, cmake (>= 2.6), python-sip (>= 4.5.0), python-central (>=0.5), python,
- libqt4-core (>=4.4.0), libqt4-dev (>=4.4.0), libqt4-gui (>=4.4.0),
- libqt4-sql (>=4.4.0), python-qt4 (>=4.1.0), python-qt4-dev (>=4.1.0),
- python-sip-dev (>= 4.5.0), pyqt4-dev-tools, libqwt5-qt4-dev, libspatialite-dev,
- libfcgi-dev, subversion
+ libgeos-dev (>= 3.0.0), grass-dev, libsqlite3-dev, libgsl0-dev, libproj-dev,
+ libexpat1-dev, flex, bison, python-dev, cmake (>= 2.6), python-sip (>= 4.5.0),  python-central (>=0.5), python, libqt4-core (>=4.4.0), libqt4-dev (>=4.4.0),
+ libqt4-gui (>=4.4.0), libqt4-sql (>=4.4.0), python-qt4 (>=4.1.0),
+ python-qt4-dev (>=4.1.0), python-sip-dev (>= 4.5.0), pyqt4-dev-tools,
+ libqwt5-qt4-dev, libspatialite-dev, libfcgi-dev, pkg-config, subversion
 Build-Conflicts: libqgis-dev, qgis-dev
 Standards-Version: 3.8.4
 XS-Python-Version: current
@@ -16,7 +15,7 @@
 
 Package: qgis
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, qgis-common (= ${source:Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}, qgis-providers (= ${binary:Version}), qgis-common (= ${source:Version})
 Recommends: qgis-plugin-grass, python-qgis
 Suggests: gpsbabel
 Conflicts: uim-qt3

Modified: trunk/qgis/debian/control.maverick
===================================================================
--- trunk/qgis/debian/control.maverick	2010-08-21 15:02:15 UTC (rev 14118)
+++ trunk/qgis/debian/control.maverick	2010-08-22 08:15:42 UTC (rev 14119)
@@ -3,12 +3,13 @@
 Priority: extra
 Maintainer: Quantum GIS developers <qgis-developer at lists.osgeo.org>
 Build-Depends: debhelper (>= 7), libgdal1-dev, libpq-dev, 
- libgeos-dev (>= 3.0.0), grass-dev, libsqlite3-dev, libgsl0-dev, libproj-dev, libexpat1-dev, 
- flex, bison, python-dev, cmake (>= 2.6), python-sip (>= 4.5.0), python-central (>=0.5), python,
- libqt4-core (>=4.4.0), libqt4-dev (>=4.4.0), libqt4-gui (>=4.4.0),
- libqt4-sql (>=4.4.0), libqtwebkit-dev,
- python-qt4 (>=4.1.0), python-qt4-dev (>=4.1.0), python-sip-dev (>= 4.5.0), pyqt4-dev-tools,
- libqwt5-qt4-dev, libspatialite-dev, subversion
+ libgeos-dev (>= 3.0.0), grass-dev, libsqlite3-dev, libgsl0-dev, libproj-dev,
+ libexpat1-dev, flex, bison, python-dev, cmake (>= 2.6), python-sip (>= 4.5.0),
+ python-central (>=0.5), python, libqt4-core (>=4.4.0), libqt4-dev (>=4.4.0),
+ libqt4-gui (>=4.4.0), libqt4-sql (>=4.4.0), libqtwebkit-dev,
+ python-qt4 (>=4.1.0), python-qt4-dev (>=4.1.0), python-sip-dev (>= 4.5.0),
+ pyqt4-dev-tools, libqwt5-qt4-dev, libspatialite-dev, libfcgi-dev, pkg-config,
+ subversion
 Build-Conflicts: libqgis-dev, qgis-dev
 Standards-Version: 3.8.4
 XS-Python-Version: current
@@ -16,7 +17,7 @@
 
 Package: qgis
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, qgis-common (= ${source:Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}, qgis-providers (= ${binary:Version}), qgis-common (= ${source:Version})
 Recommends: qgis-plugin-grass, python-qgis
 Suggests: gpsbabel
 Conflicts: uim-qt3

Modified: trunk/qgis/debian/control.sid
===================================================================
--- trunk/qgis/debian/control.sid	2010-08-21 15:02:15 UTC (rev 14118)
+++ trunk/qgis/debian/control.sid	2010-08-22 08:15:42 UTC (rev 14119)
@@ -3,12 +3,12 @@
 Priority: extra
 Maintainer: Quantum GIS developers <qgis-developer at lists.osgeo.org>
 Build-Depends: debhelper (>= 7), libgdal1-dev, libpq-dev, 
- libgeos-dev (>= 3.0.0), grass-dev, libsqlite3-dev, libgsl0-dev, libproj-dev, libexpat1-dev, 
- flex, bison, python-dev, cmake (>= 2.6), python-sip (>= 4.5.0), python-central (>=0.5), python,
- libqt4-core (>=4.4.0), libqt4-dev (>=4.4.0), libqt4-gui (>=4.4.0),
- libqt4-sql (>=4.4.0), python-qt4 (>=4.1.0), python-qt4-dev (>=4.1.0),
- python-sip-dev (>= 4.5.0), pyqt4-dev-tools, libqwt5-qt4-dev, libspatialite-dev,
- pkg-config, subversion
+ libgeos-dev (>= 3.0.0), grass-dev, libsqlite3-dev, libgsl0-dev, libproj-dev,
+ libexpat1-dev, flex, bison, python-dev, cmake (>= 2.6), python-sip (>= 4.5.0),
+ python-central (>=0.5), python, libqt4-core (>=4.4.0), libqt4-dev (>=4.4.0),
+ libqt4-gui (>=4.4.0), libqt4-sql (>=4.4.0), python-qt4 (>=4.1.0),
+ python-qt4-dev (>=4.1.0), python-sip-dev (>= 4.5.0), pyqt4-dev-tools,
+ libqwt5-qt4-dev, libspatialite-dev, libfcgi-dev, pkg-config, subversion
 Build-Conflicts: libqgis-dev, qgis-dev
 Standards-Version: 3.8.4
 XS-Python-Version: current
@@ -16,7 +16,7 @@
 
 Package: qgis
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, qgis-common (= ${source:Version}), qgis-providers (= ${binary:Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}, qgis-providers (= ${binary:Version}), qgis-common (= ${source:Version})
 Recommends: qgis-plugin-grass, python-qgis
 Suggests: gpsbabel
 Conflicts: uim-qt3

Modified: trunk/qgis/debian/control.squeeze
===================================================================
--- trunk/qgis/debian/control.squeeze	2010-08-21 15:02:15 UTC (rev 14118)
+++ trunk/qgis/debian/control.squeeze	2010-08-22 08:15:42 UTC (rev 14119)
@@ -3,12 +3,12 @@
 Priority: extra
 Maintainer: Quantum GIS developers <qgis-developer at lists.osgeo.org>
 Build-Depends: debhelper (>= 7), libgdal1-dev, libpq-dev, 
- libgeos-dev (>= 3.0.0), grass-dev, libsqlite3-dev, libgsl0-dev, libproj-dev, libexpat1-dev, 
- flex, bison, python-dev, cmake (>= 2.6), python-sip (>= 4.5.0), python-central (>=0.5), python,
- libqt4-core (>=4.4.0), libqt4-dev (>=4.4.0), libqt4-gui (>=4.4.0),
- libqt4-sql (>=4.4.0), python-qt4 (>=4.1.0), python-qt4-dev (>=4.1.0),
- python-sip-dev (>= 4.5.0), pyqt4-dev-tools, libqwt5-qt4-dev, libspatialite-dev,
- pkg-config, subversion
+ libgeos-dev (>= 3.0.0), grass-dev, libsqlite3-dev, libgsl0-dev, libproj-dev,
+ libexpat1-dev, flex, bison, python-dev, cmake (>= 2.6), python-sip (>= 4.5.0),
+ python-central (>=0.5), python, libqt4-core (>=4.4.0), libqt4-dev (>=4.4.0),
+ libqt4-gui (>=4.4.0), libqt4-sql (>=4.4.0), python-qt4 (>=4.1.0),
+ python-qt4-dev (>=4.1.0), python-sip-dev (>= 4.5.0), pyqt4-dev-tools,
+ libqwt5-qt4-dev, libspatialite-dev, libfcgi-dev, pkg-config, subversion
 Build-Conflicts: libqgis-dev, qgis-dev
 Standards-Version: 3.8.4
 XS-Python-Version: current
@@ -16,7 +16,7 @@
 
 Package: qgis
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, qgis-common (= ${source:Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}, qgis-providers (= ${binary:Version}), qgis-common (= ${source:Version})
 Recommends: qgis-plugin-grass, python-qgis
 Suggests: gpsbabel
 Conflicts: uim-qt3



More information about the QGIS-commit mailing list