r18607 - in /trunk/libwww-perl/debian: changelog rules

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

Author: gregoa-guest
Date: Tue Apr 15 15:18:55 2008
New Revision: 18607

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=18607
Log:
debian/rules:
- remove *VENDORARCH* variables
- remove empty /usr/lib/perl5 directory if it exists

Modified:
    trunk/libwww-perl/debian/changelog
    trunk/libwww-perl/debian/rules

Modified: trunk/libwww-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libwww-perl/debian/changelog?rev=18607&op=diff
==============================================================================
--- trunk/libwww-perl/debian/changelog (original)
+++ trunk/libwww-perl/debian/changelog Tue Apr 15 15:18:55 2008
@@ -2,8 +2,11 @@
 
   * New upstream release (closes: #476237).
   * debian/watch: extended regexp for matching upstream releases.
-
- -- gregor herrmann <gregor+debian at comodo.priv.at>  Tue, 15 Apr 2008 17:12:27 +0200
+  * debian/rules:
+    - remove *VENDORARCH* variables
+    - remove empty /usr/lib/perl5 directory if it exists
+
+ -- gregor herrmann <gregor+debian at comodo.priv.at>  Tue, 15 Apr 2008 17:14:17 +0200
 
 libwww-perl (5.810-1) unstable; urgency=low
 

Modified: trunk/libwww-perl/debian/rules
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libwww-perl/debian/rules?rev=18607&op=diff
==============================================================================
--- trunk/libwww-perl/debian/rules (original)
+++ trunk/libwww-perl/debian/rules Tue Apr 15 15:18:55 2008
@@ -36,9 +36,7 @@
 build: build-stamp
 build-stamp:
 	dh_testdir
-	$(PERL) Makefile.PL INSTALLDIRS=vendor \
-		INSTALLVENDORARCH=/usr/share/perl5/ \
-		VENDORARCHEXP=/usr/share/perl5/
+	$(PERL) Makefile.PL INSTALLDIRS=vendor
 	$(MAKE)
 	# Turn off the live checks
 	if [ -f t/live/ENABLED ]; then rm t/live/ENABLED; fi
@@ -56,6 +54,7 @@
 install-stamp: build-stamp
 	dh_testdir
 	$(MAKE) install DESTDIR=$(TMP) PREFIX=/usr
+	[ ! -d $(TMP)/usr/lib/perl5 ] || rmdir --ignore-fail-on-non-empty --parents --verbose $(TMP)/usr/lib/perl5
 
 	touch install-stamp