r13066 - in /trunk/libapache-configfile-perl/debian: changelog rules

dmn at users.alioth.debian.org dmn at users.alioth.debian.org
Mon Jan 21 08:39:12 UTC 2008


Author: dmn
Date: Mon Jan 21 08:39:12 2008
New Revision: 13066

URL: http://svn.debian.org/wsvn/?sc=1&rev=13066
Log:
* debian/rules: removed extra targets, fixed target dependencies

Modified:
    trunk/libapache-configfile-perl/debian/changelog
    trunk/libapache-configfile-perl/debian/rules

Modified: trunk/libapache-configfile-perl/debian/changelog
URL: http://svn.debian.org/wsvn/trunk/libapache-configfile-perl/debian/changelog?rev=13066&op=diff
==============================================================================
--- trunk/libapache-configfile-perl/debian/changelog (original)
+++ trunk/libapache-configfile-perl/debian/changelog Mon Jan 21 08:39:12 2008
@@ -10,6 +10,7 @@
   [ Damyan Ivanov ]
   * Better watchfile pattern
   * convert to quilt
+  * debian/rules: removed extra targets, fixed target dependencies
 
  -- gregor herrmann <gregor+debian at comodo.priv.at>  Tue, 09 Oct 2007 22:27:13 +0200
 

Modified: trunk/libapache-configfile-perl/debian/rules
URL: http://svn.debian.org/wsvn/trunk/libapache-configfile-perl/debian/rules?rev=13066&op=diff
==============================================================================
--- trunk/libapache-configfile-perl/debian/rules (original)
+++ trunk/libapache-configfile-perl/debian/rules Mon Jan 21 08:39:12 2008
@@ -4,25 +4,13 @@
 
 include /usr/share/quilt/quilt.make
 
-b := $(shell pwd)/debian/libapache-configfile-perl
+b := $(CURDIR)/debian/libapache-configfile-perl
 
-arrange: arrange-stamp
-arrange-stamp: install
-	dh_testdir
-	touch arrange-stamp
+binary: binary-indep binary-arch
 
-binary: binary-stamp
-binary-stamp: binary-indep binary-arch
-	dh_testdir
-	touch binary-stamp
+binary-arch:
 
-binary-arch: binary-arch-stamp
-binary-arch-stamp: arrange
-	dh_testdir
-	touch binary-arch-stamp
-
-binary-indep: binary-indep-stamp
-binary-indep-stamp: arrange
+binary-indep: install
 	dh_testdir
 	dh_testroot
 	dh_installdocs README
@@ -34,37 +22,30 @@
 	dh_gencontrol
 	dh_md5sums
 	dh_builddeb
-	touch binary-indep-stamp
 
 build: build-stamp
-build-stamp: config
+build-stamp: $(QUILT_STAMPFN)
 	dh_testdir
+	$(PERL) Makefile.PL INSTALLDIRS=vendor
 	$(MAKE)
 	$(MAKE) test
-	touch build-stamp
+	touch $@
 
-clean: clean-patched unpatch
-clean-patched:
+clean: unpatch
 	dh_testdir
 	dh_testroot
-	dh_clean arrange-stamp binary-stamp binary-arch-stamp binary-indep-stamp build-stamp config-stamp install-stamp
+	dh_clean build-stamp install-stamp
 	[ ! -f Makefile ] || $(MAKE) distclean
 
-config: config-stamp
-config-stamp: $(QUILT_STAMPFN)
+install: install-stamp
+install-stamp: build-stamp
 	dh_testdir
-	$(PERL) Makefile.PL INSTALLDIRS=vendor
-	touch config-stamp
-
-install: install-stamp
-install-stamp: build
-	dh_testdir
-	$(MAKE) pure_install PREFIX=$(b)/usr
+	$(MAKE) pure_install DESTDIR=$(b) PREFIX=/usr
 
 	#As this is a architecture independent package, we are not supposed to install
 	#stuff to /usr/lib. MakeMaker creates the dirs, we delete them from the deb:
 	[ ! -d $(b)/usr/lib/perl5 ] || rmdir --ignore-fail-on-non-empty --parents --verbose $(b)/usr/lib/perl5
 
-	touch install-stamp
+	touch $@
 
 .PHONY: binary binary-arch binary-indep clean




More information about the Pkg-perl-cvs-commits mailing list