r22821 - in /trunk/libmarc-charset-perl/debian: changelog rules

[gregoa at users.alioth.debian.org]

Author: gregoa
Date: Sat Jul  5 19:56:58 2008
New Revision: 22821

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=22821
Log:
Refresh debian/rules, no functional changes.

Modified:
    trunk/libmarc-charset-perl/debian/changelog
    trunk/libmarc-charset-perl/debian/rules

Modified: trunk/libmarc-charset-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libmarc-charset-perl/debian/changelog?rev=22821&op=diff
==============================================================================
--- trunk/libmarc-charset-perl/debian/changelog (original)
+++ trunk/libmarc-charset-perl/debian/changelog Sat Jul  5 19:56:58 2008
@@ -4,6 +4,7 @@
   * debian/copyright: add upstream source location.
   * debian/control: change my email address.
   * Set Standards-Version to 3.8.0 (no changes).
+  * Refresh debian/rules, no functional changes.
 
  -- gregor herrmann <gregoa at debian.org>  Sat, 05 Jul 2008 21:41:32 +0200
 

Modified: trunk/libmarc-charset-perl/debian/rules
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libmarc-charset-perl/debian/rules?rev=22821&op=diff
==============================================================================
--- trunk/libmarc-charset-perl/debian/rules (original)
+++ trunk/libmarc-charset-perl/debian/rules Sat Jul  5 19:56:58 2008
@@ -11,33 +11,24 @@
 # always return the default without waiting for user input.
 export PERL_MM_USE_DEFAULT=1
 
-PACKAGE=$(shell dh_listpackages)
-
-ifndef PERL
-PERL = /usr/bin/perl
-endif
-
-TMP     =$(CURDIR)/debian/$(PACKAGE)
+PERL   ?= /usr/bin/perl
+PACKAGE = $(shell dh_listpackages)
+TMP     = $(CURDIR)/debian/$(PACKAGE)
 
 build: build-stamp
 build-stamp:
 	dh_testdir
-
-	# Compile the package
 	$(PERL) Makefile.PL INSTALLDIRS=vendor
 	$(MAKE)
 	$(MAKE) test
-
 	touch $@
 
 clean:
 	dh_testdir
 	dh_testroot
+	dh_clean build-stamp install-stamp
+	[ ! -f Makefile ] || $(MAKE) realclean
 
-	dh_clean build-stamp install-stamp
-
-	# Clean up after the build process
-	[ ! -f Makefile ] || $(MAKE) realclean
 	rm -f lib/MARC/Charset/Table.dir
 	rm -f lib/MARC/Charset/Table.pag
 
@@ -46,18 +37,14 @@
 	dh_testdir
 	dh_testroot
 	dh_clean -k
-
-	# Install the package into $(TMP)
 	$(MAKE) install DESTDIR=$(TMP) PREFIX=/usr
-
-	# The perl modules are architecture-independent, so they go in
-	# /usr/share. Remove the empty /usr/lib/perl5 created by MakeMaker.
-	[ ! -d $(TMP)/usr/lib/perl5 ] || rmdir --ignore-fail-on-non-empty --parents $(TMP)/usr/lib/perl5
-
+	[ ! -d $(TMP)/usr/lib/perl5 ] || \
+		rmdir --ignore-fail-on-non-empty --parents --verbose \
+		$(TMP)/usr/lib/perl5
 	touch $@
 
 binary-indep:
-# We have nothing to do.
+# We have nothing to do here for an architecture-independent package
 
 binary-arch: build install
 	dh_testdir
@@ -83,4 +70,4 @@
 	dh_builddeb
 
 binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary
+.PHONY: build clean binary-indep binary-arch binary install