r13801 - in /trunk/libtk-objscanner-perl/debian: changelog rules

gregoa-guest at users.alioth.debian.org gregoa-guest at users.alioth.debian.org
Mon Jan 28 19:44:22 UTC 2008


Author: gregoa-guest
Date: Mon Jan 28 19:44:22 2008
New Revision: 13801

URL: http://svn.debian.org/wsvn/?sc=1&rev=13801
Log:
debian/rules:
  - fix clean target
  - create build-stamp and install-stamp targets
  - use $(PERL) instead of perl
  - remove dh_installdirs and some other unused dh_* calls
  - remove OPTIMIZE, we don't compile anything
  - use DESTDIR and PREFIX on make install
  - remove some unused make variables
  - use dh_listpackages to get the package name
  - actually build in build-stamp target

Modified:
    trunk/libtk-objscanner-perl/debian/changelog
    trunk/libtk-objscanner-perl/debian/rules

Modified: trunk/libtk-objscanner-perl/debian/changelog
URL: http://svn.debian.org/wsvn/trunk/libtk-objscanner-perl/debian/changelog?rev=13801&op=diff
==============================================================================
--- trunk/libtk-objscanner-perl/debian/changelog (original)
+++ trunk/libtk-objscanner-perl/debian/changelog Mon Jan 28 19:44:22 2008
@@ -25,7 +25,19 @@
     a digit and contains only digits and periods
   * debian/copyright: use verbatim copy of the licensing terms
 
- -- Jose Luis Rivas <ghostbar38 at gmail.com>  Tue, 08 Jan 2008 20:10:29 -0430
+  [ gregor herrmann ]
+  * debian/rules:
+    - fix clean target
+    - create build-stamp and install-stamp targets
+    - use $(PERL) instead of perl
+    - remove dh_installdirs and some other unused dh_* calls
+    - remove OPTIMIZE, we don't compile anything
+    - use DESTDIR and PREFIX on make install
+    - remove some unused make variables
+    - use dh_listpackages to get the package name
+    - actually build in build-stamp target
+  
+ -- gregor herrmann <gregor+debian at comodo.priv.at>  Mon, 28 Jan 2008 20:28:37 +0100
 
 libtk-objscanner-perl (2.010-1) unstable; urgency=low
 

Modified: trunk/libtk-objscanner-perl/debian/rules
URL: http://svn.debian.org/wsvn/trunk/libtk-objscanner-perl/debian/rules?rev=13801&op=diff
==============================================================================
--- trunk/libtk-objscanner-perl/debian/rules (original)
+++ trunk/libtk-objscanner-perl/debian/rules Mon Jan 28 19:44:22 2008
@@ -8,43 +8,48 @@
 # This is the debhelper compatibility version to use.
 # export DH_COMPAT=4
 
-PACKAGE=`pwd | sed -e "s/.*\/\\(.*\\)-.*/\\1/"`
-PKGROOT=$(CURDIR)/debian/$(PACKAGE)/usr
-EXAMPLES=$(PKGROOT)/share/doc/$(PACKAGE)/examples
+PACKAGE=$(shell dh_listpackages)
 
-build:
-	dh_testdir
-	# Add here commands to compile the package.
-	perl Makefile.PL verbose INSTALLDIRS=vendor
+ifndef PERL
+PERL = /usr/bin/perl
+endif
+
 clean:
 	dh_testdir
 	dh_testroot
 
-	[ -f Makefile ] && $(MAKE) clean
-	[ -f Makefile.old ] && rm -f Makefile.old
-	dh_clean
+	dh_clean Makefile.old build-stamp install-stamp
+	[ ! -f Makefile ] || $(MAKE) distclean
 
-install:
+build: build-stamp
+build-stamp:
+	dh_testdir
+	# Add here commands to compile the package.
+	$(PERL) Makefile.PL verbose INSTALLDIRS=vendor
+	$(MAKE)
+	#Skipping tests because it needs an X display
+
+	touch $@
+
+install: install-stamp
+install-stamp: build-stamp
 	dh_testdir
 	dh_testroot
 	dh_clean -k
-	dh_installdirs
 
-	#Skipping tests because it needs an X display
-	$(MAKE) PREFIX=$(CURDIR)/debian/$(PACKAGE)/usr OPTIMIZE="-O2 -g -Wall" install
+	$(MAKE) DESTDIR=$(CURDIR)/debian/$(PACKAGE) PREFIX=/usr install
 	-find $(CURDIR) -type d -name "*.pl" -exec chmod 755 {} \;
-	[ ! -d $(CURDIR)/debian/$(shell dh_listpackages)/usr/lib/perl5 ] || rmdir --ignore-fail-on-non-empty --parents --verbose $(CURDIR)/debian/$(shell dh_listpackages)/usr/lib/perl5
+	[ ! -d $(CURDIR)/debian/$(PACKAGE)/usr/lib/perl5 ] || rmdir --ignore-fail-on-non-empty --parents --verbose $(CURDIR)/debian/$(shell dh_listpackages)/usr/lib/perl5
+	
+	touch $@
 
 binary-arch:;
 binary-indep: build install
 	dh_testdir
 	dh_testroot
 	dh_installdocs
-	dh_installman
 	dh_installexamples
 	dh_installchangelogs ChangeLog
-	dh_link
-	dh_strip
 	dh_compress
 	dh_fixperms
 	dh_installdeb
@@ -54,4 +59,4 @@
 	dh_builddeb
 
 binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure
+.PHONY: build clean binary-indep binary-arch binary install




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