r11893 - in /trunk/libparse-syslog-perl/debian: changelog rules

[gregoa-guest at users.alioth.debian.org]

Author: gregoa-guest
Date: Tue Jan  1 21:21:40 2008
New Revision: 11893

URL: http://svn.debian.org/wsvn/?sc=1&rev=11893
Log:
debian/rules:
  - remove unneeded targets and clean up dependencies among remaining ones
  - call dh_clean before make distclean
  - remove unused dh_installexamples and dh_installdirs
  - delete /usr/lib/perl5 only if it exists
  - use DESTDIR and PREFIX on make install

Modified:
    trunk/libparse-syslog-perl/debian/changelog
    trunk/libparse-syslog-perl/debian/rules

Modified: trunk/libparse-syslog-perl/debian/changelog
URL: http://svn.debian.org/wsvn/trunk/libparse-syslog-perl/debian/changelog?rev=11893&op=diff
==============================================================================
--- trunk/libparse-syslog-perl/debian/changelog (original)
+++ trunk/libparse-syslog-perl/debian/changelog Tue Jan  1 21:21:40 2008
@@ -6,6 +6,12 @@
     Vcs-Svn fields.
   * debian/watch: use dist-based URL.
   * Set Standards-Version to 3.7.3 (no changes needed).
+  * debian/rules:
+    - remove unneeded targets and clean up dependencies among remaining ones
+    - call dh_clean before make distclean
+    - remove unused dh_installexamples and dh_installdirs
+    - delete /usr/lib/perl5 only if it exists
+    - use DESTDIR and PREFIX on make install
 
  -- gregor herrmann <gregor+debian at comodo.priv.at>  Tue, 09 Oct 2007 22:31:31 +0200
 

Modified: trunk/libparse-syslog-perl/debian/rules
URL: http://svn.debian.org/wsvn/trunk/libparse-syslog-perl/debian/rules?rev=11893&op=diff
==============================================================================
--- trunk/libparse-syslog-perl/debian/rules (original)
+++ trunk/libparse-syslog-perl/debian/rules Tue Jan  1 21:21:40 2008
@@ -3,37 +3,6 @@
 PERL ?= /usr/bin/perl
 
 b := $(CURDIR)/debian/libparse-syslog-perl
-
-arrange: arrange-stamp
-arrange-stamp: install
-	dh_testdir
-	touch arrange-stamp
-
-binary: binary-stamp
-binary-stamp: binary-indep binary-arch
-	dh_testdir
-	touch binary-stamp
-
-binary-arch: binary-arch-stamp
-binary-arch-stamp: arrange
-	dh_testdir
-	touch binary-arch-stamp
-
-binary-indep: binary-indep-stamp
-binary-indep-stamp: arrange
-	dh_testdir
-	dh_testroot
-	dh_installdocs
-	dh_installexamples
-	dh_installchangelogs Changes
-	dh_fixperms
-	dh_installdeb
-	dh_perl
-	dh_compress
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-	touch binary-indep-stamp
 
 build: build-stamp
 build-stamp:
@@ -46,19 +15,34 @@
 clean:
 	dh_testdir
 	dh_testroot
+	dh_clean build-stamp install-stamp
 	if [ -e Makefile ]; then $(MAKE) distclean; fi
-	dh_clean arrange-stamp binary-stamp binary-arch-stamp binary-indep-stamp build-stamp install-stamp
 
 install: install-stamp
-install-stamp: build
+install-stamp: build-stamp
 	dh_testdir
-	$(MAKE) install PREFIX=$(b)/usr
+	$(MAKE) 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:
-	rmdir --ignore-fail-on-non-empty --parents $(b)/usr/lib/perl5
+	[ ! -d $(b)/usr/lib/perl5 ] || rmdir --ignore-fail-on-non-empty --parents $(b)/usr/lib/perl5
 
-	dh_installdirs
 	touch install-stamp
 
+binary-arch:;
+
+binary-indep: build install
+	dh_testdir
+	dh_testroot
+	dh_installdocs
+	dh_installchangelogs Changes
+	dh_fixperms
+	dh_installdeb
+	dh_perl
+	dh_compress
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
+
+binary: binary-indep binary-arch
 .PHONY: arrange binary binary-arch binary-indep build clean install