Skip to content

Commit 592a042

Browse files
author
jef
committed
revert debian/control change
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@15024 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent ac1fbfa commit 592a042

File tree

1 file changed

+5
-9
lines changed

1 file changed

+5
-9
lines changed

debian/control

+5-9
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Maintainer: Quantum GIS developers <qgis-developer@lists.osgeo.org>
55
Build-Depends:
66
bison,
77
cmake (>= 2.6),
8-
debhelper (>= 7),
8+
debhelper (>= 5.0.51~),
99
flex,
1010
grass-dev,
1111
libexpat1-dev,
@@ -14,20 +14,16 @@ Build-Depends:
1414
libgeos-dev (>= 3.0.0),
1515
libgsl0-dev,
1616
libpq-dev,
17-
libproj-dev,
1817
libqt4-dev (>=4.4.0),
1918
libqwt5-qt4-dev,
20-
libspatialite-dev,
2119
libsqlite3-dev,
22-
pkg-config,
20+
proj (<< 4.7.0) | libproj-dev (>= 4.7.0),
2321
pyqt4-dev-tools,
2422
python,
2523
python-central (>=0.5),
2624
python-dev,
27-
python-qt4 (>=4.1.0),
2825
python-qt4-dev (>=4.1.0),
29-
python-sip (>= 4.5.0),
30-
python-sip-dev (>= 4.5.0),
26+
python-sip4-dev (>= 4.5.0) | sip4 (>= 4.5),
3127
subversion
3228
Build-Conflicts: libqgis-dev, qgis-dev
3329
Standards-Version: 3.8.4
@@ -97,7 +93,7 @@ Description: Quantum GIS - development files
9793

9894
Package: qgis-plugin-grass
9995
Architecture: any
100-
Depends: qgis (= ${binary:Version}), qgis-plugin-grass-common (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}, grass640+42329
96+
Depends: qgis (= ${binary:Version}), qgis-plugin-grass-common (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}, grass
10197
Description: GRASS plugin for Quantum GIS
10298
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
10399
and display databases of geographic information.
@@ -120,7 +116,7 @@ Description: GRASS plugin for Quantum GIS - architecture-independent data
120116
Package: python-qgis
121117
Section: python
122118
Architecture: any
123-
Depends: python-qt4 (>=4.1.0), python-sip (>= 4.5.0), python-qgis-common (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}
119+
Depends: python-qt4 (>=4.1.0), python-sip4 (>= 4.5.0), python-qgis-common (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}
124120
Provides: ${python:Provides}
125121
XB-Python-Version: ${python:Versions}
126122
Description: Python bindings to Quantum GIS

0 commit comments

Comments
 (0)