[DebianGIS-dev] r1893 - packages/geos/trunk/debian

[frankie at alioth.debian.org]

Author: frankie
Date: 2009-02-15 23:22:53 +0000 (Sun, 15 Feb 2009)
New Revision: 1893

Modified:
   packages/geos/trunk/debian/changelog
   packages/geos/trunk/debian/compat
   packages/geos/trunk/debian/control
   packages/geos/trunk/debian/rules
Log:


Modified: packages/geos/trunk/debian/changelog
===================================================================
--- packages/geos/trunk/debian/changelog	2009-02-15 23:06:21 UTC (rev 1892)
+++ packages/geos/trunk/debian/changelog	2009-02-15 23:22:53 UTC (rev 1893)
@@ -8,8 +8,10 @@
   * Watch file updated.
     (closes: #504470)
   * Patch gcc43.dpatch removed, merged upstream.
+  * Moved to debhelper level 7. 
+  * Some minor clean up in debian/rules.
 
- -- Francesco Paolo Lovergine <frankie at debian.org>  Wed, 24 Dec 2008 18:10:18 +0100
+ -- Francesco Paolo Lovergine <frankie at debian.org>  Mon, 16 Feb 2009 00:21:50 +0100
 
 geos (3.0.0-5) unstable; urgency=low
 

Modified: packages/geos/trunk/debian/compat
===================================================================
--- packages/geos/trunk/debian/compat	2009-02-15 23:06:21 UTC (rev 1892)
+++ packages/geos/trunk/debian/compat	2009-02-15 23:22:53 UTC (rev 1893)
@@ -1 +1 @@
-5
+7

Modified: packages/geos/trunk/debian/control
===================================================================
--- packages/geos/trunk/debian/control	2009-02-15 23:06:21 UTC (rev 1892)
+++ packages/geos/trunk/debian/control	2009-02-15 23:22:53 UTC (rev 1893)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian GIS Project <pkg-grass-devel at lists.alioth.debian.org>
 Uploaders: Fabio Tranchitella <kobold at debian.org>
-Build-Depends: debhelper (>= 5.0.0), dpatch, doxygen
+Build-Depends: debhelper (>= 7), dpatch, doxygen
 Standards-Version: 3.8.0
 Homepage: http://trac.osgeo.org/geos/
 Vcs-Browser: http://svn.debian.org/viewsvn/pkg-grass/packages/geos/trunk

Modified: packages/geos/trunk/debian/rules
===================================================================
--- packages/geos/trunk/debian/rules	2009-02-15 23:06:21 UTC (rev 1892)
+++ packages/geos/trunk/debian/rules	2009-02-15 23:22:53 UTC (rev 1893)
@@ -51,8 +51,10 @@
 	mv config.guess config.guess.bak
 	cp -f /usr/share/misc/config.guess config.guess
 endif
-	
-	CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info $(CONFFLAGS)
+		
+	CFLAGS="$(CFLAGS)" \
+		./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
+		--prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info $(CONFFLAGS)
 
 
 #Architecture
@@ -60,23 +62,20 @@
 
 build-arch: build-arch-stamp
 build-arch-stamp:  config.status
-
 	# Add here commands to compile the arch part of the package.
 	$(MAKE)
-	touch build-arch-stamp
+	touch $@
 
 build-indep: build-indep-stamp
 build-indep-stamp:  config.status
-
 	# Add here commands to compile the indep part of the package.
 	$(MAKE) -C doc doxygen-html
-	touch build-indep-stamp
+	touch $@
 
 clean: clean-patched unpatch
 clean-patched:
 	dh_testdir
 	dh_testroot
-	rm -f build-arch-stamp build-indep-stamp
 	[ ! -f Makefile ] || $(MAKE) distclean
 	[ -f config.sub.bak ] && mv config.sub.bak config.sub || true
 	[ -f config.guess.bak ] && mv config.guess.bak config.guess || true
@@ -86,12 +85,12 @@
 install-indep:
 	dh_testdir
 	dh_testroot
-	dh_clean -k -i
+	dh_prep -i
 	dh_installdirs -i
-
+	
 	# Add here commands to install the indep part of the package into
 	# debian/libgeos-doc
-	
+		
 	# Install doxygen html files
 	install -m 644 doc/doxygen_docs/html/* debian/libgeos-doc/usr/share/doc/libgeos-doc/html
 	
@@ -104,7 +103,7 @@
 install-arch:
 	dh_testdir
 	dh_testroot
-	dh_clean -k -s
+	dh_prep -s
 	dh_installdirs -s
 
 	# Add here commands to install the arch part of the package into