r12195 - in /trunk/liblocale-subcountry-perl/debian: changelog rules

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

Author: gregoa-guest
Date: Mon Jan  7 22:52:03 2008
New Revision: 12195

URL: http://svn.debian.org/wsvn/?sc=1&rev=12195
Log:
debian/rules:
  - remove compiler flags, we don't compile anything
  - move tests to build-stamp target
  - move dh_clean before make distclean
  - remove empty /usr/lib/perl5 directory only if it exists
  - remove unneeded dh_* calls
  - remove call to dh_installexamples, the example script was removed from
    the upstream tarball

Modified:
    trunk/liblocale-subcountry-perl/debian/changelog
    trunk/liblocale-subcountry-perl/debian/rules

Modified: trunk/liblocale-subcountry-perl/debian/changelog
URL: http://svn.debian.org/wsvn/trunk/liblocale-subcountry-perl/debian/changelog?rev=12195&op=diff
==============================================================================
--- trunk/liblocale-subcountry-perl/debian/changelog (original)
+++ trunk/liblocale-subcountry-perl/debian/changelog Mon Jan  7 22:52:03 2008
@@ -8,8 +8,16 @@
   * debian/watch: use dist-based URL.
   * debian/copyright: update year of copyright, add actual upstream source
     location instead of pointing to CPAN at large.
+  * debian/rules:
+    - remove compiler flags, we don't compile anything
+    - move tests to build-stamp target
+    - move dh_clean before make distclean
+    - remove empty /usr/lib/perl5 directory only if it exists
+    - remove unneeded dh_* calls
+    - remove call to dh_installexamples, the example script was removed from
+      the upstream tarball
 
- -- gregor herrmann <gregor+debian at comodo.priv.at>  Mon, 07 Jan 2008 23:45:55 +0100
+ -- gregor herrmann <gregor+debian at comodo.priv.at>  Mon, 07 Jan 2008 23:47:50 +0100
 
 liblocale-subcountry-perl (1.38-2) unstable; urgency=low
 

Modified: trunk/liblocale-subcountry-perl/debian/rules
URL: http://svn.debian.org/wsvn/trunk/liblocale-subcountry-perl/debian/rules?rev=12195&op=diff
==============================================================================
--- trunk/liblocale-subcountry-perl/debian/rules (original)
+++ trunk/liblocale-subcountry-perl/debian/rules Mon Jan  7 22:52:03 2008
@@ -13,29 +13,21 @@
 
 TMP     =$(CURDIR)/debian/$(PACKAGE)
 
-# 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
-
 build: build-stamp
 build-stamp:
 	dh_testdir
 
 	$(PERL) Makefile.PL INSTALLDIRS=vendor
-	$(MAKE) OPTIMIZE="$(CFLAGS)" 
+	$(MAKE)
+	$(MAKE) test
 
 	touch build-stamp
 
 clean:
 	dh_testdir
 	dh_testroot
+	dh_clean build-stamp install-stamp
 	[ ! -f Makefile ] || $(MAKE) distclean
-	dh_clean build-stamp install-stamp
 
 install: install-stamp
 install-stamp: build-stamp
@@ -43,12 +35,11 @@
 	dh_testroot
 	dh_clean -k
 
-	$(MAKE) test
 	$(MAKE) install DESTDIR=$(TMP) 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 $(TMP)/usr/lib/perl5
+	[ ! -d $(TMP)/usr/lib/perl5 ] || rmdir --ignore-fail-on-non-empty --parents --verbose $(TMP)/usr/lib/perl5
 
 	touch install-stamp
 
@@ -59,11 +50,8 @@
 	dh_testdir
 	dh_testroot
 	dh_installdocs
-	dh_installexamples examples/demo.pl
 	dh_perl
 	dh_installchangelogs Changes
-	dh_link
-	dh_strip
 	dh_compress
 	dh_fixperms
 	dh_installdeb