r23188 - in /trunk/libwww-curl-perl/debian: changelog rules

[gregoa at users.alioth.debian.org]

Author: gregoa
Date: Mon Jul 14 16:28:35 2008
New Revision: 23188

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

Modified:
    trunk/libwww-curl-perl/debian/changelog
    trunk/libwww-curl-perl/debian/rules

Modified: trunk/libwww-curl-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libwww-curl-perl/debian/changelog?rev=23188&op=diff
==============================================================================
--- trunk/libwww-curl-perl/debian/changelog (original)
+++ trunk/libwww-curl-perl/debian/changelog Mon Jul 14 16:28:35 2008
@@ -25,6 +25,9 @@
   * debian/copyright:
    + Added license for inc/* files.
 
+  [ gregor herrmann ]
+  * Refresh debian/rules, no functional changes.
+
  -- Jose Luis Rivas <ghostbar38 at gmail.com>  Sun, 13 Jul 2008 18:23:44 -0430
 
 libwww-curl-perl (4.00-1) unstable; urgency=low

Modified: trunk/libwww-curl-perl/debian/rules
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libwww-curl-perl/debian/rules?rev=23188&op=diff
==============================================================================
--- trunk/libwww-curl-perl/debian/rules (original)
+++ trunk/libwww-curl-perl/debian/rules Mon Jul 14 16:28:35 2008
@@ -3,16 +3,15 @@
 # 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)
+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)))
@@ -21,53 +20,50 @@
         CFLAGS += -O2
 endif
 
-configure: configure-stamp
-configure-stamp:
+build: build-stamp
+build-stamp:
 	dh_testdir
 	$(PERL) Makefile.PL INSTALLDIRS=vendor
-	touch $@
-
-build: build-stamp
-build-stamp: configure-stamp
-	dh_testdir
-	$(MAKE) OPTIMIZE="$(CFLAGS)"
+	$(MAKE) OPTIMIZE="$(CFLAGS)" LD_RUN_PATH=""
 	$(MAKE) test TEST_FILES="t/00constants.t t/pod-coverage.t t/pod.t"
 	touch $@
 
 clean:
 	dh_testdir
 	dh_testroot
-	rm -f build-stamp configure-stamp install-stamp Makefile.old curlopt-constants.c lib/WWW/Curl/Easy.pm lib/WWW/Curl/Share.pm
-	dh_clean
+	dh_clean build-stamp configure-stamp install-stamp Makefile.old curlopt-constants.c lib/WWW/Curl/Easy.pm lib/WWW/Curl/Share.pm
 	[ ! -f Makefile ] || $(MAKE) clean
-	[ ! -f Makefile.old ] || rm -f Makefile.old
 
 install: install-stamp
 install-stamp: build-stamp
 	dh_testdir
 	dh_testroot
 	dh_clean -k
-	dh_installdirs
 	$(MAKE) PREFIX=/usr DESTDIR=$(TMP) install
-	[ ! -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.
 binary-indep: build install
+# We have nothing to do here for an architecture-dependent package
 
+# Build architecture-dependent files here.
 binary-arch: build install
 	dh_testdir
 	dh_testroot
 	dh_installdocs
 	dh_installchangelogs Changes
+	dh_shlibdeps
 	dh_strip
+	dh_perl
 	dh_compress
 	dh_fixperms
 	dh_installdeb
-	dh_perl
-	dh_shlibdeps
 	dh_gencontrol
 	dh_md5sums
 	dh_builddeb
 
 binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure
+.PHONY: build clean binary-indep binary-arch binary install