r16480 - in /trunk/libarchive-tar-perl/debian: changelog rules

[rra at users.alioth.debian.org]

Author: rra
Date: Tue Mar  4 07:50:10 2008
New Revision: 16480

URL: http://svn.debian.org/wsvn/?sc=1&rev=16480
Log:
* debian/rules cleanup:
  - Restructure to match a typical debian/rules for the group.
  - Add build-arch and build-indep targets.
  - Call install instead of pure_install to match normal practice.

Modified:
    trunk/libarchive-tar-perl/debian/changelog
    trunk/libarchive-tar-perl/debian/rules

Modified: trunk/libarchive-tar-perl/debian/changelog
URL: http://svn.debian.org/wsvn/trunk/libarchive-tar-perl/debian/changelog?rev=16480&op=diff
==============================================================================
--- trunk/libarchive-tar-perl/debian/changelog (original)
+++ trunk/libarchive-tar-perl/debian/changelog Tue Mar  4 07:50:10 2008
@@ -1,7 +1,14 @@
 libarchive-tar-perl (1.38-2) UNRELEASED; urgency=low
 
+  [ gregor herrmann ]
   * debian/rules: delete /usr/lib/perl5 only if it exists.
     (Closes: #467663)
+
+  [ Russ Allbery ]
+  * debian/rules cleanup:
+    - Restructure to match a typical debian/rules for the group.
+    - Add build-arch and build-indep targets.
+    - Call install instead of pure_install to match normal practice.
 
  -- gregor herrmann <gregor+debian at comodo.priv.at>  Wed, 09 Jan 2008 21:16:38 +0100
 

Modified: trunk/libarchive-tar-perl/debian/rules
URL: http://svn.debian.org/wsvn/trunk/libarchive-tar-perl/debian/rules?rev=16480&op=diff
==============================================================================
--- trunk/libarchive-tar-perl/debian/rules (original)
+++ trunk/libarchive-tar-perl/debian/rules Tue Mar  4 07:50:10 2008
@@ -2,47 +2,50 @@
 # -*-makefile-*-
 # debian/rules file for libarchive-tar-perl
 
-PERL ?= /usr/bin/perl
+PACKAGE	= $(shell dh_listpackages)
+TMP     = $(CURDIR)/debian/$(PACKAGE)
+PERL   ?= /usr/bin/perl
 
-package	:= $(shell dh_listpackages)
-prefix	:= $(CURDIR)/debian/$(package)/usr
-
-build:	build-stamp
+build: build-arch build-indep
+build-arch:
+build-indep: build-stamp
 build-stamp:
 	dh_testdir
-	$(PERL) Makefile.PL INSTALLDIRS=vendor PERL=$(PERL)
+	$(PERL) Makefile.PL INSTALLDIRS=vendor
 	$(MAKE)
 	$(MAKE) test
 	touch $@
 
-clean:	checkroot
-	rm -f build-stamp
+clean:
+	dh_testdir
+	dh_testroot
+	rm -f build-stamp install-stamp
 	[ ! -f Makefile ] || $(MAKE) distclean
 	dh_clean
 
-binary-indep:	checkroot build
+install: install-stamp
+install-stamp: build-stamp
+	dh_testdir
+	dh_testroot
 	dh_clean
+	$(MAKE) install DESTDIR=$(TMP) PREFIX=/usr
+	[ ! -d $(TMP)/usr/lib/perl5 ] || rmdir --ignore-fail-on-non-empty --parents --verbose $(TMP)/usr/lib/perl5
+	touch $@
 
-	$(MAKE) pure_install PREFIX=$(prefix)
-	[ ! -d $(prefix)/lib/perl5 ] || rmdir --ignore-fail-on-non-empty --parents --verbose $(prefix)/lib/perl5
-
+binary: binary-arch binary-indep
+binary-arch: 
+binary-indep: build-stamp install-stamp
+	dh_testdir
+	dh_testroot
 	dh_installdocs README
 	dh_installchangelogs CHANGES
-
+	dh_perl
 	dh_compress
 	dh_fixperms
-	dh_perl
 	dh_installdeb
 	dh_gencontrol
 	dh_md5sums
 	dh_builddeb
 
-binary-arch:	checkroot build
-
-binary:	binary-indep binary-arch
-
-checkroot:
-	dh_testdir
-	dh_testroot
-
-.PHONY:	binary binary-arch binary-indep clean checkroot build
+.PHONY:	binary binary-arch binary-indep build build-arch build-indep clean
+.PHONY: install