Skip to content

Commit 7d90e04

Browse files
author
jef
committed
debian packaging fixes
git-svn-id: http://svn.osgeo.org/qgis/trunk@14119 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent ba51d8a commit 7d90e04

File tree

9 files changed

+62
-53
lines changed

9 files changed

+62
-53
lines changed

‎debian/control.hardy

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,10 @@ Section: science
33
Priority: extra
44
Maintainer: Quantum GIS developers <qgis-developer@lists.osgeo.org>
55
Build-Depends: debhelper (>= 5.0.51~), libgdal1-dev, libpq-dev,
6-
libgeos-dev (>= 3.0.0), grass-dev, libsqlite3-dev, libgsl0-dev, proj, libexpat1-dev,
7-
flex, bison, python-dev, cmake (>=2.4.3), python-sip4 (>= 4.5.0), python-central (>=0.5), python,
8-
sip4 (>= 4.5), libqt4-core (>=4.2.0), libqt4-dev (>=4.2.0), libqt4-gui (>=4.2.0),
6+
libgeos-dev (>= 3.0.0), grass-dev, libsqlite3-dev, libgsl0-dev, proj,
7+
libexpat1-dev, flex, bison, python-dev, cmake (>=2.4.3),
8+
python-sip4 (>= 4.5.0), python-central (>=0.5), python, sip4 (>= 4.5),
9+
libqt4-core (>=4.2.0), libqt4-dev (>=4.2.0), libqt4-gui (>=4.2.0),
910
libqt4-sql (>=4.2.0), python-qt4 (>=4.1.0), python-qt4-dev (>=4.1.0),
1011
python-sip4-dev (>= 4.5.0), pyqt4-dev-tools, fcgi-dev, subversion
1112
Build-Conflicts: libqgis-dev, qgis-dev

‎debian/control.intrepid

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,21 @@ Section: science
33
Priority: extra
44
Maintainer: Quantum GIS developers <qgis-developer@lists.osgeo.org>
55
Build-Depends: debhelper (>= 5.0.51~), libgdal1-dev, libpq-dev,
6-
libgeos-dev (>= 3.0.0), grass-dev, libsqlite3-dev, libgsl0-dev, proj, libexpat1-dev,
7-
flex, bison, python-dev, cmake (>=2.4.3), python-sip4 (>= 4.5.0), python-central (>=0.5), python,
8-
sip4 (>= 4.5), libqt4-core (>=4.2.0), libqt4-dev (>=4.2.0), libqt4-gui (>=4.2.0),
6+
libgeos-dev (>= 3.0.0), grass-dev, libsqlite3-dev, libgsl0-dev, proj,
7+
libexpat1-dev, flex, bison, python-dev, cmake (>=2.4.3),
8+
python-sip4 (>= 4.5.0), python-central (>=0.5), python, sip4 (>= 4.5),
9+
libqt4-core (>=4.2.0), libqt4-dev (>=4.2.0), libqt4-gui (>=4.2.0),
910
libqt4-sql (>=4.2.0), python-qt4 (>=4.1.0), python-qt4-dev (>=4.1.0),
10-
python-sip4-dev (>= 4.5.0), pyqt4-dev-tools, libqwt5-qt4-dev, libfcgi-dev, subversion
11+
python-sip4-dev (>= 4.5.0), pyqt4-dev-tools, libqwt5-qt4-dev, libfcgi-dev,
12+
subversion
1113
Build-Conflicts: libqgis-dev, qgis-dev
1214
Standards-Version: 3.8.0
1315
XS-Python-Version: current
1416
Homepage: http://qgis.org/
1517

1618
Package: qgis
1719
Architecture: any
18-
Depends: ${shlibs:Depends}, ${misc:Depends}, qgis-common (= ${source:Version})
20+
Depends: ${shlibs:Depends}, ${misc:Depends}, qgis-providers (= ${binary:Version}), qgis-common (= ${source:Version})
1921
Recommends: qgis-plugin-grass, python-qgis
2022
Suggests: gpsbabel
2123
Conflicts: uim-qt3
@@ -59,7 +61,7 @@ Depends: libqgis{QGIS_ABI} (= ${binary:Version}), libgdal1-dev,
5961
libqt4-sql (>=4.2.0), python-qt4 (>=4.1.0), python-qt4-dev (>=4.1.0),
6062
qt4-designer (>=4.2.0)
6163
Provides: qgis-dev
62-
Replaces: libqgis-dev, qgis-dev, libqgis1-dev
64+
Replaces: qgis-dev, libqgis1-dev
6365
Description: Quantum GIS - development files
6466
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
6567
and display databases of geographic information.

‎debian/control.jaunty

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,21 @@ Section: science
33
Priority: extra
44
Maintainer: Quantum GIS developers <qgis-developer@lists.osgeo.org>
55
Build-Depends: debhelper (>= 5.0.51~), libgdal1-dev, libpq-dev,
6-
libgeos-dev (>= 3.0.0), grass-dev, libsqlite3-dev, libgsl0-dev, proj, libexpat1-dev,
7-
flex, bison, python-dev, cmake (>=2.4.3), python-sip4 (>= 4.5.0), python-central (>=0.5), python,
8-
sip4 (>= 4.5), libqt4-core (>=4.2.0), libqt4-dev (>=4.2.0), libqt4-gui (>=4.2.0),
6+
libgeos-dev (>= 3.0.0), grass-dev, libsqlite3-dev, libgsl0-dev, proj,
7+
libexpat1-dev, flex, bison, python-dev, cmake (>=2.4.3),
8+
python-sip4 (>= 4.5.0), python-central (>=0.5), python, sip4 (>= 4.5),
9+
libqt4-core (>=4.2.0), libqt4-dev (>=4.2.0), libqt4-gui (>=4.2.0),
910
libqt4-sql (>=4.2.0), python-qt4 (>=4.1.0), python-qt4-dev (>=4.1.0),
10-
python-sip4-dev (>= 4.5.0), pyqt4-dev-tools, libqwt5-qt4-dev, libfcgi-dev, subversion
11+
python-sip4-dev (>= 4.5.0), pyqt4-dev-tools, libqwt5-qt4-dev, libfcgi-dev,
12+
subversion
1113
Build-Conflicts: libqgis-dev, qgis-dev
1214
Standards-Version: 3.8.0
1315
XS-Python-Version: current
1416
Homepage: http://qgis.org/
1517

1618
Package: qgis
1719
Architecture: any
18-
Depends: ${shlibs:Depends}, ${misc:Depends}, qgis-common (= ${source:Version})
20+
Depends: ${shlibs:Depends}, ${misc:Depends}, qgis-providers (= ${binary:Version}), qgis-common (= ${source:Version})
1921
Recommends: qgis-plugin-grass, python-qgis
2022
Suggests: gpsbabel
2123
Conflicts: uim-qt3

‎debian/control.karmic

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,21 @@ Section: science
33
Priority: extra
44
Maintainer: Quantum GIS developers <qgis-developer@lists.osgeo.org>
55
Build-Depends: debhelper (>= 5.0.51~), libgdal1-dev, libpq-dev,
6-
libgeos-dev (>= 3.0.0), grass-dev, libsqlite3-dev, libgsl0-dev, proj, libexpat1-dev,
7-
flex, bison, python-dev, cmake (>=2.4.3), python-sip4 (>= 4.5.0), python-central (>=0.5), python,
8-
sip4 (>= 4.5), libqt4-core (>=4.2.0), libqt4-dev (>=4.2.0), libqt4-gui (>=4.2.0),
6+
libgeos-dev (>= 3.0.0), grass-dev, libsqlite3-dev, libgsl0-dev, proj,
7+
libexpat1-dev, flex, bison, python-dev, cmake (>=2.4.3),
8+
python-sip4 (>= 4.5.0), python-central (>=0.5), python, sip4 (>= 4.5),
9+
libqt4-core (>=4.2.0), libqt4-dev (>=4.2.0), libqt4-gui (>=4.2.0),
910
libqt4-sql (>=4.2.0), python-qt4 (>=4.1.0), python-qt4-dev (>=4.1.0),
10-
python-sip4-dev (>= 4.5.0), pyqt4-dev-tools, libqwt5-qt4-dev, libfcgi-dev, subversion
11+
python-sip4-dev (>= 4.5.0), pyqt4-dev-tools, libqwt5-qt4-dev, libfcgi-dev,
12+
subversion
1113
Build-Conflicts: libqgis-dev, qgis-dev
1214
Standards-Version: 3.8.0
1315
XS-Python-Version: current
1416
Homepage: http://qgis.org/
1517

1618
Package: qgis
1719
Architecture: any
18-
Depends: ${shlibs:Depends}, ${misc:Depends}, qgis-common (= ${source:Version})
20+
Depends: ${shlibs:Depends}, ${misc:Depends}, qgis-providers (= ${binary:Version}), qgis-common (= ${source:Version})
1921
Recommends: qgis-plugin-grass, python-qgis
2022
Suggests: gpsbabel
2123
Conflicts: uim-qt3

‎debian/control.lenny

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,21 @@ Section: science
33
Priority: extra
44
Maintainer: Quantum GIS developers <qgis-developer@lists.osgeo.org>
55
Build-Depends: debhelper (>= 5.0.51~), libgdal1-dev, libpq-dev,
6-
libgeos-dev (>= 3.0.0), grass-dev, libsqlite3-dev, libgsl0-dev, proj, libexpat1-dev,
7-
flex, bison, python-dev, cmake (>=2.4.3), python-sip4 (>= 4.5.0), python-central (>=0.5), python,
8-
sip4 (>= 4.5), libqt4-core (>=4.2.0), libqt4-dev (>=4.2.0), libqt4-gui (>=4.2.0),
6+
libgeos-dev (>= 3.0.0), grass-dev, libsqlite3-dev, libgsl0-dev, proj,
7+
libexpat1-dev, flex, bison, python-dev, cmake (>=2.4.3),
8+
python-sip4 (>= 4.5.0), python-central (>=0.5), python, sip4 (>= 4.5),
9+
libqt4-core (>=4.2.0), libqt4-dev (>=4.2.0), libqt4-gui (>=4.2.0),
910
libqt4-sql (>=4.2.0), python-qt4 (>=4.1.0), python-qt4-dev (>=4.1.0),
10-
python-sip4-dev (>= 4.5.0), pyqt4-dev-tools, libqwt5-qt4-dev, pkg-config, libfcgi-dev, subversion
11+
python-sip4-dev (>= 4.5.0), pyqt4-dev-tools, libqwt5-qt4-dev, pkg-config,
12+
libfcgi-dev, subversion
1113
Build-Conflicts: libqgis-dev, qgis-dev
1214
Standards-Version: 3.8.0
1315
XS-Python-Version: current
1416
Homepage: http://qgis.org/
1517

1618
Package: qgis
1719
Architecture: any
18-
Depends: ${shlibs:Depends}, ${misc:Depends}, qgis-common (= ${source:Version})
20+
Depends: ${shlibs:Depends}, ${misc:Depends}, qgis-providers (= ${binary:Version}), qgis-common (= ${source:Version})
1921
Recommends: qgis-plugin-grass, python-qgis
2022
Suggests: gpsbabel
2123
Conflicts: uim-qt3
@@ -104,8 +106,8 @@ Description: Python bindings to Quantum GIS
104106
Package: python-qgis-common
105107
Section: python
106108
Architecture: all
107-
Depends: gdal-bin, python-gdal
108109
Provides: ${python:Provides}
110+
Depends: gdal-bin, python-gdal
109111
XB-Python-Version: ${python:Versions}
110112
Description: Python bindings to Quantum GIS - architecture-independent files
111113
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes

‎debian/control.lucid

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,19 @@ Section: science
33
Priority: extra
44
Maintainer: Quantum GIS developers <qgis-developer@lists.osgeo.org>
55
Build-Depends: debhelper (>= 7), libgdal1-dev, libpq-dev,
6-
libgeos-dev (>= 3.0.0), grass-dev, libsqlite3-dev, libgsl0-dev, libproj-dev, libexpat1-dev,
7-
flex, bison, python-dev, cmake (>= 2.6), python-sip (>= 4.5.0), python-central (>=0.5), python,
8-
libqt4-core (>=4.4.0), libqt4-dev (>=4.4.0), libqt4-gui (>=4.4.0),
9-
libqt4-sql (>=4.4.0), python-qt4 (>=4.1.0), python-qt4-dev (>=4.1.0),
10-
python-sip-dev (>= 4.5.0), pyqt4-dev-tools, libqwt5-qt4-dev, libspatialite-dev,
11-
libfcgi-dev, subversion
6+
libgeos-dev (>= 3.0.0), grass-dev, libsqlite3-dev, libgsl0-dev, libproj-dev,
7+
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),
8+
libqt4-gui (>=4.4.0), libqt4-sql (>=4.4.0), python-qt4 (>=4.1.0),
9+
python-qt4-dev (>=4.1.0), python-sip-dev (>= 4.5.0), pyqt4-dev-tools,
10+
libqwt5-qt4-dev, libspatialite-dev, libfcgi-dev, pkg-config, subversion
1211
Build-Conflicts: libqgis-dev, qgis-dev
1312
Standards-Version: 3.8.4
1413
XS-Python-Version: current
1514
Homepage: http://qgis.org/
1615

1716
Package: qgis
1817
Architecture: any
19-
Depends: ${shlibs:Depends}, ${misc:Depends}, qgis-common (= ${source:Version})
18+
Depends: ${shlibs:Depends}, ${misc:Depends}, qgis-providers (= ${binary:Version}), qgis-common (= ${source:Version})
2019
Recommends: qgis-plugin-grass, python-qgis
2120
Suggests: gpsbabel
2221
Conflicts: uim-qt3

‎debian/control.maverick

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,21 @@ Section: science
33
Priority: extra
44
Maintainer: Quantum GIS developers <qgis-developer@lists.osgeo.org>
55
Build-Depends: debhelper (>= 7), libgdal1-dev, libpq-dev,
6-
libgeos-dev (>= 3.0.0), grass-dev, libsqlite3-dev, libgsl0-dev, libproj-dev, libexpat1-dev,
7-
flex, bison, python-dev, cmake (>= 2.6), python-sip (>= 4.5.0), python-central (>=0.5), python,
8-
libqt4-core (>=4.4.0), libqt4-dev (>=4.4.0), libqt4-gui (>=4.4.0),
9-
libqt4-sql (>=4.4.0), libqtwebkit-dev,
10-
python-qt4 (>=4.1.0), python-qt4-dev (>=4.1.0), python-sip-dev (>= 4.5.0), pyqt4-dev-tools,
11-
libqwt5-qt4-dev, libspatialite-dev, subversion
6+
libgeos-dev (>= 3.0.0), grass-dev, libsqlite3-dev, libgsl0-dev, libproj-dev,
7+
libexpat1-dev, flex, bison, python-dev, cmake (>= 2.6), python-sip (>= 4.5.0),
8+
python-central (>=0.5), python, libqt4-core (>=4.4.0), libqt4-dev (>=4.4.0),
9+
libqt4-gui (>=4.4.0), libqt4-sql (>=4.4.0), libqtwebkit-dev,
10+
python-qt4 (>=4.1.0), python-qt4-dev (>=4.1.0), python-sip-dev (>= 4.5.0),
11+
pyqt4-dev-tools, libqwt5-qt4-dev, libspatialite-dev, libfcgi-dev, pkg-config,
12+
subversion
1213
Build-Conflicts: libqgis-dev, qgis-dev
1314
Standards-Version: 3.8.4
1415
XS-Python-Version: current
1516
Homepage: http://qgis.org/
1617

1718
Package: qgis
1819
Architecture: any
19-
Depends: ${shlibs:Depends}, ${misc:Depends}, qgis-common (= ${source:Version})
20+
Depends: ${shlibs:Depends}, ${misc:Depends}, qgis-providers (= ${binary:Version}), qgis-common (= ${source:Version})
2021
Recommends: qgis-plugin-grass, python-qgis
2122
Suggests: gpsbabel
2223
Conflicts: uim-qt3

‎debian/control.sid

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,20 @@ Section: science
33
Priority: extra
44
Maintainer: Quantum GIS developers <qgis-developer@lists.osgeo.org>
55
Build-Depends: debhelper (>= 7), libgdal1-dev, libpq-dev,
6-
libgeos-dev (>= 3.0.0), grass-dev, libsqlite3-dev, libgsl0-dev, libproj-dev, libexpat1-dev,
7-
flex, bison, python-dev, cmake (>= 2.6), python-sip (>= 4.5.0), python-central (>=0.5), python,
8-
libqt4-core (>=4.4.0), libqt4-dev (>=4.4.0), libqt4-gui (>=4.4.0),
9-
libqt4-sql (>=4.4.0), python-qt4 (>=4.1.0), python-qt4-dev (>=4.1.0),
10-
python-sip-dev (>= 4.5.0), pyqt4-dev-tools, libqwt5-qt4-dev, libspatialite-dev,
11-
pkg-config, subversion
6+
libgeos-dev (>= 3.0.0), grass-dev, libsqlite3-dev, libgsl0-dev, libproj-dev,
7+
libexpat1-dev, flex, bison, python-dev, cmake (>= 2.6), python-sip (>= 4.5.0),
8+
python-central (>=0.5), python, libqt4-core (>=4.4.0), libqt4-dev (>=4.4.0),
9+
libqt4-gui (>=4.4.0), libqt4-sql (>=4.4.0), python-qt4 (>=4.1.0),
10+
python-qt4-dev (>=4.1.0), python-sip-dev (>= 4.5.0), pyqt4-dev-tools,
11+
libqwt5-qt4-dev, libspatialite-dev, libfcgi-dev, pkg-config, subversion
1212
Build-Conflicts: libqgis-dev, qgis-dev
1313
Standards-Version: 3.8.4
1414
XS-Python-Version: current
1515
Homepage: http://qgis.org/
1616

1717
Package: qgis
1818
Architecture: any
19-
Depends: ${shlibs:Depends}, ${misc:Depends}, qgis-common (= ${source:Version}), qgis-providers (= ${binary:Version})
19+
Depends: ${shlibs:Depends}, ${misc:Depends}, qgis-providers (= ${binary:Version}), qgis-common (= ${source:Version})
2020
Recommends: qgis-plugin-grass, python-qgis
2121
Suggests: gpsbabel
2222
Conflicts: uim-qt3

‎debian/control.squeeze

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,20 @@ Section: science
33
Priority: extra
44
Maintainer: Quantum GIS developers <qgis-developer@lists.osgeo.org>
55
Build-Depends: debhelper (>= 7), libgdal1-dev, libpq-dev,
6-
libgeos-dev (>= 3.0.0), grass-dev, libsqlite3-dev, libgsl0-dev, libproj-dev, libexpat1-dev,
7-
flex, bison, python-dev, cmake (>= 2.6), python-sip (>= 4.5.0), python-central (>=0.5), python,
8-
libqt4-core (>=4.4.0), libqt4-dev (>=4.4.0), libqt4-gui (>=4.4.0),
9-
libqt4-sql (>=4.4.0), python-qt4 (>=4.1.0), python-qt4-dev (>=4.1.0),
10-
python-sip-dev (>= 4.5.0), pyqt4-dev-tools, libqwt5-qt4-dev, libspatialite-dev,
11-
pkg-config, subversion
6+
libgeos-dev (>= 3.0.0), grass-dev, libsqlite3-dev, libgsl0-dev, libproj-dev,
7+
libexpat1-dev, flex, bison, python-dev, cmake (>= 2.6), python-sip (>= 4.5.0),
8+
python-central (>=0.5), python, libqt4-core (>=4.4.0), libqt4-dev (>=4.4.0),
9+
libqt4-gui (>=4.4.0), libqt4-sql (>=4.4.0), python-qt4 (>=4.1.0),
10+
python-qt4-dev (>=4.1.0), python-sip-dev (>= 4.5.0), pyqt4-dev-tools,
11+
libqwt5-qt4-dev, libspatialite-dev, libfcgi-dev, pkg-config, subversion
1212
Build-Conflicts: libqgis-dev, qgis-dev
1313
Standards-Version: 3.8.4
1414
XS-Python-Version: current
1515
Homepage: http://qgis.org/
1616

1717
Package: qgis
1818
Architecture: any
19-
Depends: ${shlibs:Depends}, ${misc:Depends}, qgis-common (= ${source:Version})
19+
Depends: ${shlibs:Depends}, ${misc:Depends}, qgis-providers (= ${binary:Version}), qgis-common (= ${source:Version})
2020
Recommends: qgis-plugin-grass, python-qgis
2121
Suggests: gpsbabel
2222
Conflicts: uim-qt3

0 commit comments

Comments
 (0)