r14152 - in /trunk/liblocale-gettext-perl/debian: changelog dirs rules

[dmn at users.alioth.debian.org]

Author: dmn
Date: Mon Feb  4 21:25:09 2008
New Revision: 14152

URL: http://svn.debian.org/wsvn/?sc=1&rev=14152
Log:
* debian/rules:
  + put -Wall in CFLAGS
  + use "$@" when touching stamps
  + use $(CURDIR) instead of `pwd`
  + make build-stamp target depend on $(QUILT_STAMPFN) instead of 'patch'
  + drop unneeded dh_installdirs and debian/dirs
  + split DESTDIR and PREFIX when calling $(MAKE) install
  + correct the logic around removing empty usr/share/perl5 so that it does
    not fail when the directory does not exist
  + drop commented-out and unneeded debhelper calls

Removed:
    trunk/liblocale-gettext-perl/debian/dirs
Modified:
    trunk/liblocale-gettext-perl/debian/changelog
    trunk/liblocale-gettext-perl/debian/rules

Modified: trunk/liblocale-gettext-perl/debian/changelog
URL: http://svn.debian.org/wsvn/trunk/liblocale-gettext-perl/debian/changelog?rev=14152&op=diff
==============================================================================
--- trunk/liblocale-gettext-perl/debian/changelog (original)
+++ trunk/liblocale-gettext-perl/debian/changelog Mon Feb  4 21:25:09 2008
@@ -5,6 +5,16 @@
 
   [ Damyan Ivanov ]
   * debian/watch: use dist-based URL.
+  * debian/rules:
+    + put -Wall in CFLAGS
+    + use "$@" when touching stamps
+    + use $(CURDIR) instead of `pwd`
+    + make build-stamp target depend on $(QUILT_STAMPFN) instead of 'patch'
+    + drop unneeded dh_installdirs and debian/dirs
+    + split DESTDIR and PREFIX when calling $(MAKE) install
+    + correct the logic around removing empty usr/share/perl5 so that it does
+      not fail when the directory does not exist
+    + drop commented-out and unneeded debhelper calls
 
  -- Raphael Hertzog <hertzog at debian.org>  Sun, 03 Feb 2008 22:54:05 +0100
 

Modified: trunk/liblocale-gettext-perl/debian/rules
URL: http://svn.debian.org/wsvn/trunk/liblocale-gettext-perl/debian/rules?rev=14152&op=diff
==============================================================================
--- trunk/liblocale-gettext-perl/debian/rules (original)
+++ trunk/liblocale-gettext-perl/debian/rules Mon Feb  4 21:25:09 2008
@@ -7,9 +7,9 @@
 
 include /usr/share/quilt/quilt.make
 
-TMP = `pwd`/debian/liblocale-gettext-perl
+TMP = $(CURDIR)/debian/liblocale-gettext-perl
 
-CFLAGS = -g
+CFLAGS = -g -Wall
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
 CFLAGS += -O0
 else
@@ -17,14 +17,14 @@
 endif  
 
 build: build-stamp
-build-stamp: patch
+build-stamp: $(QUILT_STAMPFN)
 	dh_testdir
 
 	# Add here commands to compile the package.
 	perl Makefile.PL INSTALLDIRS=vendor 
-	$(MAKE) OPTIMIZE="-Wall $(CFLAGS)"
+	$(MAKE) OPTIMIZE="$(CFLAGS)"
 
-	touch build-stamp
+	touch $@
 
 clean: unpatch
 	dh_testdir
@@ -42,12 +42,11 @@
 	dh_testdir
 	dh_testroot
 	dh_clean -k
-	dh_installdirs
 
-	$(MAKE) install PREFIX=$(TMP)/usr
-	[ -d $(TMP)/usr/share/perl5 ] && rmdir $(TMP)/usr/share/perl5/
+	$(MAKE) install DESTDIR=$(TMP) PREFIX=/usr
+	[ ! -d $(TMP)/usr/share/perl5 ] || rmdir $(TMP)/usr/share/perl5/
 
-	touch install-stamp
+	touch $@
 
 # Build architecture-independent files here.
 binary-indep: build install
@@ -55,26 +54,17 @@
 
 # Build architecture-dependent files here.
 binary-arch: build install
-#	dh_testversion
 	dh_testdir
 	dh_testroot
 	dh_installdocs
-	dh_installexamples
-	dh_installmenu
-#	dh_installemacsen
-#	dh_installinit
-	dh_installcron
-	dh_installman
-#	dh_undocumented
-	dh_installchangelogs 
-	dh_strip 
+	dh_installchangelogs
+	dh_strip
 	dh_compress
 	dh_fixperms
 	dh_installdeb
 	dh_perl -d
 	dh_shlibdeps
 	dh_gencontrol
-#	dh_makeshlibs
 	dh_md5sums
 	dh_builddeb