[QGIS Commit] r13655 - trunk/qgis/debian

svn_qgis at osgeo.org svn_qgis at osgeo.org
Fri Jun 4 22:58:04 EDT 2010 

Author: jef
Date: 2010-06-04 22:58:03 -0400 (Fri, 04 Jun 2010)
New Revision: 13655

Modified:
   trunk/qgis/debian/changelog
   trunk/qgis/debian/control.hardy
   trunk/qgis/debian/control.intrepid
   trunk/qgis/debian/control.jaunty
   trunk/qgis/debian/control.karmic
   trunk/qgis/debian/control.lenny
   trunk/qgis/debian/control.lucid
   trunk/qgis/debian/control.sid
   trunk/qgis/debian/libqgis{QGIS_ABI}.lintian-overrides
   trunk/qgis/debian/qgis-plugin-grass.lintian-overrides
   trunk/qgis/debian/rules
Log:
debian packaging update

Modified: trunk/qgis/debian/changelog
===================================================================
--- trunk/qgis/debian/changelog	2010-06-05 01:58:44 UTC (rev 13654)
+++ trunk/qgis/debian/changelog	2010-06-05 02:58:03 UTC (rev 13655)
@@ -12,8 +12,9 @@
   * 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 at norbit.de>  Wed, 02 Jun 2010 12:46:06 +0200
+ -- Jürgen E. Fischer <jef at norbit.de>  Sat, 05 Jun 2010 04:26:22 +0200
 
 qgis (1.4.0) UNRELEASED; urgency=low
 

Modified: trunk/qgis/debian/control.hardy
===================================================================
--- trunk/qgis/debian/control.hardy	2010-06-05 01:58:44 UTC (rev 13654)
+++ trunk/qgis/debian/control.hardy	2010-06-05 02:58:03 UTC (rev 13655)
@@ -103,7 +103,7 @@
 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

Modified: trunk/qgis/debian/control.intrepid
===================================================================
--- trunk/qgis/debian/control.intrepid	2010-06-05 01:58:44 UTC (rev 13654)
+++ trunk/qgis/debian/control.intrepid	2010-06-05 02:58:03 UTC (rev 13655)
@@ -103,7 +103,7 @@
 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

Modified: trunk/qgis/debian/control.jaunty
===================================================================
--- trunk/qgis/debian/control.jaunty	2010-06-05 01:58:44 UTC (rev 13654)
+++ trunk/qgis/debian/control.jaunty	2010-06-05 02:58:03 UTC (rev 13655)
@@ -103,7 +103,7 @@
 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

Modified: trunk/qgis/debian/control.karmic
===================================================================
--- trunk/qgis/debian/control.karmic	2010-06-05 01:58:44 UTC (rev 13654)
+++ trunk/qgis/debian/control.karmic	2010-06-05 02:58:03 UTC (rev 13655)
@@ -103,7 +103,7 @@
 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

Modified: trunk/qgis/debian/control.lenny
===================================================================
--- trunk/qgis/debian/control.lenny	2010-06-05 01:58:44 UTC (rev 13654)
+++ trunk/qgis/debian/control.lenny	2010-06-05 02:58:03 UTC (rev 13655)
@@ -103,7 +103,7 @@
 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

Modified: trunk/qgis/debian/control.lucid
===================================================================
--- trunk/qgis/debian/control.lucid	2010-06-05 01:58:44 UTC (rev 13654)
+++ trunk/qgis/debian/control.lucid	2010-06-05 02:58:03 UTC (rev 13655)
@@ -103,6 +103,7 @@
 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

Modified: trunk/qgis/debian/control.sid
===================================================================
--- trunk/qgis/debian/control.sid	2010-06-05 01:58:44 UTC (rev 13654)
+++ trunk/qgis/debian/control.sid	2010-06-05 02:58:03 UTC (rev 13655)
@@ -103,6 +103,7 @@
 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

Modified: trunk/qgis/debian/libqgis{QGIS_ABI}.lintian-overrides
===================================================================
--- trunk/qgis/debian/libqgis{QGIS_ABI}.lintian-overrides	2010-06-05 01:58:44 UTC (rev 13654)
+++ trunk/qgis/debian/libqgis{QGIS_ABI}.lintian-overrides	2010-06-05 02:58:03 UTC (rev 13655)
@@ -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

Modified: trunk/qgis/debian/qgis-plugin-grass.lintian-overrides
===================================================================
--- trunk/qgis/debian/qgis-plugin-grass.lintian-overrides	2010-06-05 01:58:44 UTC (rev 13654)
+++ trunk/qgis/debian/qgis-plugin-grass.lintian-overrides	2010-06-05 02:58:03 UTC (rev 13655)
@@ -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

Modified: trunk/qgis/debian/rules
===================================================================
--- trunk/qgis/debian/rules	2010-06-05 01:58:44 UTC (rev 13654)
+++ trunk/qgis/debian/rules	2010-06-05 02:58:03 UTC (rev 13655)
@@ -10,7 +10,7 @@
 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 @@
 	-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

More information about the QGIS-commit mailing list