[DebianGIS-dev] r1876 - packages/proj/trunk/debian

[frankie at alioth.debian.org]

Author: frankie
Date: 2009-02-14 22:09:21 +0000 (Sat, 14 Feb 2009)
New Revision: 1876

Modified:
   packages/proj/trunk/debian/changelog
   packages/proj/trunk/debian/compat
   packages/proj/trunk/debian/control
   packages/proj/trunk/debian/rules
Log:
Minor changes.


Modified: packages/proj/trunk/debian/changelog
===================================================================
--- packages/proj/trunk/debian/changelog	2009-02-12 10:05:48 UTC (rev 1875)
+++ packages/proj/trunk/debian/changelog	2009-02-14 22:09:21 UTC (rev 1876)
@@ -1,4 +1,4 @@
-proj (4.6.1-1) UNRELEASED; urgency=low
+proj (4.6.1-1) unstable; urgency=low
 
   * New upstream release.
   * Added Homepage and Vcs-* fields into debian/control.
@@ -10,6 +10,7 @@
   * [PATCH] manpages fixes manpages known typos. 
     (closes: #407399, #407400, #407401, #407402)
   * Added a README.sources with comments about datum grids.
+  * Moved to level debhelper level 7.
 
  -- Francesco Paolo Lovergine <frankie at debian.org>  Wed, 26 Nov 2008 17:49:22 +0100
 

Modified: packages/proj/trunk/debian/compat
===================================================================
--- packages/proj/trunk/debian/compat	2009-02-12 10:05:48 UTC (rev 1875)
+++ packages/proj/trunk/debian/compat	2009-02-14 22:09:21 UTC (rev 1876)
@@ -1 +1 @@
-5
+7

Modified: packages/proj/trunk/debian/control
===================================================================
--- packages/proj/trunk/debian/control	2009-02-12 10:05:48 UTC (rev 1875)
+++ packages/proj/trunk/debian/control	2009-02-14 22:09:21 UTC (rev 1876)
@@ -3,7 +3,7 @@
 Priority: extra
 Maintainer: Debian GIS Project <pkg-grass-devel at lists.alioth.debian.org>
 Uploaders: Peter S Galbraith <psg at debian.org>, Francesco Paolo Lovergine <frankie at debian.org>
-Build-Depends: debhelper (>=5.0.0), sharutils, dpatch
+Build-Depends: debhelper (>= 7), sharutils, dpatch
 Standards-Version: 3.8.0
 Homepage: http://trac.osgeo.org/proj/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-grass/packages/proj/

Modified: packages/proj/trunk/debian/rules
===================================================================
--- packages/proj/trunk/debian/rules	2009-02-12 10:05:48 UTC (rev 1875)
+++ packages/proj/trunk/debian/rules	2009-02-14 22:09:21 UTC (rev 1876)
@@ -17,7 +17,7 @@
 datumgrids: datumgrids-stamp
 datumgrids-stamp:
 	unshar -c -d $(CURDIR)/nad $(CURDIR)/debian/datumgrids.shar
-	touch datumgrids-stamp
+	touch $@
 
 config: patch-stamp datumgrids config.status
 config.status: 
@@ -27,22 +27,21 @@
 build-stamp:
 	dh_testdir
 	make CFLAGS="$(CFLAGS)"
-	touch build-stamp
+	touch $@
 
 clean: unpatch
 	dh_testdir
 	dh_testroot
 	( cd $(CURDIR)/nad && cat $(CURDIR)/debian/datumgrids.list | xargs rm -f )
-	rm -f build-stamp install-stamp datumgrids-stamp 
 	[ ! -f Makefile ] || $(MAKE) distclean
-	dh_clean
+	dh_prep
 
 install: build-stamp
 	dh_testdir
 	dh_testroot
 	dh_clean
 	dh_installdirs
-
+	
 	# Add here commands to install the package into debian/proj.
 	make install DESTDIR=`pwd`/debian/proj
 	# Fix manpages 
@@ -50,9 +49,9 @@
 	do \
 		sed -i -e 's/^\.nr LL 5.5i$$/\.\\"/' $$man; \
 	done
+	
+	touch $@
 
-	touch install-stamp
-
 # Build architecture-independent files here.
 binary-indep: build install
 # We have nothing to do by default.
@@ -73,7 +72,6 @@
 	dh_shlibdeps
 	dh_gencontrol
 	dh_makeshlibs
-#	dh_makeshlibs -V 'proj (>= 4.4.1-1)'
 	dh_md5sums
 	dh_builddeb