r17251 - in /trunk/libgtk2-ex-printdialog-perl/debian: changelog rules

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

Author: gregoa-guest
Date: Wed Mar 12 18:12:13 2008
New Revision: 17251

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=17251
Log:
debian/rules:
  - remove *VENDORARCH* variables
  - remove /usr/lib/perl5 if it exists
  - let install-stamp target depend on build-stamp
  - add install to .PHONY target

Modified:
    trunk/libgtk2-ex-printdialog-perl/debian/changelog
    trunk/libgtk2-ex-printdialog-perl/debian/rules

Modified: trunk/libgtk2-ex-printdialog-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libgtk2-ex-printdialog-perl/debian/changelog?rev=17251&op=diff
==============================================================================
--- trunk/libgtk2-ex-printdialog-perl/debian/changelog (original)
+++ trunk/libgtk2-ex-printdialog-perl/debian/changelog Wed Mar 12 18:12:13 2008
@@ -10,8 +10,13 @@
   [ gregor herrmann ]
   * The build dependeny on liblocale-gettext-perl has already been added by
     Jeffrey (closes: #467273).
+  * debian/rules:
+    - remove *VENDORARCH* variables
+    - remove /usr/lib/perl5 if it exists
+    - let install-stamp target depend on build-stamp
+    - add install to .PHONY target
 
- -- gregor herrmann <gregor+debian at comodo.priv.at>  Wed, 12 Mar 2008 18:59:45 +0100
+ -- gregor herrmann <gregor+debian at comodo.priv.at>  Wed, 12 Mar 2008 19:09:26 +0100
 
 libgtk2-ex-printdialog-perl (0.03-2) unstable; urgency=low
 

Modified: trunk/libgtk2-ex-printdialog-perl/debian/rules
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libgtk2-ex-printdialog-perl/debian/rules?rev=17251&op=diff
==============================================================================
--- trunk/libgtk2-ex-printdialog-perl/debian/rules (original)
+++ trunk/libgtk2-ex-printdialog-perl/debian/rules Wed Mar 12 18:12:13 2008
@@ -31,9 +31,7 @@
 	# 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
 
@@ -48,14 +46,16 @@
 	# Add commands to clean up after the build process here
 	[ ! -f Makefile ] || $(MAKE) realclean
 
-install: build install-stamp
-install-stamp:
+install: install-stamp
+install-stamp: build-stamp
 	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 --parents --ignore-fail-on-non-empty --verbose $(TMP)/usr/lib/perl5
 
 	touch $@
 
@@ -79,4 +79,4 @@
 	@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