r2036 - packages/libnet-ph-perl/trunk/debian

[Russ Allbery]

Author: rra
Date: 2006-01-21 21:27:52 +0000 (Sat, 21 Jan 2006)
New Revision: 2036

Modified:
   packages/libnet-ph-perl/trunk/debian/changelog
   packages/libnet-ph-perl/trunk/debian/rules
Log:
* General debian/rules cleanup.
  - Remove many unnecessary rules.
  - Remove empty /usr/lib/perl5 directory.
  - Don't ignore the exit status of make distclean.
  - Add build-arch and build-indep in case Policy ever requires them.

Modified: packages/libnet-ph-perl/trunk/debian/changelog
===================================================================
--- packages/libnet-ph-perl/trunk/debian/changelog	2006-01-21 21:18:16 UTC (rev 2035)
+++ packages/libnet-ph-perl/trunk/debian/changelog	2006-01-21 21:27:52 UTC (rev 2036)
@@ -1,11 +1,16 @@
 libnet-ph-perl (2.21-4) unstable; urgency=low
 
+  * General debian/rules cleanup.
+    - Remove many unnecessary rules.
+    - Remove empty /usr/lib/perl5 directory.
+    - Don't ignore the exit status of make distclean.
+    - Add build-arch and build-indep in case Policy ever requires them.
   * Move dephelper to Build-Depends since it's required for clean.
   * Build-Depend on the same version of libnet-perl as Depends.
   * Update standards version to 3.6.2 (no changes required).
   * Update debhelper compatibility level to V5.
 
- -- Russ Allbery <rra at debian.org>  Sat, 21 Jan 2006 13:18:01 -0800
+ -- Russ Allbery <rra at debian.org>  Sat, 21 Jan 2006 13:27:17 -0800
 
 libnet-ph-perl (2.21-3) unstable; urgency=low
 

Modified: packages/libnet-ph-perl/trunk/debian/rules
===================================================================
--- packages/libnet-ph-perl/trunk/debian/rules	2006-01-21 21:18:16 UTC (rev 2035)
+++ packages/libnet-ph-perl/trunk/debian/rules	2006-01-21 21:27:52 UTC (rev 2036)
@@ -1,63 +1,46 @@
 #!/usr/bin/make -f
 
 PERL ?= /usr/bin/perl
+TMP  := $(CURDIR)/debian/libnet-ph-perl
 
-b := $(shell pwd)/debian/libnet-ph-perl
-
-arrange: arrange-stamp
-arrange-stamp: install
+build: build-arch build-indep
+build-arch:
+build-indep: build-stamp
+build-stamp:
 	dh_testdir
-	touch arrange-stamp
+	$(PERL) Makefile.PL INSTALLDIRS=vendor
+	$(MAKE)
+	touch build-stamp
 
-binary: binary-stamp
-binary-stamp: binary-indep binary-arch
+clean:
 	dh_testdir
-	touch binary-stamp
+	dh_testroot
+	[ ! -f Makefile ] || $(MAKE) distclean
+	dh_clean build-stamp install-stamp
 
-binary-arch: binary-arch-stamp
-binary-arch-stamp: arrange
+install: install-stamp
+install-stamp: build-stamp
 	dh_testdir
-	touch binary-arch-stamp
+	dh_testroot
+	$(MAKE) install PREFIX=$(TMP)/usr
+	rmdir --ignore-fail-on-non-empty --parents $(TMP)/usr/lib/perl5
+	touch install-stamp
 
-binary-indep: binary-indep-stamp
-binary-indep-stamp: arrange
+binary: binary-arch binary-indep
+binary-arch:
+binary-indep:
 	dh_testdir
 	dh_testroot
 	dh_installdocs README
-	dh_installexamples
 	dh_installchangelogs
+	dh_perl
+	dh_link
 	dh_compress
 	dh_fixperms
 	dh_installdeb
-	dh_perl
 	dh_gencontrol
 	dh_md5sums
 	dh_builddeb
-	touch binary-indep-stamp
 
-build: build-stamp
-build-stamp: config
-	dh_testdir
-	$(MAKE)
-	touch build-stamp
-
-clean:
-	dh_testdir
-	dh_testroot
-	if [ -e Makefile ]; then $(MAKE) -i distclean; fi
-	dh_clean arrange-stamp binary-stamp binary-arch-stamp binary-indep-stamp build-stamp config-stamp install-stamp
-
-config: config-stamp
-config-stamp:
-	dh_testdir
-	$(PERL) Makefile.PL INSTALLDIRS=vendor
-	touch config-stamp
-
-install: install-stamp
-install-stamp: build
-	dh_testdir
-	dh_installdirs
-	$(MAKE) install PREFIX=$(b)/usr
-	touch install-stamp
-
-.PHONY: arrange binary binary-arch binary-indep build clean config install
+.PHONY: binary binary-arch binary-indep build build-arch build-indep clean
+.PHONY: install