r2085 - packages/libtext-autoformat-perl/trunk/debian

[Niko Tyni]

Author: ntyni-guest
Date: 2006-02-02 21:14:48 +0000 (Thu, 02 Feb 2006)
New Revision: 2085

Modified:
   packages/libtext-autoformat-perl/trunk/debian/changelog
   packages/libtext-autoformat-perl/trunk/debian/rules
Log:
- remove dh_install; do 'make install' straight into the right place.
- remove the execute bit on the example files


Modified: packages/libtext-autoformat-perl/trunk/debian/changelog
===================================================================
--- packages/libtext-autoformat-perl/trunk/debian/changelog	2006-02-02 21:01:07 UTC (rev 2084)
+++ packages/libtext-autoformat-perl/trunk/debian/changelog	2006-02-02 21:14:48 UTC (rev 2085)
@@ -9,8 +9,9 @@
   * Upgrade to Standards-Version 3.6.2. No changes needed.
   * Install the new sample config files config.{emacs,vim} as examples.
   * Add debian/watch.
+  * Revamp package installation in debian/rules; don't use dh_install anymore.
 
- -- Niko Tyni <ntyni at iki.fi>  Thu,  2 Feb 2006 22:59:05 +0200
+ -- Niko Tyni <ntyni at iki.fi>  Thu,  2 Feb 2006 23:12:50 +0200
 
 libtext-autoformat-perl (1.12-3) unstable; urgency=low
 

Modified: packages/libtext-autoformat-perl/trunk/debian/rules
===================================================================
--- packages/libtext-autoformat-perl/trunk/debian/rules	2006-02-02 21:01:07 UTC (rev 2084)
+++ packages/libtext-autoformat-perl/trunk/debian/rules	2006-02-02 21:14:48 UTC (rev 2085)
@@ -8,7 +8,8 @@
 #export DH_VERBOSE=1
 
 ## ----------------------------------------------------------------------
-TMP_DIR		= debian/tmp
+PACKAGE=$(shell dh_listpackages)
+TMP     =$(CURDIR)/debian/$(PACKAGE)
 
 ## ----------------------------------------------------------------------
 ## targets
@@ -34,18 +35,21 @@
 		dh_testroot
 		dh_clean -k
 		dh_installdirs
-		$(MAKE) install PREFIX=$(PWD)/$(TMP_DIR)/usr
+		$(MAKE) install DESTDIR=$(TMP) PREFIX=/usr
+		#As this is a architecture independent package, we are not supposed to install
+		#stuff to /usr/lib. MakeMaker creates the dirs, we delete them from the deb:
+		rmdir --ignore-fail-on-non-empty --parents $(TMP)/usr/lib/perl5
 		touch install-stamp
 
 binary-indep:	build install
 		dh_testdir
 		dh_testroot
-		dh_install --sourcedir=$(TMP_DIR)
 		dh_installdocs
 		dh_installexamples
 		dh_installchangelogs Changes
 		dh_compress
 		dh_fixperms
+		chmod 644 $(TMP)/usr/share/doc/$(PACKAGE)/examples/*
 		dh_installdeb
 		dh_perl
 		dh_gencontrol