[QGIS Commit] r10242 - branches/Version-1_0/debian

[svn_qgis at osgeo.org]

Author: jef
Date: 2009-02-25 16:00:08 -0500 (Wed, 25 Feb 2009)
New Revision: 10242

Modified:
   branches/Version-1_0/debian/changelog
   branches/Version-1_0/debian/control
   branches/Version-1_0/debian/rules
Log:
fix debian packaging

Modified: branches/Version-1_0/debian/changelog
===================================================================
--- branches/Version-1_0/debian/changelog	2009-02-25 20:59:59 UTC (rev 10241)
+++ branches/Version-1_0/debian/changelog	2009-02-25 21:00:08 UTC (rev 10242)
@@ -1,3 +1,16 @@
+qgis (1.0.1-3) experimental; urgency=low
+
+  * add missing dependency for python-qgis to python-qgis-common
+  * fix conditional call of dh_lintian
+
+ -- Jürgen E. Fischer <jef at norbit.de>  Tue, 24 Feb 2009 08:42:01 +0100
+
+qgis (1.0.1-2) experimental; urgency=low
+
+  * include r10177
+
+ -- Juergen E. Fischer <jef at norbit.de>  Mon, 16 Feb 2009 09:17:32 +0100
+
 qgis (1.0.1) experimental; urgency=low
 
   * upstream bugfix release

Modified: branches/Version-1_0/debian/control
===================================================================
--- branches/Version-1_0/debian/control	2009-02-25 20:59:59 UTC (rev 10241)
+++ branches/Version-1_0/debian/control	2009-02-25 21:00:08 UTC (rev 10242)
@@ -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

Modified: branches/Version-1_0/debian/rules
===================================================================
--- branches/Version-1_0/debian/rules	2009-02-25 20:59:59 UTC (rev 10241)
+++ branches/Version-1_0/debian/rules	2009-02-25 21:00:08 UTC (rev 10242)
@@ -104,7 +104,7 @@
 	dh_installman -pqgis qgis_help.man
 	dh_installmime -pqgis
 	dh_link
-	which dh_lintian >/dev/null && dh_lintian
+	if which dh_lintian >/dev/null; then dh_lintian; fi
 	dh_strip
 	dh_compress --exclude=pdf
 	dh_fixperms