[SCM] Debian packaging of libwww-search-perl branch, master, updated. upstream/2.46-13-g9920418

Nicholas Bamber nicholas at periapt.co.uk
Wed Nov 2 21:28:54 UTC 2011


The following commit has been merged in the master branch:
commit 922e4f7b10998f5cabda316e575c4beb552979a1
Author: Nicholas Bamber <nicholas at periapt.co.uk>
Date:   Wed Nov 2 19:04:26 2011 +0000

    fixed clean rules again after discussing with gregoa.
    Removed python workaround

diff --git a/debian/rules b/debian/rules
index 6f30509..1b073fd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,8 +10,6 @@ override_dh_auto_install:
 	dh_auto_install
 	sed -i -e'1s/#!\/usr\/local\/bin\/perl/#/' $(TMP)/usr/share/perl5/WWW/Search/*.pm
 
-override_dh_pysupport:
-
 override_dh_auto_test:
 	PERL5LIB=blib/lib PATH=blib/script:${PATH} dh_auto_test
 
@@ -20,7 +18,11 @@ override_dh_components:
 	mv $(TMP)/usr/bin/googlism.pl $(TMP)/usr/bin/googlism
 	mv $(TMP)/usr/share/man/man1/googlism.pl.1p $(TMP)/usr/share/man/man1/googlism.1p
 
+# We had to patch Makefile.PL as otherwise the sub-directory Makefile.PL's 
+# are found, run and failed. Then as the patch is unapplied at the end
+# Makefile is older than Makefile.PL. Makefile.PL then tries to recreate
+# Makefile but is now unpatched.
 override_dh_auto_clean:
-	test -f && touch Makefile
+	if [ -f Makefile ]; then touch Makefile; fi
 	dh_auto_clean
 

-- 
Debian packaging of libwww-search-perl



More information about the Pkg-perl-cvs-commits mailing list