r19559 - in /trunk/libcompress-zlib-perl/debian: changelog rules

[gregoa at users.alioth.debian.org]

Author: gregoa
Date: Tue May  6 16:56:31 2008
New Revision: 19559

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=19559
Log:
* Add INST_LIB='blib/lib' to $(PERL) Makefile.PL in debian/rules,
  otherwise the variable is set wrong.
* Refresh debian/rules, no other functional changes.

Modified:
    trunk/libcompress-zlib-perl/debian/changelog
    trunk/libcompress-zlib-perl/debian/rules

Modified: trunk/libcompress-zlib-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcompress-zlib-perl/debian/changelog?rev=19559&op=diff
==============================================================================
--- trunk/libcompress-zlib-perl/debian/changelog (original)
+++ trunk/libcompress-zlib-perl/debian/changelog Tue May  6 16:56:31 2008
@@ -1,8 +1,11 @@
 libcompress-zlib-perl (2.010-1) UNRELEASED; urgency=low
 
   * New upstream release.
-
- -- gregor herrmann <gregoa at debian.org>  Tue, 06 May 2008 18:47:41 +0200
+  * Add INST_LIB='blib/lib' to $(PERL) Makefile.PL in debian/rules,
+    otherwise the variable is set wrong.
+  * Refresh debian/rules, no other functional changes.
+
+ -- gregor herrmann <gregoa at debian.org>  Tue, 06 May 2008 18:56:03 +0200
 
 libcompress-zlib-perl (2.009-1) unstable; urgency=low
 

Modified: trunk/libcompress-zlib-perl/debian/rules
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcompress-zlib-perl/debian/rules?rev=19559&op=diff
==============================================================================
--- trunk/libcompress-zlib-perl/debian/rules (original)
+++ trunk/libcompress-zlib-perl/debian/rules Tue May  6 16:56:31 2008
@@ -13,28 +13,21 @@
 # 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: $(QUILT_STAMPFN)
 	dh_testdir
-
-	$(PERL) Makefile.PL INSTALLDIRS=vendor
+	$(PERL) Makefile.PL INSTALLDIRS=vendor INST_LIB='blib/lib'
 	$(MAKE)
 	$(MAKE) test
-
 	touch $@
 
 clean: unpatch
 	dh_testdir
 	dh_testroot
-
 	dh_clean build-stamp install-stamp
 	[ ! -f Makefile ] || $(MAKE) realclean
 
@@ -43,10 +36,10 @@
 	dh_testdir
 	dh_testroot
 	dh_clean -k
-
 	$(MAKE) install DESTDIR=$(TMP) PREFIX=/usr
-	[ ! -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:
@@ -66,8 +59,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 install