r20401 - in /trunk/libregexp-common-time-perl/debian: changelog rules

[gregoa at users.alioth.debian.org]

Author: gregoa
Date: Sat May 24 23:25:51 2008
New Revision: 20401

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

Modified:
    trunk/libregexp-common-time-perl/debian/changelog
    trunk/libregexp-common-time-perl/debian/rules

Modified: trunk/libregexp-common-time-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libregexp-common-time-perl/debian/changelog?rev=20401&op=diff
==============================================================================
--- trunk/libregexp-common-time-perl/debian/changelog (original)
+++ trunk/libregexp-common-time-perl/debian/changelog Sat May 24 23:25:51 2008
@@ -2,6 +2,7 @@
 
   * New upstream release.
   * debian/copyright: adjust years of copyright.
+  * Refresh debian/rules, no functional changes.
 
  -- gregor herrmann <gregoa at debian.org>  Sun, 25 May 2008 01:12:05 +0200
 

Modified: trunk/libregexp-common-time-perl/debian/rules
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libregexp-common-time-perl/debian/rules?rev=20401&op=diff
==============================================================================
--- trunk/libregexp-common-time-perl/debian/rules (original)
+++ trunk/libregexp-common-time-perl/debian/rules Sat May 24 23:25:51 2008
@@ -11,39 +11,22 @@
 # 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
-
-	# As this is a architecture independent package, we are not
-	# supposed to install stuff to /usr/lib. MakeMaker creates
-	# the dirs, we prevent this by setting the INSTALLVENDORARCH
-	# and VENDORARCHEXP environment variables.
-
-	# Add commands to compile the package here
-	$(PERL) Makefile.PL INSTALLDIRS=vendor \
-		INSTALLVENDORARCH=/usr/share/perl5/ \
-		VENDORARCHEXP=/usr/share/perl5/
+	$(PERL) Makefile.PL INSTALLDIRS=vendor
 	$(MAKE)
 	$(MAKE) test
-
 	touch $@
 
 clean:
 	dh_testdir
 	dh_testroot
-
 	dh_clean build-stamp install-stamp
-
-	# Add commands to clean up after the build process here
 	[ ! -f Makefile ] || $(MAKE) realclean
 
 install: install-stamp
@@ -51,10 +34,10 @@
 	dh_testdir
 	dh_testroot
 	dh_clean -k
-
-	# Add commands to install the package into debian/$PACKAGE_NAME here
 	$(MAKE) install DESTDIR=$(TMP) PREFIX=/usr
-
+	[ ! -d $(TMP)/usr/lib/perl5 ] || \
+		rmdir --ignore-fail-on-non-empty --parents --verbose \
+		$(TMP)/usr/lib/perl5
 	touch $@
 
 binary-arch:
@@ -63,7 +46,6 @@
 binary-indep: build install
 	dh_testdir
 	dh_testroot
-	dh_installexamples
 	dh_installdocs README
 	dh_installchangelogs Changes
 	dh_perl
@@ -74,8 +56,5 @@
 	dh_md5sums
 	dh_builddeb
 
-source diff:
-	@echo >&2 'source and diff are obsolete - use dpkg-source -b'; false
-
 binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary
+.PHONY: build clean binary-indep binary-arch binary install