r21085 - in /trunk/libhtml-template-pro-perl/debian: changelog rules

[gregoa at users.alioth.debian.org]

Author: gregoa
Date: Sat Jun 14 20:27:07 2008
New Revision: 21085

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

Modified:
    trunk/libhtml-template-pro-perl/debian/changelog
    trunk/libhtml-template-pro-perl/debian/rules

Modified: trunk/libhtml-template-pro-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libhtml-template-pro-perl/debian/changelog?rev=21085&op=diff
==============================================================================
--- trunk/libhtml-template-pro-perl/debian/changelog (original)
+++ trunk/libhtml-template-pro-perl/debian/changelog Sat Jun 14 20:27:07 2008
@@ -5,6 +5,7 @@
   * debian/copyright: update years of copyright.
   * Set Standards-Version to 3.8.0 (no changes).
   * Add /me to Uploaders.
+  * Refresh debian/rules, no functional changes.
 
  -- gregor herrmann <gregoa at debian.org>  Sat, 14 Jun 2008 22:16:08 +0200
 

Modified: trunk/libhtml-template-pro-perl/debian/rules
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libhtml-template-pro-perl/debian/rules?rev=21085&op=diff
==============================================================================
--- trunk/libhtml-template-pro-perl/debian/rules (original)
+++ trunk/libhtml-template-pro-perl/debian/rules Sat Jun 14 20:27:07 2008
@@ -11,15 +11,11 @@
 # 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)))
@@ -31,34 +27,27 @@
 build: build-stamp
 build-stamp:
 	dh_testdir
-
-	# Add commands to compile the package here
 	$(PERL) Makefile.PL PCRE=1 INSTALLDIRS=vendor
 	$(MAKE) OPTIMIZE="$(CFLAGS)" LD_RUN_PATH=""
 	$(MAKE) test
 	konwert cp1251-utf8 README.ru > debian/README.ru
-
 	touch $@
 
 clean:
 	dh_testdir
 	dh_testroot
-
 	dh_clean build-stamp install-stamp debian/README.ru
-
-	# Add commands to clean up after the build process here
 	[ ! -f Makefile ] || $(MAKE) realclean
 
-install: build install-stamp
-install-stamp:
+install: install-stamp
+install-stamp: build-stamp
 	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/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.
@@ -69,7 +58,6 @@
 binary-arch: build install
 	dh_testdir
 	dh_testroot
-	#dh_installexamples 
 	dh_installdocs FAQ debian/README.ru
 	dh_installchangelogs Changes
 	dh_shlibdeps
@@ -82,8 +70,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