r21816 - in /trunk/libtest-tap-model-perl/debian: changelog control rules

[gregoa at users.alioth.debian.org]

Author: gregoa
Date: Tue Jun 17 16:32:43 2008
New Revision: 21816

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=21816
Log:
* Refresh debian/rules, no functional changes. Install upstream changelog.
* debian/control: remove libmodule-build-perl, add libmethod-alias-perl to
  (build) dependencies.

Modified:
    trunk/libtest-tap-model-perl/debian/changelog
    trunk/libtest-tap-model-perl/debian/control
    trunk/libtest-tap-model-perl/debian/rules

Modified: trunk/libtest-tap-model-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtest-tap-model-perl/debian/changelog?rev=21816&op=diff
==============================================================================
--- trunk/libtest-tap-model-perl/debian/changelog (original)
+++ trunk/libtest-tap-model-perl/debian/changelog Tue Jun 17 16:32:43 2008
@@ -15,6 +15,9 @@
   * Set Standards-Version to 3.8.0 (no changes).
   * Set debhelper compatibility level to 5.
   * Add /me to Uploaders.
+  * Refresh debian/rules, no functional changes. Install upstream changelog.
+  * debian/control: remove libmodule-build-perl, add libmethod-alias-perl to
+    (build) dependencies.
 
  -- gregor herrmann <gregoa at debian.org>  Sun, 15 Jun 2008 17:44:16 +0200
 

Modified: trunk/libtest-tap-model-perl/debian/control
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtest-tap-model-perl/debian/control?rev=21816&op=diff
==============================================================================
--- trunk/libtest-tap-model-perl/debian/control (original)
+++ trunk/libtest-tap-model-perl/debian/control Tue Jun 17 16:32:43 2008
@@ -1,8 +1,8 @@
 Source: libtest-tap-model-perl
 Section: perl
 Priority: optional
-Build-Depends: debhelper (>= 5), libmodule-build-perl
-Build-Depends-Indep: perl (>= 5.8.0-7)
+Build-Depends: debhelper (>= 5)
+Build-Depends-Indep: perl (>= 5.8.0-7), libmethod-alias-perl
 Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
 Uploaders: Florian Ragwitz <rafl at debianforum.de>,
  gregor herrmann <gregoa at debian.org>
@@ -13,7 +13,7 @@
 
 Package: libtest-tap-model-perl
 Architecture: all
-Depends: ${perl:Depends}, ${misc:Depends}, 
+Depends: ${perl:Depends}, ${misc:Depends}, libmethod-alias-perl
 Description:  Accessible (queryable, serializable object) result collector
  This module is a subclass of Test::Harness::Straps (although in an ideal
  world it would really use delegation).

Modified: trunk/libtest-tap-model-perl/debian/rules
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtest-tap-model-perl/debian/rules?rev=21816&op=diff
==============================================================================
--- trunk/libtest-tap-model-perl/debian/rules (original)
+++ trunk/libtest-tap-model-perl/debian/rules Tue Jun 17 16:32:43 2008
@@ -1,45 +1,54 @@
 #!/usr/bin/make -f
+# 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.
 
+# 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)
+PERL   ?= /usr/bin/perl
+PACKAGE = $(shell dh_listpackages)
+TMP     = $(CURDIR)/debian/$(PACKAGE)
 
 build: build-stamp
 build-stamp:
 	dh_testdir
-	$(PERL) Build.PL installdirs=vendor
-	OPTIMIZE="-Wall -O2 -g" $(PERL) Build
-	touch build-stamp
+	$(PERL) Makefile.PL INSTALLDIRS=vendor
+	$(MAKE)
+	$(MAKE) test
+	touch $@
 
 clean:
 	dh_testdir
 	dh_testroot
-	[ ! -f Build ] || $(PERL) Build distclean
 	dh_clean build-stamp install-stamp
+	# upstream tarball ships a Makefile ...
+	[ ! -f Makefile ] || ( $(PERL) Makefile.PL && $(MAKE) realclean )
 
-install: build install-stamp
-install-stamp:
+install: install-stamp
+install-stamp: build-stamp
 	dh_testdir
 	dh_testroot
 	dh_clean -k
-	$(PERL) Build test
-	$(PERL) Build install destdir=$(TMP)
-	touch install-stamp
+	$(MAKE) install DESTDIR=$(TMP) PREFIX=/usr
+	[ ! -d $(TMP)/usr/lib/perl5 ] || \
+		rmdir --ignore-fail-on-non-empty --parents --verbose \
+		$(TMP)/usr/lib/perl5
+	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_installdocs 
-	dh_installchangelogs 
+	dh_installdocs
+	dh_installchangelogs Changes
 	dh_perl
 	dh_compress
 	dh_fixperms
@@ -48,8 +57,5 @@
 	dh_md5sums
 	dh_builddeb
 
-source diff:                                                                  
-	@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