r13213 - in /trunk/libimager-perl/debian: changelog rules

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

Author: gregoa-guest
Date: Mon Jan 21 20:23:45 2008
New Revision: 13213

URL: http://svn.debian.org/wsvn/?sc=1&rev=13213
Log:
debian/rules:
  - use $(CURDIR) instead of `pwd`
  - move tests to build-stamp target
  - use DESTDIR and PREFIX for installing
  - remove unused and unneeded dh_* calls
  - actually install examples
  - create install-stamp target depending on build-stamp
  - move dh_clean before make realclean

Modified:
    trunk/libimager-perl/debian/changelog
    trunk/libimager-perl/debian/rules

Modified: trunk/libimager-perl/debian/changelog
URL: http://svn.debian.org/wsvn/trunk/libimager-perl/debian/changelog?rev=13213&op=diff
==============================================================================
--- trunk/libimager-perl/debian/changelog (original)
+++ trunk/libimager-perl/debian/changelog Mon Jan 21 20:23:45 2008
@@ -2,8 +2,16 @@
 
   * debian/rules: delete /usr/share/perl5 only if it exists.
   * debian/watch: extend regexp for matching upstream tarballs.
+  * debian/rules:
+    - use $(CURDIR) instead of `pwd`
+    - move tests to build-stamp target
+    - use DESTDIR and PREFIX for installing
+    - remove unused and unneeded dh_* calls
+    - actually install examples
+    - create install-stamp target depending on build-stamp
+    - move dh_clean before make realclean
 
- -- gregor herrmann <gregor+debian at comodo.priv.at>  Mon, 21 Jan 2008 21:12:41 +0100
+ -- gregor herrmann <gregor+debian at comodo.priv.at>  Mon, 21 Jan 2008 21:14:54 +0100
 
 libimager-perl (0.62-1) unstable; urgency=low
 

Modified: trunk/libimager-perl/debian/rules
URL: http://svn.debian.org/wsvn/trunk/libimager-perl/debian/rules?rev=13213&op=diff
==============================================================================
--- trunk/libimager-perl/debian/rules (original)
+++ trunk/libimager-perl/debian/rules Mon Jan 21 20:23:45 2008
@@ -20,7 +20,7 @@
 ifndef DESTDIR
 DESTDIR=..
 endif
-TMP     =`pwd`/debian/$(PACKAGE)
+TMP     =$(CURDIR)/debian/$(PACKAGE)
 
 OPTIMIZE = -O2 -Wall
 ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
@@ -34,8 +34,9 @@
 	# Add here commands to compile the package.
 	echo n | $(PERL) Makefile.PL INSTALLDIRS=vendor
 	$(MAKE) OPTIMIZE="$(OPTIMIZE)" LD_RUN_PATH=""
+	$(MAKE) test
 
-	touch build-stamp
+	touch $@
 
 clean:
 	dh_testdir
@@ -43,21 +44,23 @@
 	rm -f build-stamp
 	rm -f imconfig.h
 	rm -f ICO/testout/*
+	dh_clean
 	# Add here commands to clean up after the build process.
 	[ ! -f Makefile ] || $(MAKE) realclean
 
-	dh_clean
 
-install: 
+install: install-stamp
+install-stamp: build-stamp
 	dh_testdir
 	dh_testroot
 	dh_clean -k
 	dh_installdirs
 
 	# Add here commands to install the package into debian/tmp.
-	#$(MAKE) install DESTDIR=`pwd`/debian/tmp
-	$(MAKE) test install PREFIX=$(TMP)/usr
+	$(MAKE) install DESTDIR=$(TMP) PREFIX=/usr
 	[ ! -d $(TMP)/usr/share/perl5 ] || rmdir --ignore-fail-on-non-empty --parents --verbose $(TMP)/usr/share/perl5
+	
+	touch $@
 
 # Build architecture-independent files here.
 binary-indep: build install
@@ -68,18 +71,11 @@
 	dh_testdir
 	dh_testroot
 	dh_installdocs README
-	dh_installexamples 
-	dh_installmenu
-#	dh_installemacsen
-#	dh_installinit
-	dh_installcron
-	dh_installman
+	dh_installexamples samples/*
 	dh_installchangelogs Changes
-	dh_link
 	dh_strip
 	dh_compress
 	dh_fixperms
-#	dh_makeshlibs
 	dh_installdeb
 	dh_perl 
 	dh_shlibdeps