[QGIS Commit] r13683 - trunk/qgis/debian

[svn_qgis at osgeo.org]

Author: jef
Date: 2010-06-07 15:59:53 -0400 (Mon, 07 Jun 2010)
New Revision: 13683

Modified:
   trunk/qgis/debian/control
   trunk/qgis/debian/rules
Log:
fix template cleanup

Modified: trunk/qgis/debian/control
===================================================================
--- trunk/qgis/debian/control	2010-06-07 19:52:27 UTC (rev 13682)
+++ trunk/qgis/debian/control	2010-06-07 19:59:53 UTC (rev 13683)
@@ -2,8 +2,8 @@
 Section: science
 Priority: extra
 Maintainer: Quantum GIS developers <qgis-developer at lists.osgeo.org>
-Build-Depends: debhelper (>= 7), libgdal1-dev, libpq-dev, 
- libgeos-dev (>= 3.0.0), grass-dev, libsqlite3-dev, libgsl0-dev, proj (< 4.7.0) | libproj-dev (>= 4.7.0), libexpat1-dev, 
+Build-Depends: debhelper (>= 5.0.51~), libgdal1-dev, libpq-dev, 
+ libgeos-dev (>= 3.0.0), grass-dev, libsqlite3-dev, libgsl0-dev, proj (<< 4.7.0) | libproj-dev (>= 4.7.0), libexpat1-dev, 
  flex, bison, python-dev, cmake (>= 2.6), python-sip4 (>= 4.5.0), python-central (>=0.5), python,
  sharutils, sip4 (>= 4.5), libqt4-core (>=4.4.0), libqt4-dev (>=4.4.0), libqt4-gui (>=4.4.0),
  libqt4-sql (>=4.4.0), python-qt4 (>=4.1.0), python-qt4-dev (>=4.1.0),

Modified: trunk/qgis/debian/rules
===================================================================
--- trunk/qgis/debian/rules	2010-06-07 19:52:27 UTC (rev 13682)
+++ trunk/qgis/debian/rules	2010-06-07 19:59:53 UTC (rev 13683)
@@ -95,7 +95,11 @@
 
 	touch $@
 
-clean: templateclean debian/control
+cleantemplates:
+	$(MAKE) -f debian/rules templateclean
+	$(MAKE) -f debian/rules debian/control
+
+clean: cleantemplates
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp 
@@ -105,7 +109,7 @@
 	# Add here commands to clean up after the build process.
 	rm -rf debian/build
 
-	dh_clean 
+	dh_clean
 
 install: build
 	dh_testdir