[libfile-tail-perl] 06/18: Imported Debian patch 0.99.3-3

[Roland Rosenfeld]

This is an automated email from the git hooks/post-receive script.

roland pushed a commit to branch master
in repository libfile-tail-perl.

commit 29cc7f5edac0ef7d19ce4679a1043f8904c6d2fb
Author: Roland Rosenfeld <roland at debian.org>
Date:   Tue Feb 26 20:38:51 2008 +0100

    Imported Debian patch 0.99.3-3
---
 debian/changelog |  8 ++++++++
 debian/rules     | 29 ++++++++++++++---------------
 2 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4900c75..087bcde 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+libfile-tail-perl (0.99.3-3) unstable; urgency=low
+
+  * Upgrade debian/rules according to new dh-make-perl
+    (rules.MakeMaker.noxs), including stuff to remove /usr/lib/perl5 only
+    if it exists (to avoid problems with perl 5.10.0) (Closes: #467794).
+
+ -- Roland Rosenfeld <roland at debian.org>  Tue, 26 Feb 2008 20:38:51 +0100
+
 libfile-tail-perl (0.99.3-2) unstable; urgency=low
 
   * Add debian/watch file, thanks to Juan Angulo Moreno (Closes: #458612).
diff --git a/debian/rules b/debian/rules
index 9500441..77e35cb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,6 @@
 #!/usr/bin/make -f
 #
-# (c) 2007  Roland Rosenfeld <roland at debian.org>
+# (c) 2007-2008  Roland Rosenfeld <roland at debian.org>
 # 
 # This debian/rules file was intially created using dh-make-perl by
 # Marc Brockschmidt <marc at dch-faq.de> for the Debian Perl Group
@@ -31,48 +31,47 @@ build-stamp: patch-stamp
 
 	$(PERL) Makefile.PL INSTALLDIRS=vendor
 	$(MAKE)
+	$(MAKE) test
 
-	touch build-stamp
+	touch $@
 
 clean: clean1 unpatch
 clean1:
 	dh_testdir
 	dh_testroot
 
-	[ ! -f Makefile ] || $(MAKE) realclean
-
 	dh_clean build-stamp install-stamp
 
-install: build install-stamp
-install-stamp:
+	# Add commands to clean up after the build process here
+	[ ! -f Makefile ] || $(MAKE) realclean
+
+install: install-stamp
+install-stamp: build-stamp
 	dh_testdir
 	dh_testroot
 	dh_clean -k
 
-	$(MAKE) test
 	$(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:
-	rmdir --ignore-fail-on-non-empty --parents $(TMP)/usr/lib/perl5
+	[ ! -d $(TMP)/usr/lib/perl5 ] \
+	|| rmdir --ignore-fail-on-non-empty --parents --verbose \
+		 $(TMP)/usr/lib/perl5
 
-	touch install-stamp
+	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
 	dh_testroot
-#	dh_installcron
-#	dh_installmenu
 	dh_installexamples
 	dh_installdocs README
 	dh_installchangelogs Changes
 	dh_perl
-	dh_link
-	dh_strip
 	dh_compress
 	dh_fixperms
 	dh_installdeb
@@ -80,7 +79,7 @@ binary-indep: build install
 	dh_md5sums
 	dh_builddeb
 
-source diff:                                                                  
+source diff:
 	@echo >&2 'source and diff are obsolete - use dpkg-source -b'; false
 
 binary: binary-indep binary-arch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libfile-tail-perl.git