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

[frankie at alioth.debian.org]

Author: frankie
Date: 2009-03-24 23:10:17 +0000 (Tue, 24 Mar 2009)
New Revision: 2055

Modified:
   packages/proj/trunk/debian/changelog
   packages/proj/trunk/debian/rules
Log:
Fixes for indep packages


Modified: packages/proj/trunk/debian/changelog
===================================================================
--- packages/proj/trunk/debian/changelog	2009-03-24 20:18:54 UTC (rev 2054)
+++ packages/proj/trunk/debian/changelog	2009-03-24 23:10:17 UTC (rev 2055)
@@ -1,3 +1,11 @@
+proj (4.6.1-3) unstable; urgency=low
+
+  * Sigh, dh_clean and dh_prep called in the wrong targets caused missing
+    indep binaries in .changes.
+    (closes: #521100)
+
+ -- Francesco Paolo Lovergine <frankie at debian.org>  Tue, 24 Mar 2009 22:09:24 +0100
+
 proj (4.6.1-2) unstable; urgency=low
 
   * Reordered dh_* rules.

Modified: packages/proj/trunk/debian/rules
===================================================================
--- packages/proj/trunk/debian/rules	2009-03-24 20:18:54 UTC (rev 2054)
+++ packages/proj/trunk/debian/rules	2009-03-24 23:10:17 UTC (rev 2055)
@@ -33,16 +33,16 @@
 clean: unpatch
 	dh_testdir
 	dh_testroot
-	dh_prep
 	( cd $(CURDIR)/nad && cat $(CURDIR)/debian/datumgrids.list $(CURDIR)/debian/datumgrids-ch.list | xargs rm -f )
 	rm -f datumgrids-stamp
 	[ ! -f Makefile ] || $(MAKE) distclean
 	rm -f $(CURDIR)/debian/*.log
+	dh_clean
 
 install: build
 	dh_testdir
 	dh_testroot
-	dh_clean
+	dh_prep
 	dh_installdirs
 	
 	$(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
@@ -56,6 +56,10 @@
 	sed -i -e 's/\(.TH PJ_INIT\) 3U\(.*\)/\1 3\2/' $(CURDIR)/debian/tmp/usr/share/man/man3/pj_init.3
 
 install-data: config
+	dh_testdir
+	dh_testroot
+	dh_prep
+	dh_installdirs
 	$(MAKE) DESTDIR=$(CURDIR)/debian/tmp install-data
 
 # Build architecture-independent files here.