debian packaging update

git-svn-id: http://svn.osgeo.org/qgis/trunk@13655 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Jun 5, 2010 · c51974c · c51974c
1 parent ca08029
commit c51974c
Show file tree

Hide file tree

Showing 11 changed files with 13 additions and 8 deletions.
diff --git a/debian/changelog b/debian/changelog
@@ -12,8 +12,9 @@ qgis (1.5.0) UNRELEASED; urgency=low
   * exclude python scripts from grass plugin on lenny
   * add missing dependency to python-sip(4) to python-qgis
   * follow sip4 => sip transition
+  * add gdal-bin and python-gdal dependency for GdalTools
 
- -- Jürgen E. Fischer <jef@norbit.de>  Wed, 02 Jun 2010 12:46:06 +0200
+ -- Jürgen E. Fischer <jef@norbit.de>  Sat, 05 Jun 2010 04:26:22 +0200
 
 qgis (1.4.0) UNRELEASED; urgency=low
 

diff --git a/debian/control.hardy b/debian/control.hardy
@@ -103,7 +103,7 @@ Description: Python bindings to Quantum GIS
 Package: python-qgis-common
 Section: python
 Architecture: all
-Depends: python-qgis (>= ${source:Version})
+Depends: gdal-bin, python-gdal
 Provides: ${python:Provides}
 XB-Python-Version: ${python:Versions}
 Description: Python bindings to Quantum GIS - architecture-independent files

diff --git a/debian/control.intrepid b/debian/control.intrepid
@@ -103,7 +103,7 @@ Description: Python bindings to Quantum GIS
 Package: python-qgis-common
 Section: python
 Architecture: all
-Depends: python-qgis (>= ${source:Version})
+Depends: gdal-bin, python-gdal
 Provides: ${python:Provides}
 XB-Python-Version: ${python:Versions}
 Description: Python bindings to Quantum GIS - architecture-independent files

diff --git a/debian/control.jaunty b/debian/control.jaunty
@@ -103,7 +103,7 @@ Description: Python bindings to Quantum GIS
 Package: python-qgis-common
 Section: python
 Architecture: all
-Depends: python-qgis (>= ${source:Version})
+Depends: gdal-bin, python-gdal
 Provides: ${python:Provides}
 XB-Python-Version: ${python:Versions}
 Description: Python bindings to Quantum GIS - architecture-independent files

diff --git a/debian/control.karmic b/debian/control.karmic
@@ -103,7 +103,7 @@ Description: Python bindings to Quantum GIS
 Package: python-qgis-common
 Section: python
 Architecture: all
-Depends: python-qgis (>= ${source:Version})
+Depends: gdal-bin, python-gdal
 Provides: ${python:Provides}
 XB-Python-Version: ${python:Versions}
 Description: Python bindings to Quantum GIS - architecture-independent files

diff --git a/debian/control.lenny b/debian/control.lenny
@@ -103,7 +103,7 @@ Description: Python bindings to Quantum GIS
 Package: python-qgis-common
 Section: python
 Architecture: all
-Depends: python-qgis (>= ${source:Version})
+Depends: gdal-bin, python-gdal
 Provides: ${python:Provides}
 XB-Python-Version: ${python:Versions}
 Description: Python bindings to Quantum GIS - architecture-independent files

diff --git a/debian/control.lucid b/debian/control.lucid
@@ -103,6 +103,7 @@ Package: python-qgis-common
 Section: python
 Architecture: all
 Provides: ${python:Provides}
+Depends: gdal-bin, python-gdal
 XB-Python-Version: ${python:Versions}
 Description: Python bindings to Quantum GIS - architecture-independent files
  Quantum GIS is a Geographic Information System (GIS) which manages, analyzes

diff --git a/debian/control.sid b/debian/control.sid
@@ -103,6 +103,7 @@ Package: python-qgis-common
 Section: python
 Architecture: all
 Provides: ${python:Provides}
+Depends: gdal-bin, python-gdal
 XB-Python-Version: ${python:Versions}
 Description: Python bindings to Quantum GIS - architecture-independent files
  Quantum GIS is a Geographic Information System (GIS) which manages, analyzes

diff --git a/debian/libqgis{QGIS_ABI}.lintian-overrides b/debian/libqgis{QGIS_ABI}.lintian-overrides
@@ -1,2 +1,3 @@
 libqgis{QGIS_ABI}: shlib-calls-exit
 libqgis{QGIS_ABI}: package-name-doesnt-match-sonames
+libqgis{QGIS_ABI}: no-symbols-control-file
diff --git a/debian/qgis-plugin-grass.lintian-overrides b/debian/qgis-plugin-grass.lintian-overrides
@@ -1,2 +1,3 @@
 qgis-plugin-grass: binary-without-manpage
 qgis-plugin-grass: package-name-doesnt-match-sonames
+qgis-plugin-grass: no-symbols-control-file
diff --git a/debian/rules b/debian/rules
@@ -10,7 +10,7 @@ DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
 DISTRIBUTION := $(shell dpkg-parsechangelog --format rfc822 | sed -ne "s/^Distribution: //p")
-ifneq ($(DISTRIBUTION),$(findstring $(DISTRIBUTION),"lenny hardy intrepid jaunty karmic lucid"))
+ifneq ($(DISTRIBUTION),$(findstring $(DISTRIBUTION),"lenny squeeze hardy intrepid jaunty karmic lucid"))
 DISTRIBUTION := sid
 endif
 
@@ -30,7 +30,7 @@ CMAKE_OPTS := \
 	-D PEDANTIC=TRUE \
 	-D WITH_SPATIALITE=TRUE
 
-ifeq (,$(findstring $(DISTRIBUTION),"sid"))
+ifeq (,$(findstring $(DISTRIBUTION),"squeeze lucid sid"))
 	CMAKE_OPTS += -D WITH_INTERNAL_SPATIALITE=TRUE
 else
 	CMAKE_OPTS += -D WITH_INTERNAL_SPATIALITE=FALSE