r18970 - in /trunk/libnet-z3950-zoom-perl/debian: changelog rules

[gregoa at users.alioth.debian.org]

Author: gregoa
Date: Mon Apr 21 16:08:56 2008
New Revision: 18970

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

Modified:
    trunk/libnet-z3950-zoom-perl/debian/changelog
    trunk/libnet-z3950-zoom-perl/debian/rules

Modified: trunk/libnet-z3950-zoom-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libnet-z3950-zoom-perl/debian/changelog?rev=18970&op=diff
==============================================================================
--- trunk/libnet-z3950-zoom-perl/debian/changelog (original)
+++ trunk/libnet-z3950-zoom-perl/debian/changelog Mon Apr 21 16:08:56 2008
@@ -16,9 +16,10 @@
   [ gregor herrmann ]
   * debian/rules: remove /usr/bin only if it exists.
   * debian/rules: delete /usr/share/perl5 only if it exists.
+  * Refresh debian/rules, no further functional changes.
   * debian/watch: use dist-based URL.
 
- -- gregor herrmann <gregoa at debian.org>  Mon, 21 Apr 2008 18:01:23 +0200
+ -- gregor herrmann <gregoa at debian.org>  Mon, 21 Apr 2008 18:06:09 +0200
 
 libnet-z3950-zoom-perl (1.19-1) UNRELEASED; urgency=low
 

Modified: trunk/libnet-z3950-zoom-perl/debian/rules
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libnet-z3950-zoom-perl/debian/rules?rev=18970&op=diff
==============================================================================
--- trunk/libnet-z3950-zoom-perl/debian/rules (original)
+++ trunk/libnet-z3950-zoom-perl/debian/rules Mon Apr 21 16:08:56 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)))
@@ -39,54 +35,47 @@
 clean:
 	dh_testdir
 	dh_testroot
+	dh_clean build-stamp install-stamp
 	[ ! -f Makefile ] || $(MAKE) realclean
-	dh_clean build-stamp install-stamp
 
-install: build install-stamp
-install-stamp:
+install: install-stamp
+install-stamp: build-stamp
 	dh_testdir
 	dh_testroot
 	dh_clean -k
 	$(MAKE) install DESTDIR=$(TMP) PREFIX=/usr
-
-	# As this is a architecture dependent package, we are not
-	# supposed to install stuff to /usr/share. MakeMaker creates
-	# the dirs, we delete them from the deb:
-	[ ! -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
 	# zselect in examples is enough
 	rm $(TMP)/usr/bin/zselect
-	[ ! -d $(TMP)/usr/bin ] || rmdir --ignore-fail-on-non-empty --parents $(TMP)/usr/bin
-
+	[ ! -d $(TMP)/usr/bin ] || \
+		rmdir --ignore-fail-on-non-empty --parents --verbose \
+		$(TMP)/usr/bin
 	# fix permissions in examples/
 	chmod 664 samples/zoom/*.pl
-
 	touch $@
 
 # Build architecture-independent files here.
 binary-indep: build install
-# We have nothing to do by default.
+# 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 README samples/README
 	dh_installexamples samples/*
+	dh_installdocs README
 	dh_installchangelogs Changes
+	dh_shlibdeps
 	dh_strip
+	dh_perl
 	dh_compress -Xexamples
 	dh_fixperms
-	dh_makeshlibs
 	dh_installdeb
-	dh_perl 
-	dh_shlibdeps
 	dh_gencontrol
 	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