r18945 - in /trunk/libhttp-proxy-perl/debian: changelog rules

gregoa at users.alioth.debian.org gregoa at users.alioth.debian.org
Sun Apr 20 19:18:37 UTC 2008


Author: gregoa
Date: Sun Apr 20 19:18:37 2008
New Revision: 18945

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=18945
Log:
debian/rules: refresh with dh-make-perl's help; activate test suite.

Modified:
    trunk/libhttp-proxy-perl/debian/changelog
    trunk/libhttp-proxy-perl/debian/rules

Modified: trunk/libhttp-proxy-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libhttp-proxy-perl/debian/changelog?rev=18945&op=diff
==============================================================================
--- trunk/libhttp-proxy-perl/debian/changelog (original)
+++ trunk/libhttp-proxy-perl/debian/changelog Sun Apr 20 19:18:37 2008
@@ -14,8 +14,9 @@
     from debian/rules.
   * Remove debian/libhttp-proxy-perl.docs and install README directly from
     debian/rules.
+  * debian/rules: refresh with dh-make-perl's help; activate test suite.
 
- -- gregor herrmann <gregoa at debian.org>  Sun, 20 Apr 2008 21:04:10 +0200
+ -- gregor herrmann <gregoa at debian.org>  Sun, 20 Apr 2008 21:17:36 +0200
 
 libhttp-proxy-perl (0.20-1) unstable; urgency=low
 

Modified: trunk/libhttp-proxy-perl/debian/rules
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libhttp-proxy-perl/debian/rules?rev=18945&op=diff
==============================================================================
--- trunk/libhttp-proxy-perl/debian/rules (original)
+++ trunk/libhttp-proxy-perl/debian/rules Sun Apr 20 19:18:37 2008
@@ -1,63 +1,68 @@
 #!/usr/bin/make -f
-# Sample debian/rules that uses debhelper.
-# GNU copyright 1997 to 1999 by Joey Hess.
+# This debian/rules file is provided as a template for normal perl
+# packages. It was created by Marc Brockschmidt <marc at dch-faq.de> for
+# the Debian Perl Group (http://pkg-perl.alioth.debian.org/) but may
+# be used freely wherever it is useful.
+#
+# It was later modified by Jason Kohles <email at jasonkohles.com>
+# http://www.jasonkohles.com/ to support Module::Build installed modules
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-# This is the debhelper compatibility version to use.
-#export DH_COMPAT=4
+# If set to a true value then MakeMaker's prompt function will
+# always return the default without waiting for user input.
+export PERL_MM_USE_DEFAULT=1
 
-PACKAGE=`pwd | sed -e "s/.*\/\\(.*\\)-.*/\\1/"`
-SHAREDIR=$(CURDIR)/debian/$(PACKAGE)/usr/share/$(PACKAGE)
+PERL   ?= /usr/bin/perl
+PACKAGE = $(shell dh_listpackages)
+TMP     = $(CURDIR)/debian/$(PACKAGE)
 
-build:
+build: build-stamp
+build-stamp:
 	dh_testdir
-	# Add here commands to compile the package.
-	perl Build.PL installdirs=vendor
-clean:
-	dh_testdir
-	dh_testroot
-
-	-./Build clean
-	rm -rf ./Build _build
-	dh_clean
-
-install:
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-	dh_installdirs
-	
+	$(PERL) Build.PL installdirs=vendor
+	$(PERL) Build
 	# jaybonci: We need to skip tests on libhttp-proxy-perl
-	# While we can run them on an uninhibited environment, they
+	# While we can run them on an uninhibited environment, they  
 	# cannot create the sockets in a chroot environment (and
 	# reconnect to them). Everytime you build this package, you
 	# should try the tests, but for the "releasable" package,
 	# we'll need to skip them
+	# gregoa: tests work fine in a cowbuilder chroot and without network
+	$(PERL) Build test
+	touch $@
 
+clean:
+	dh_testdir
+	dh_testroot
+	dh_clean build-stamp install-stamp
+	[ ! -f Build ] || $(PERL) Build --allow_mb_mismatch 1 distclean
 
-	#./Build test
-	./Build install destdir=$(CURDIR)/debian/$(PACKAGE)
-	[ ! -d $(CURDIR)/debian/$(shell dh_listpackages)/usr/lib/perl5 ] || rmdir --ignore-fail-on-non-empty --parents --verbose $(CURDIR)/debian/$(shell dh_listpackages)/usr/lib/perl5
+install: install-stamp
+install-stamp: build-stamp
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+	$(PERL) Build install destdir=$(TMP) create_packlist=0
+	touch $@
 
-binary-arch:;
+binary-arch:
+# We have nothing to do here for an architecture-independent package
+
 binary-indep: build install
 	dh_testdir
 	dh_testroot
 	dh_installdocs README
-	dh_installman
 	dh_installexamples eg/*
 	dh_installchangelogs Changes
-	dh_link
-	dh_strip
+	dh_perl
 	dh_compress
 	dh_fixperms
 	dh_installdeb
-	dh_perl
 	dh_gencontrol
 	dh_md5sums
 	dh_builddeb
 
 binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure
+.PHONY: build clean binary-indep binary-arch binary install




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