r15127 - in /trunk/libi18n-charset-perl/debian: changelog rules

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

Author: gregoa-guest
Date: Mon Feb 18 21:01:09 2008
New Revision: 15127

URL: http://svn.debian.org/wsvn/?sc=1&rev=15127
Log:
debian/rules:
  - don't try to install lib/I18N/Charset/character-sets any more (removed
    from upstream tarball)
  - remove CFLAGS and OPTIMIZE, this package is architecture-independent
  - move test suite to build-stamp target
  - move dh_clean before make distclean
  - use $@ for touching stamp files
  - remove unneeded calls to dh_link and dh_strip

Modified:
    trunk/libi18n-charset-perl/debian/changelog
    trunk/libi18n-charset-perl/debian/rules

Modified: trunk/libi18n-charset-perl/debian/changelog
URL: http://svn.debian.org/wsvn/trunk/libi18n-charset-perl/debian/changelog?rev=15127&op=diff
==============================================================================
--- trunk/libi18n-charset-perl/debian/changelog (original)
+++ trunk/libi18n-charset-perl/debian/changelog Mon Feb 18 21:01:09 2008
@@ -10,8 +10,16 @@
   * Set debhelper compatibility level to 6.
   * Remove debian/libi18n-charset-perl.docs, install README via
     debian/rules.
-
- -- gregor herrmann <gregor+debian at comodo.priv.at>  Mon, 18 Feb 2008 21:53:15 +0100
+  * debian/rules:
+    - don't try to install lib/I18N/Charset/character-sets any more (removed
+      from upstream tarball)
+    - remove CFLAGS and OPTIMIZE, this package is architecture-independent
+    - move test suite to build-stamp target
+    - move dh_clean before make distclean
+    - use $@ for touching stamp files
+    - remove unneeded calls to dh_link and dh_strip
+
+ -- gregor herrmann <gregor+debian at comodo.priv.at>  Mon, 18 Feb 2008 21:54:54 +0100
 
 libi18n-charset-perl (1.385-1) unstable; urgency=low
 

Modified: trunk/libi18n-charset-perl/debian/rules
URL: http://svn.debian.org/wsvn/trunk/libi18n-charset-perl/debian/rules?rev=15127&op=diff
==============================================================================
--- trunk/libi18n-charset-perl/debian/rules (original)
+++ trunk/libi18n-charset-perl/debian/rules Mon Feb 18 21:01:09 2008
@@ -13,29 +13,22 @@
 
 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
+	touch $@
 
 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,18 +36,16 @@
 	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:
 	[ ! -d $(TMP)/usr/lib/perl5 ] || rmdir --ignore-fail-on-non-empty --parents --verbose $(TMP)/usr/lib/perl5
 
 	# We don't want this alongside the Perl module.
-	#$(RM) $(TMP)/usr/share/perl5/I18N/Charset/character-sets
 	$(RM) -r $(TMP)/usr/share/perl5/I18N/Charset
 
-	touch install-stamp
+	touch $@
 
 binary-arch:
 # We have nothing to do.
@@ -65,8 +56,6 @@
 	dh_installdocs README lib/I18N/Charset/character-sets
 	dh_perl
 	dh_installchangelogs Changes
-	dh_link
-	dh_strip
 	dh_compress
 	dh_fixperms
 	dh_installdeb