[QGIS Commit] r10241 - trunk/qgis/debian

[svn_qgis at osgeo.org]

Author: jef
Date: 2009-02-25 15:59:59 -0500 (Wed, 25 Feb 2009)
New Revision: 10241

Modified:
   trunk/qgis/debian/changelog
   trunk/qgis/debian/compat
   trunk/qgis/debian/control
   trunk/qgis/debian/rules
Log:
fix debian packaging

Modified: trunk/qgis/debian/changelog
===================================================================
--- trunk/qgis/debian/changelog	2009-02-25 20:59:22 UTC (rev 10240)
+++ trunk/qgis/debian/changelog	2009-02-25 20:59:59 UTC (rev 10241)
@@ -3,16 +3,15 @@
   * gridmaker plugin removed from package
   * updated mime support
   * sync with debian-gis debian/ tree
-    - introduce arch-independant qgis-comman and
+    - introduce arch-independant qgis-common and
       qgis-plugin-grass-common
     - policy updated to 3.8.0
     - join libqgis1-core and libqgis1-gui to libqgis1
     - add debian/watch
     - dh_lintian overrides
-    - compat 5=>6
     - fix qgis.desktop
     - fix license reference in copyright
-  * introduce arch-independant python-qgis-comman
+  * introduce arch-independant python-qgis-common
   * added sharedmimeinfo
   * remove dpatch
 

Modified: trunk/qgis/debian/compat
===================================================================
--- trunk/qgis/debian/compat	2009-02-25 20:59:22 UTC (rev 10240)
+++ trunk/qgis/debian/compat	2009-02-25 20:59:59 UTC (rev 10241)
@@ -1 +1 @@
-6
+5

Modified: trunk/qgis/debian/control
===================================================================
--- trunk/qgis/debian/control	2009-02-25 20:59:22 UTC (rev 10240)
+++ trunk/qgis/debian/control	2009-02-25 20:59:59 UTC (rev 10241)
@@ -31,7 +31,7 @@
 
 Package: qgis-common
 Architecture: all
-Depends: qgis (= ${binary:Version})
+Depends: qgis (>= ${source:Version})
 Description: Quantum GIS - architecture-independent data
  Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
  and display databases of geographic information.
@@ -80,7 +80,7 @@
 
 Package: qgis-plugin-grass-common
 Architecture: all
-Depends: qgis-plugin-grass (= ${binary:Version})
+Depends: qgis-plugin-grass (>= ${source:Version})
 Description: GRASS plugin for Quantum GIS - architecture-independent data
  Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
  and display databases of geographic information.
@@ -91,7 +91,7 @@
 Package: python-qgis
 Section: python
 Architecture: any
-Depends: python-qt4 (>=4.1.0), ${shlibs:Depends}, ${misc:Depends}
+Depends: python-qt4 (>=4.1.0), python-qgis-common (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}
 Provides: ${python:Provides}
 XB-Python-Version: ${python:Versions}
 Description: Python bindings to Quantum GIS
@@ -103,7 +103,7 @@
 Package: python-qgis-common
 Section: python
 Architecture: all
-Depends: python-qgis (= ${binary:Version})
+Depends: python-qgis (>= ${source:Version})
 Provides: ${python:Provides}
 XB-Python-Version: ${python:Versions}
 Description: Python bindings to Quantum GIS - architecture-independent files

Modified: trunk/qgis/debian/rules
===================================================================
--- trunk/qgis/debian/rules	2009-02-25 20:59:22 UTC (rev 10240)
+++ trunk/qgis/debian/rules	2009-02-25 20:59:59 UTC (rev 10241)
@@ -54,7 +54,7 @@
 	# Add here commands to compile the package.
 	$(MAKE) -C debian/build
 
-	touch build-stamp
+	touch $@
 
 clean:
 	dh_testdir
@@ -110,7 +110,7 @@
 	dh_installman -pqgis qgis_help.man
 	dh_installmime -pqgis
 	dh_link
-	dh_lintian
+	if which dh_lintian >/dev/null; then dh_lintian; fi
 	dh_strip
 	dh_compress --exclude=pdf
 	dh_fixperms