[QGIS Commit] r15143 - trunk/qgis/debian

[svn_qgis at osgeo.org]

Author: jef
Date: 2011-02-08 06:49:43 -0800 (Tue, 08 Feb 2011)
New Revision: 15143

Modified:
   trunk/qgis/debian/changelog
   trunk/qgis/debian/control
Log:
revert debian part of r15142

Modified: trunk/qgis/debian/changelog
===================================================================
--- trunk/qgis/debian/changelog	2011-02-08 14:39:05 UTC (rev 15142)
+++ trunk/qgis/debian/changelog	2011-02-08 14:49:43 UTC (rev 15143)
@@ -1,9 +1,3 @@
-qgis (1.7.02011020412091) testing; urgency=low
-
-  * Faunalia testing autobuild from trunk
-
- -- paolo <paolo at faunalia.it>  Fri, 04 Feb 2011 12:09:59 +0100
-
 qgis (1.7.0) UNRELEASED; urgency=low
 
   * new development version 1.7 after branch

Modified: trunk/qgis/debian/control
===================================================================
--- trunk/qgis/debian/control	2011-02-08 14:39:05 UTC (rev 15142)
+++ trunk/qgis/debian/control	2011-02-08 14:49:43 UTC (rev 15143)
@@ -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
@@ -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}, ${python: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