Skip to content

Commit d09dbc7

Browse files
author
jef
committed
debian packaging fix
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@14115 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent b786f1d commit d09dbc7

File tree

1 file changed

+7
-10
lines changed

1 file changed

+7
-10
lines changed

debian/control

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,12 @@ Source: qgis
22
Section: science
33
Priority: extra
44
Maintainer: Quantum GIS developers <qgis-developer@lists.osgeo.org>
5-
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),
5+
Build-Depends: debhelper (>= 5.0.51~), libgdal1-dev, libpq-dev,
6+
libgeos-dev (>= 3.0.0), grass-dev, libsqlite3-dev, libgsl0-dev, proj (<< 4.7.0) | libproj-dev (>= 4.7.0), libexpat1-dev,
7+
flex, bison, python-dev, cmake (>= 2.6), python-sip4 (>= 4.5.0), python-central (>=0.5), python,
8+
sip4 (>= 4.5), libqt4-core (>=4.4.0), libqt4-dev (>=4.4.0), libqt4-gui (>=4.4.0),
99
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
10+
python-sip4-dev (>= 4.5.0), pyqt4-dev-tools, libqwt5-qt4-dev, libfcgi-dev, subversion
1211
Build-Conflicts: libqgis-dev, qgis-dev
1312
Standards-Version: 3.8.4
1413
XS-Python-Version: current
@@ -69,7 +68,7 @@ Description: Quantum GIS - development files
6968

7069
Package: qgis-plugin-grass
7170
Architecture: any
72-
Depends: qgis (= ${binary:Version}), qgis-plugin-grass-common (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}, grass640+42329
71+
Depends: qgis (= ${binary:Version}), qgis-plugin-grass-common (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}, grass
7372
Description: GRASS plugin for Quantum GIS
7473
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
7574
and display databases of geographic information.
@@ -80,8 +79,6 @@ Description: GRASS plugin for Quantum GIS
8079
Package: qgis-plugin-grass-common
8180
Architecture: all
8281
Depends: python
83-
Replaces: qgis-common (<< 1.5)
84-
Breaks: qgis-common (<< 1.5)
8582
Description: GRASS plugin for Quantum GIS - architecture-independent data
8683
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
8784
and display databases of geographic information.
@@ -92,7 +89,7 @@ Description: GRASS plugin for Quantum GIS - architecture-independent data
9289
Package: python-qgis
9390
Section: python
9491
Architecture: any
95-
Depends: python-qt4 (>=4.1.0), python-sip (>= 4.5.0), python-qgis-common (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}
92+
Depends: python-qt4 (>=4.1.0), python-sip4 (>= 4.5.0), python-qgis-common (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}
9693
Provides: ${python:Provides}
9794
XB-Python-Version: ${python:Versions}
9895
Description: Python bindings to Quantum GIS

0 commit comments

Comments
 (0)