r12931 - in /trunk/libemail-localdelivery-perl/debian: changelog rules

dmn at users.alioth.debian.org dmn at users.alioth.debian.org
Fri Jan 18 11:09:58 UTC 2008


Author: dmn
Date: Fri Jan 18 11:09:58 2008
New Revision: 12931

URL: http://svn.debian.org/wsvn/?sc=1&rev=12931
Log:
* debian/rules: sync with dh-make-perl templates
  + clean stamps before distclean
  + set CFLAGS according to $DEB_BUILD_OPTIONS
  + use $@ when touching stamps
  + drop unused dh_link

Modified:
    trunk/libemail-localdelivery-perl/debian/changelog
    trunk/libemail-localdelivery-perl/debian/rules

Modified: trunk/libemail-localdelivery-perl/debian/changelog
URL: http://svn.debian.org/wsvn/trunk/libemail-localdelivery-perl/debian/changelog?rev=12931&op=diff
==============================================================================
--- trunk/libemail-localdelivery-perl/debian/changelog (original)
+++ trunk/libemail-localdelivery-perl/debian/changelog Fri Jan 18 11:09:58 2008
@@ -8,6 +8,11 @@
 
   [ Damyan Ivanov ]
   * debian/watch: use dist-based URL, better pattern
+  * debian/rules: sync with dh-make-perl templates
+    + clean stamps before distclean
+    + set CFLAGS according to $DEB_BUILD_OPTIONS
+    + use $@ when touching stamps
+    + drop unused dh_link
 
  -- gregor herrmann <gregor+debian at comodo.priv.at>  Tue, 09 Oct 2007 22:29:09 +0200
 

Modified: trunk/libemail-localdelivery-perl/debian/rules
URL: http://svn.debian.org/wsvn/trunk/libemail-localdelivery-perl/debian/rules?rev=12931&op=diff
==============================================================================
--- trunk/libemail-localdelivery-perl/debian/rules (original)
+++ trunk/libemail-localdelivery-perl/debian/rules Fri Jan 18 11:09:58 2008
@@ -19,21 +19,31 @@
 PERL = /usr/bin/perl
 endif
 
+# Allow disabling build optimation by setting noopt in
+# $DEB_BUILD_OPTIONS
+CFLAGS = -Wall -g
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+    CFLAGS += -O0
+else
+    CFLAGS += -O2
+endif
+
 TMP     =$(CURDIR)/debian/$(PACKAGE)
 
 build: patch build-stamp
 build-stamp:
 	dh_testdir
 	$(PERL) Makefile.PL INSTALLDIRS=vendor
-	$(MAKE) OPTIMIZE="-Wall -O2 -g"
-	touch build-stamp
+	$(MAKE) OPTIMIZE="$(CFLAGS)"
+	$(MAKE) test
+	touch $@
 
 clean: clean-patched unpatch
 clean-patched:
 	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:
@@ -41,7 +51,6 @@
 	dh_testroot
 	dh_clean -k
 
-	$(MAKE) test
 	$(MAKE) install DESTDIR=$(TMP) PREFIX=/usr
 
 	# As this is a architecture independent package, we are not
@@ -49,7 +58,7 @@
 	# the dirs, we delete them from the deb:
 	[ ! -d $(TMP)/usr/lib/perl5 ] || rmdir --ignore-fail-on-non-empty --parents --verbose $(TMP)/usr/lib/perl5
 
-	touch install-stamp
+	touch $@
 
 binary-arch:
 # We have nothing to do by default.
@@ -60,7 +69,6 @@
 	dh_installdocs
 	dh_installchangelogs Changes
 	dh_perl
-	dh_link
 	dh_strip
 	dh_compress
 	dh_fixperms




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