[QGIS Commit] r14959 - trunk/qgis/debian
svn_qgis at osgeo.org
svn_qgis at osgeo.org
Tue Dec 21 07:26:36 EST 2010
Author: pcav
Date: 2010-12-21 04:26:35 -0800 (Tue, 21 Dec 2010)
New Revision: 14959
Modified:
trunk/qgis/debian/control
Log:
Revert accidental changes to debian/control
Modified: trunk/qgis/debian/control
===================================================================
--- trunk/qgis/debian/control 2010-12-21 11:27:45 UTC (rev 14958)
+++ trunk/qgis/debian/control 2010-12-21 12:26:35 UTC (rev 14959)
@@ -5,7 +5,7 @@
Build-Depends:
bison,
cmake (>= 2.6),
- debhelper (>= 7),
+ debhelper (>= 5.0.51~),
flex,
grass-dev,
libexpat1-dev,
@@ -14,20 +14,16 @@
libgeos-dev (>= 3.0.0),
libgsl0-dev,
libpq-dev,
- libproj-dev,
libqt4-dev (>=4.4.0),
libqwt5-qt4-dev,
- libspatialite-dev,
libsqlite3-dev,
- pkg-config,
+ proj (<< 4.7.0) | libproj-dev (>= 4.7.0),
pyqt4-dev-tools,
python,
python-central (>=0.5),
python-dev,
- python-qt4 (>=4.1.0),
python-qt4-dev (>=4.1.0),
- python-sip (>= 4.5.0),
- python-sip-dev (>= 4.5.0),
+ python-sip4-dev (>= 4.5.0) | sip4 (>= 4.5),
subversion
Build-Conflicts: libqgis-dev, qgis-dev
Standards-Version: 3.8.4
@@ -58,7 +54,7 @@
This package contains architecture-independent supporting data files for use
with Quantum GIS.
-Package: libqgis1.7.0
+Package: libqgis1.6.0
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
Replaces: qgis (<=0.9.2rc1), libqgis-core1, libqgis-gui1, libqgis0, libqgis1
@@ -80,7 +76,7 @@
libgsl0-dev,
libpq-dev,
libproj-dev,
- libqgis1.7.0 (= ${binary:Version}),
+ libqgis1.6.0 (= ${binary:Version}),
libqt4-dev (>=4.4.0),
libsqlite3-dev,
python-qt4 (>=4.1.0),
@@ -97,7 +93,7 @@
Package: qgis-plugin-grass
Architecture: any
-Depends: qgis (= ${binary:Version}), qgis-plugin-grass-common (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}, grass640+42329
+Depends: qgis (= ${binary:Version}), qgis-plugin-grass-common (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}, grass
Description: GRASS plugin for Quantum GIS
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
and display databases of geographic information.
@@ -120,7 +116,7 @@
Package: python-qgis
Section: python
Architecture: any
-Depends: python-qt4 (>=4.1.0), python-sip (>= 4.5.0), python-qgis-common (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}
+Depends: python-qt4 (>=4.1.0), python-sip4 (>= 4.5.0), python-qgis-common (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}
Provides: ${python:Provides}
XB-Python-Version: ${python:Versions}
Description: Python bindings to Quantum GIS
More information about the QGIS-commit
mailing list