r21959 - in /trunk/libmodule-install-perl/debian: changelog compat control rules

[dmn at users.alioth.debian.org]

Author: dmn
Date: Fri Jun 20 13:16:24 2008
New Revision: 21959

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=21959
Log:
* shorten debian/rules with debhelper 7
  + bump compat-level and DH build-dep accordingly

Modified:
    trunk/libmodule-install-perl/debian/changelog
    trunk/libmodule-install-perl/debian/compat
    trunk/libmodule-install-perl/debian/control
    trunk/libmodule-install-perl/debian/rules

Modified: trunk/libmodule-install-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libmodule-install-perl/debian/changelog?rev=21959&op=diff
==============================================================================
--- trunk/libmodule-install-perl/debian/changelog (original)
+++ trunk/libmodule-install-perl/debian/changelog Fri Jun 20 13:16:24 2008
@@ -25,6 +25,8 @@
   * add libextutils-parsexs-perl (>= 2.19) to (build-) depends
   * make (build-) dependency on libmodule-build-perl versioned (>= 0.2808)
   * make build-dependency on libfile-remove-perl versioned (>= 0.40)
+  * shorten debian/rules with debhelper 7
+    + bump compat-level and DH build-dep accordingly
 
   [ Niko Tyni ]
   * prefer perl-modules (>= 5.10.0) over versioned dependencies on

Modified: trunk/libmodule-install-perl/debian/compat
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libmodule-install-perl/debian/compat?rev=21959&op=diff
==============================================================================
--- trunk/libmodule-install-perl/debian/compat (original)
+++ trunk/libmodule-install-perl/debian/compat Fri Jun 20 13:16:24 2008
@@ -1,1 +1,1 @@
-5
+7

Modified: trunk/libmodule-install-perl/debian/control
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libmodule-install-perl/debian/control?rev=21959&op=diff
==============================================================================
--- trunk/libmodule-install-perl/debian/control (original)
+++ trunk/libmodule-install-perl/debian/control Fri Jun 20 13:16:24 2008
@@ -1,7 +1,7 @@
 Source: libmodule-install-perl
 Section: perl
 Priority: optional
-Build-Depends: debhelper (>= 5.0.0), quilt (>= 0.40)
+Build-Depends: debhelper (>= 7), quilt (>= 0.40)
 Build-Depends-Indep: perl (>= 5.8.0-7), libmodule-scandeps-perl (>= 0.83),
  libpar-dist-perl (>= 0.29),
  perl-modules (>= 5.10.0) | libarchive-tar-perl (>= 1.38),

Modified: trunk/libmodule-install-perl/debian/rules
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libmodule-install-perl/debian/rules?rev=21959&op=diff
==============================================================================
--- trunk/libmodule-install-perl/debian/rules (original)
+++ trunk/libmodule-install-perl/debian/rules Fri Jun 20 13:16:24 2008
@@ -1,72 +1,37 @@
 #!/usr/bin/make -f
 
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-# 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 = $(shell dh_listpackages)
-
-ifndef PERL
-PERL = /usr/bin/perl
-endif
-
 TMP = $(CURDIR)/debian/$(PACKAGE)
 
 include /usr/share/quilt/quilt.make
 
 build: build-stamp
 build-stamp: $(QUILT_STAMPFN)
-	dh_testdir
-	$(PERL) Makefile.PL INSTALLDIRS=vendor --skipdeps
-	$(MAKE)
+	dh build --before test
 	AUTOMATED_TESTING=1 $(MAKE) test
+	dh build --after test
 	touch $@
 
 clean: unpatch
-	dh_testdir
-	dh_testroot
-	dh_clean build-stamp install-stamp
-	[ ! -f Makefile ] || $(MAKE) distclean
+	dh $@
 
 install: install-stamp
 install-stamp: build-stamp
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-
-	$(MAKE) install DESTDIR=$(TMP) PREFIX=/usr
-
-	[ ! -d $(TMP)/usr/lib/perl5 ] || rmdir --ignore-fail-on-non-empty --parents --verbose $(TMP)/usr/lib/perl5
+	dh install
 	[ ! -f $(TMP)/usr/share/perl5/Module/Install/Philosophy.pod ] || \
 	 rm $(TMP)/usr/share/perl5/Module/Install/Philosophy.pod 
 	[ ! -f $(TMP)/usr/share/perl5/Module/Install.pod ] || \
 	 rm $(TMP)/usr/share/perl5/Module/Install.pod 
-	[ ! -f  $(TMP)/usr/share/man/man3/Module::Install::Admin::Manifest.3pm ] ||  rm $(TMP)/usr/share/man/man3/Module::Install::Admin::Manifest.3pm
-
+	[ ! -f  $(TMP)/usr/share/man/man3/Module::Install::Admin::Manifest.3pm.gz ] ||  rm $(TMP)/usr/share/man/man3/Module::Install::Admin::Manifest.3pm.gz
+	
 	touch $@
 
-# Build architecture-dependent files here.
-binary-arch: build install
+binary-arch:
 # We have nothing to do by default.
 
 # Build architecture-independent files here.
-binary-indep: build install
-	dh_testdir
-	dh_testroot
-	dh_installdocs
-	dh_installchangelogs Changes
-	dh_installdirs usr/share/lintian/overrides
-	install -m 644 debian/libmodule-install-perl.lintian-overrides $(CURDIR)/debian/libmodule-install-perl/usr/share/lintian/overrides/libmodule-install-perl
-	dh_perl
-	dh_compress
-	dh_fixperms
-	dh_installdeb
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
+binary-indep: install
+	dh $@
 
 binary: binary-indep binary-arch
 .PHONY: build clean binary-indep binary-arch binary