r20014 - in /trunk/libpar-packer-perl/debian: changelog rules

[gregoa at users.alioth.debian.org]

Author: gregoa
Date: Fri May 16 14:10:22 2008
New Revision: 20014

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=20014
Log:
Refresh debian/rules, no functional changes.

Modified:
    trunk/libpar-packer-perl/debian/changelog
    trunk/libpar-packer-perl/debian/rules

Modified: trunk/libpar-packer-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libpar-packer-perl/debian/changelog?rev=20014&op=diff
==============================================================================
--- trunk/libpar-packer-perl/debian/changelog (original)
+++ trunk/libpar-packer-perl/debian/changelog Fri May 16 14:10:22 2008
@@ -1,6 +1,7 @@
 libpar-packer-perl (0.980-1) UNRELEASED; urgency=low
 
   * New upstream release.
+  * Refresh debian/rules, no functional changes.
 
  -- gregor herrmann <gregoa at debian.org>  Fri, 16 May 2008 15:49:49 +0200
 

Modified: trunk/libpar-packer-perl/debian/rules
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libpar-packer-perl/debian/rules?rev=20014&op=diff
==============================================================================
--- trunk/libpar-packer-perl/debian/rules (original)
+++ trunk/libpar-packer-perl/debian/rules Fri May 16 14:10:22 2008
@@ -13,15 +13,11 @@
 
 include /usr/share/quilt/quilt.make
 
-PACKAGE=$(shell dh_listpackages)
+PERL   ?= /usr/bin/perl
+PACKAGE = $(shell dh_listpackages)
+TMP     = $(CURDIR)/debian/$(PACKAGE)
 
-ifndef PERL
-PERL = /usr/bin/perl
-endif
-
-TMP     =$(CURDIR)/debian/$(PACKAGE)
-
-# Allow disabling build optimation by setting noopt in
+# Allow disabling build optimisation by setting noopt in
 # $DEB_BUILD_OPTIONS
 CFLAGS = -Wall -g
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
@@ -30,37 +26,22 @@
         CFLAGS += -O2
 endif
 
-.PHONY: config
-config: config-stamp
-config-stamp: $(QUILT_STAMPFN)
+build: build-stamp
+build-stamp: $(QUILT_STAMPFN)
 	dh_testdir
-
 	$(PERL) Makefile.PL INSTALLDIRS=vendor
-
-	touch $@
-
-build: build-stamp
-build-stamp: config-stamp
-	dh_testdir
-
 	$(MAKE) OPTIMIZE="$(CFLAGS)" LD_RUN_PATH=""
 	PERL_TEST_POD=1 $(MAKE) test
-
 	touch $@
 
 clean: unpatch
 	dh_testdir
 	dh_testroot
-
-	dh_clean config-stamp build-stamp install-stamp
-
-	# Add commands to clean up after the build process here
+	dh_clean build-stamp install-stamp myldr/Makefile.old
 	# dam: Makefile.PL is unpatched. It being newer that Makefile triggers
 	# Makefile rebuild, failing building twice in a row. To work around
 	# this, touch Makefile
 	[ ! -f Makefile ] || ( touch Makefile && $(MAKE) realclean )
-
-	dh_clean myldr/Makefile.old
 	rm -rf _Inline
 
 install: install-stamp
@@ -68,19 +49,15 @@
 	dh_testdir
 	dh_testroot
 	dh_clean -k
-
-	# Add commands to install the package into debian/$PACKAGE_NAME here
 	$(MAKE) install DESTDIR=$(TMP) PREFIX=/usr
-
-	[ ! -d $(TMP)/usr/lib/perl5 ] || rmdir --ignore-fail-on-non-empty --parents --verbose $(TMP)/usr/lib/perl5
-
+	[ ! -d $(TMP)/usr/share/perl5 ] || \
+		rmdir --ignore-fail-on-non-empty --parents --verbose \
+		$(TMP)/usr/share/perl5
 	dh_link usr/share/man/man1/parl.1p \
 		usr/share/man/man1/parldyn.1p
-
 	rm $(TMP)/usr/share/man/man1/pp.1p
 	dh_link usr/share/man/man3/pp.3pm \
 		usr/share/man/man1/pp.1p
-
 	touch $@
 
 # Build architecture-independent files here.
@@ -103,8 +80,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 install