r20383 - in /trunk/libclass-methodmaker-perl/debian: changelog rules

[gregoa at users.alioth.debian.org]

Author: gregoa
Date: Sat May 24 22:22:46 2008
New Revision: 20383

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

Modified:
    trunk/libclass-methodmaker-perl/debian/changelog
    trunk/libclass-methodmaker-perl/debian/rules

Modified: trunk/libclass-methodmaker-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libclass-methodmaker-perl/debian/changelog?rev=20383&op=diff
==============================================================================
--- trunk/libclass-methodmaker-perl/debian/changelog (original)
+++ trunk/libclass-methodmaker-perl/debian/changelog Sat May 24 22:22:46 2008
@@ -3,6 +3,7 @@
   * Add patch no-warnings-once.patch to turn off warnings about 
     'Name " Foo::Bar" used only once" (closes: #481227).
   * debian/control: change my email address.
+  * Refresh debian/rules, no functional changes.
 
  -- gregor herrmann <gregoa at debian.org>  Sun, 25 May 2008 00:06:28 +0200
 

Modified: trunk/libclass-methodmaker-perl/debian/rules
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libclass-methodmaker-perl/debian/rules?rev=20383&op=diff
==============================================================================
--- trunk/libclass-methodmaker-perl/debian/rules (original)
+++ trunk/libclass-methodmaker-perl/debian/rules Sat May 24 22:22:46 2008
@@ -7,21 +7,17 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-include /usr/share/quilt/quilt.make
-
 # 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)
+include /usr/share/quilt/quilt.make
 
-ifndef PERL
-PERL = /usr/bin/perl
-endif
+PERL   ?= /usr/bin/perl
+PACKAGE = $(shell dh_listpackages)
+TMP     = $(CURDIR)/debian/$(PACKAGE)
 
-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)))
@@ -33,19 +29,15 @@
 build: build-stamp
 build-stamp: $(QUILT_STAMPFN)
 	dh_testdir
-
 	$(PERL) Makefile.PL INSTALLDIRS=vendor
 	$(MAKE) OPTIMIZE="$(CFLAGS)" LD_RUN_PATH=""
 	$(MAKE) test
-
 	touch $@
 
 clean: unpatch
 	dh_testdir
 	dh_testroot
-
 	dh_clean build-stamp install-stamp
-
 	[ ! -f Makefile ] || $(MAKE) realclean
 
 install: install-stamp
@@ -53,11 +45,10 @@
 	dh_testdir
 	dh_testroot
 	dh_clean -k
-
 	$(MAKE) install DESTDIR=$(TMP) PREFIX=/usr
-
-	[ ! -d $(TMP)/usr/share/perl5 ] || rmdir --ignore-fail-on-non-empty --parents --verbose $(TMP)/usr/share/perl5
-
+	[ ! -d $(TMP)/usr/share/perl5 ] || \
+		rmdir --ignore-fail-on-non-empty --parents --verbose \
+		$(TMP)/usr/share/perl5
 	touch $@
 
 # Build architecture-independent files here.
@@ -81,8 +72,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