[QGIS Commit] r14349 - trunk/qgis/debian

[svn_qgis at osgeo.org]

Author: jef
Date: 2010-10-06 21:49:13 +0000 (Wed, 06 Oct 2010)
New Revision: 14349

Modified:
   trunk/qgis/debian/control
Log:
revert debian change from 14348.

Modified: trunk/qgis/debian/control
===================================================================
--- trunk/qgis/debian/control	2010-10-06 21:44:35 UTC (rev 14348)
+++ trunk/qgis/debian/control	2010-10-06 21:49:13 UTC (rev 14349)
@@ -2,13 +2,12 @@
 Section: science
 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, pkg-config, subversion
+Build-Depends: debhelper (>= 5.0.51~), libgdal1-dev, libpq-dev, 
+ libgeos-dev (>= 3.0.0), grass-dev, libsqlite3-dev, libgsl0-dev, proj (<< 4.7.0) | libproj-dev (>= 4.7.0), libexpat1-dev, 
+ flex, bison, python-dev, cmake (>= 2.6), python-sip4 (>= 4.5.0), python-central (>=0.5), python,
+ sip4 (>= 4.5), 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-sip4-dev (>= 4.5.0), pyqt4-dev-tools, libqwt5-qt4-dev, libfcgi-dev, subversion
 Build-Conflicts: libqgis-dev, qgis-dev
 Standards-Version: 3.8.4
 XS-Python-Version: current
@@ -68,7 +67,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.
@@ -91,7 +90,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