update debian packaging (merge from version 1.0 branch)

git-svn-id: http://svn.osgeo.org/qgis/branches/Release-1_0_1@10176 c8812cc2-4d05-0410-92ff-de0c093fc19c

debian/changelog

@@ -2,16 +2,15 @@ qgis (1.0.1) experimental; urgency=low
 
   * upstream bugfix release
   * 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
 

debian/compat

@@ -1 +1 @@
-6
+5

debian/control

@@ -31,7 +31,7 @@ Description: Geographic Information System (GIS)
 
 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 @@ Description: GRASS plugin for Quantum GIS
 
 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.
@@ -103,7 +103,7 @@ Description: Python bindings to Quantum GIS
 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

debian/qgis-common.lintian-overrides

@@ -1 +0,0 @@
-qgis-common: desktop-command-not-in-package 

debian/rules

@@ -48,24 +48,24 @@ build-stamp: debian/build/CMakeCache.txt
 	# Add here commands to compile the package.
 	$(MAKE) -C debian/build
 
-	touch build-stamp
+	touch $@
 
 clean:
 	dh_testdir
 	dh_testroot
-	rm -f build-stamp 
+	rm -f build-stamp
 	rm -f i18n/*.qm
 	rm -rf debian/tmp
 
 	# Add here commands to clean up after the build process.
 	rm -rf debian/build
 
-	dh_clean 
+	dh_clean
 
 install: build
 	dh_testdir
 	dh_testroot
-	dh_clean -k 
+	dh_clean -k
 	dh_installdirs
 
 	# Add here commands to install the package into debian/tmp.
@@ -104,7 +104,7 @@ binary-arch: build install
 	dh_installman -pqgis qgis_help.man
 	dh_installmime -pqgis
 	dh_link
-	dh_lintian
+	which dh_lintian >/dev/null && dh_lintian
 	dh_strip
 	dh_compress --exclude=pdf
 	dh_fixperms