r20170 - in /trunk/liblist-compare-perl/debian: changelog rules

[gregoa at users.alioth.debian.org]

Author: gregoa
Date: Mon May 19 18:21:13 2008
New Revision: 20170

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=20170
Log:
* debian/rules:
  - refresh with dh-make-perl's help
  - install new FAQ
  - tell $(MAKE) test where to find its included test modules

Modified:
    trunk/liblist-compare-perl/debian/changelog
    trunk/liblist-compare-perl/debian/rules

Modified: trunk/liblist-compare-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/liblist-compare-perl/debian/changelog?rev=20170&op=diff
==============================================================================
--- trunk/liblist-compare-perl/debian/changelog (original)
+++ trunk/liblist-compare-perl/debian/changelog Mon May 19 18:21:13 2008
@@ -3,6 +3,10 @@
   * New upstream release.
   * debian/copyright: update years of copyright according to upstream
     changes.
+  * debian/rules:
+    - refresh with dh-make-perl's help
+    - install new FAQ
+    - tell $(MAKE) test where to find its included test modules
 
  -- gregor herrmann <gregoa at debian.org>  Mon, 19 May 2008 19:54:21 +0200
 

Modified: trunk/liblist-compare-perl/debian/rules
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/liblist-compare-perl/debian/rules?rev=20170&op=diff
==============================================================================
--- trunk/liblist-compare-perl/debian/rules (original)
+++ trunk/liblist-compare-perl/debian/rules Mon May 19 18:21:13 2008
@@ -11,20 +11,16 @@
 # 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) Makefile.PL INSTALLDIRS=vendor
 	$(MAKE)
-	$(MAKE) test
+	PERLLIB=$(CURDIR)/t/Test $(MAKE) test
 	touch $@
 
 clean:
@@ -39,19 +35,18 @@
 	dh_testroot
 	dh_clean -k
 	$(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:
-	[ ! -d $(TMP)/usr/lib/perl5 ] || rmdir --ignore-fail-on-non-empty --parents --verbose $(TMP)/usr/lib/perl5
+	[ ! -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_installdocs FAQ
 	dh_installchangelogs Changes
 	dh_perl
 	dh_compress
@@ -61,8 +56,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