r18126 - in /trunk/libmime-charset-perl/debian: changelog rules

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

Author: gregoa-guest
Date: Sat Mar 29 17:14:56 2008
New Revision: 18126

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=18126
Log:
debian/rules: minor update without functional changes.

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

Modified: trunk/libmime-charset-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libmime-charset-perl/debian/changelog?rev=18126&op=diff
==============================================================================
--- trunk/libmime-charset-perl/debian/changelog (original)
+++ trunk/libmime-charset-perl/debian/changelog Sat Mar 29 17:14:56 2008
@@ -6,8 +6,9 @@
     - add /me to Uploaders
     - remove spurious trailing comma from Depends
   * debian/copyright: adjust years of copyright.
+  * debian/rules: minor update without functional changes.
 
- -- gregor herrmann <gregor+debian at comodo.priv.at>  Sat, 29 Mar 2008 18:12:41 +0100
+ -- gregor herrmann <gregor+debian at comodo.priv.at>  Sat, 29 Mar 2008 18:13:39 +0100
 
 libmime-charset-perl (1.002-1) unstable; urgency=low
 

Modified: trunk/libmime-charset-perl/debian/rules
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libmime-charset-perl/debian/rules?rev=18126&op=diff
==============================================================================
--- trunk/libmime-charset-perl/debian/rules (original)
+++ trunk/libmime-charset-perl/debian/rules Sat Mar 29 17:14:56 2008
@@ -11,18 +11,13 @@
 # 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
-	# Add commands to compile the package here
 	$(PERL) Makefile.PL INSTALLDIRS=vendor
 	$(MAKE)
 	$(MAKE) test
@@ -40,14 +35,13 @@
 	dh_testroot
 	dh_clean -k
 	$(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:
-	[ ! -d $(TMP)/usr/lib/perl5 ] || rmdir --ignore-fail-on-non-empty --parents --verbose $(TMP)/usr/lib/perl5
+	[ ! -d $(TMP)/usr/lib/perl5 ] || \
+		rmdir --ignore-fail-on-non-empty --parents --verbose \
+		$(TMP)/usr/lib/perl5
 	touch $@
 
 binary-arch:
-# We have nothing to do by default.
+# We have nothing to do here for an architecture-independent package
 
 binary-indep: build install
 	dh_testdir
@@ -62,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