r15098 - in /trunk/liblocale-maketext-lexicon-perl/debian: changelog rules

[gregoa-guest at users.alioth.debian.org]

Author: gregoa-guest
Date: Sun Feb 17 22:44:20 2008
New Revision: 15098

URL: http://svn.debian.org/wsvn/?sc=1&rev=15098
Log:
debian/rules:
  - remove configure{,-stamp} targets, create Makefile in build-stamp
    target and remove *VENDOR* variables
  - remove --destdir from dh_builddep call
  - use DESTDIR and PREFIX on make install
  - remove dh_installdirs call
  - don't install README any more, it's now just a text version of the POD
  - use $(TMP) more often where possible
  - remove some more empty directories

Modified:
    trunk/liblocale-maketext-lexicon-perl/debian/changelog
    trunk/liblocale-maketext-lexicon-perl/debian/rules

Modified: trunk/liblocale-maketext-lexicon-perl/debian/changelog
URL: http://svn.debian.org/wsvn/trunk/liblocale-maketext-lexicon-perl/debian/changelog?rev=15098&op=diff
==============================================================================
--- trunk/liblocale-maketext-lexicon-perl/debian/changelog (original)
+++ trunk/liblocale-maketext-lexicon-perl/debian/changelog Sun Feb 17 22:44:20 2008
@@ -2,6 +2,15 @@
 
   * New upstream release.
   * debian/rules: delete /usr/lib/perl5 only if it exists.
+  * debian/rules:
+    - remove configure{,-stamp} targets, create Makefile in build-stamp
+      target and remove *VENDOR* variables
+    - remove --destdir from dh_builddep call
+    - use DESTDIR and PREFIX on make install
+    - remove dh_installdirs call
+    - don't install README any more, it's now just a text version of the POD
+    - use $(TMP) more often where possible
+    - remove some more empty directories
   * debian/watch: extend regexp for matching upstream tarballs.
   * Set debhelper compatibility level to 6.
   * debian/copyright:
@@ -9,7 +18,7 @@
     - add additional copyright holders
     - convert to new format
 
- -- gregor herrmann <gregor+debian at comodo.priv.at>  Sun, 17 Feb 2008 23:32:04 +0100
+ -- gregor herrmann <gregor+debian at comodo.priv.at>  Sun, 17 Feb 2008 23:41:53 +0100
 
 liblocale-maketext-lexicon-perl (0.65-1) unstable; urgency=low
 

Modified: trunk/liblocale-maketext-lexicon-perl/debian/rules
URL: http://svn.debian.org/wsvn/trunk/liblocale-maketext-lexicon-perl/debian/rules?rev=15098&op=diff
==============================================================================
--- trunk/liblocale-maketext-lexicon-perl/debian/rules (original)
+++ trunk/liblocale-maketext-lexicon-perl/debian/rules Sun Feb 17 22:44:20 2008
@@ -13,20 +13,11 @@
 
 TMP     =$(CURDIR)/debian/$(PACKAGE)
 
-configure: configure-stamp
-configure-stamp: $(QUILT_STAMPFN)
+build: build-stamp
+build-stamp: $(QUILT_STAMPFN)
 	dh_testdir
 
-	$(PERL) Makefile.PL verbose INSTALLDIRS=vendor \
-                INSTALLVENDORARCH=/usr/share/perl5/ \
-                VENDORARCHEXP=/usr/share/perl5/
-
-	touch $@
-
-build: build-stamp
-build-stamp: configure-stamp
-	dh_testdir
-
+	$(PERL) Makefile.PL verbose INSTALLDIRS=vendor
 	$(MAKE)
 	$(MAKE) test
 
@@ -34,10 +25,9 @@
 
 clean: unpatch
 	dh_testdir
-	dh_testroot 
+	dh_testroot
 
-	dh_clean build-stamp configure-stamp install-stamp
-
+	dh_clean build-stamp install-stamp
 	[ ! -e Makefile ] || $(MAKE) distclean
 
 install: install-stamp
@@ -45,9 +35,8 @@
 	dh_testdir
 	dh_testroot
 	dh_clean -k
-	dh_installdirs
 
-	$(MAKE) install PREFIX=$(TMP)/usr
+	$(MAKE) install DESTDIR=$(TMP) PREFIX=/usr
 
 	# We really do not want xgettext.pl to be installed as there already
 	# is one provided by the gettext package. Also a perl library package
@@ -57,7 +46,9 @@
 	find $(TMP)/usr -type f -iname xgettext.* -print0 | xargs --no-run-if-empty --null rm -rf
 
 	# remove empty directories left by xgettext.pl
-	[ ! -d $(CURDIR)/debian/$(shell dh_listpackages)/usr/lib/perl5 ] || rmdir --ignore-fail-on-non-empty --parents --verbose $(CURDIR)/debian/$(shell dh_listpackages)/usr/lib/perl5
+	[ ! -d $(TMP)/usr/lib/perl5 ] || rmdir --ignore-fail-on-non-empty --parents --verbose $(TMP)/usr/lib/perl5
+	[ ! -d $(TMP)/usr/bin ] || rmdir --ignore-fail-on-non-empty --parents --verbose $(TMP)/usr/bin
+	[ ! -d $(TMP)/usr/share/man/man1 ] || rmdir --ignore-fail-on-non-empty --parents --verbose $(TMP)/usr/share/man/man1
 
 	touch $@
 
@@ -69,7 +60,7 @@
 binary-indep: build install
 	dh_testdir
 	dh_testroot
-	dh_installdocs README
+	dh_installdocs
 	dh_installchangelogs Changes
 	dh_installexamples script/xgettext.pl
 	dh_compress
@@ -78,7 +69,7 @@
 	dh_perl
 	dh_gencontrol
 	dh_md5sums
-	dh_builddeb --destdir=$(DESTDIR)
+	dh_builddeb
 
 binary: binary-indep binary-arch
 .PHONY: build clean binary-indep binary-arch binary