r12290 - in /trunk/libtest-manifest-perl/debian: changelog rules watch

[dmn at users.alioth.debian.org]

Author: dmn
Date: Wed Jan  9 12:52:07 2008
New Revision: 12290

URL: http://svn.debian.org/wsvn/?sc=1&rev=12290
Log:
* debian/watch:
  + add v? to watchfile pattern
  + convert underscores in version string to dots
  + add stamps and fix target dependencies accordingly
  + put actual making and test suite in build-stamp target
  + remove usr/lib/perl5 only if it exists and remove it verbosely
  + when cleaning, use distclean

Modified:
    trunk/libtest-manifest-perl/debian/changelog
    trunk/libtest-manifest-perl/debian/rules
    trunk/libtest-manifest-perl/debian/watch

Modified: trunk/libtest-manifest-perl/debian/changelog
URL: http://svn.debian.org/wsvn/trunk/libtest-manifest-perl/debian/changelog?rev=12290&op=diff
==============================================================================
--- trunk/libtest-manifest-perl/debian/changelog (original)
+++ trunk/libtest-manifest-perl/debian/changelog Wed Jan  9 12:52:07 2008
@@ -22,9 +22,15 @@
       from "3" to "3pm"
 
   [ Damyan Ivanov ]
-  * add v? to watchfile pattern
+  * debian/watch:
+    + add v? to watchfile pattern
+    + convert underscores in version string to dots
   * debian/rules:
     + drop unused dh_installman, dh_link and dh_strip
+    + add stamps and fix target dependencies accordingly
+    + put actual making and test suite in build-stamp target
+    + remove usr/lib/perl5 only if it exists and remove it verbosely
+    + when cleaning, use distclean
 
  -- David Paleino <d.paleino at gmail.com>  Wed, 19 Dec 2007 16:16:04 +0100
 

Modified: trunk/libtest-manifest-perl/debian/rules
URL: http://svn.debian.org/wsvn/trunk/libtest-manifest-perl/debian/rules?rev=12290&op=diff
==============================================================================
--- trunk/libtest-manifest-perl/debian/rules (original)
+++ trunk/libtest-manifest-perl/debian/rules Wed Jan  9 12:52:07 2008
@@ -8,30 +8,41 @@
 # This is the debhelper compatibility version to use.
 # export DH_COMPAT=4
 
-PACKAGE=`pwd | sed -e "s/.*\/\\(.*\\)-.*/\\1/"`
+PACKAGE=$(shell dh_listpackages)
+TMP=debian/$(PACKAGE)
+
+PERL ?= /usr/bin/perl
 
 include /usr/share/quilt/quilt.make
 
-build: patch
+build: build-stamp
+build-stamp: $(QUILT_STAMPFN)
 	dh_testdir
 	# Add here commands to compile the package.
-	perl Makefile.PL verbose INSTALLDIRS=vendor
+	$(PERL) Makefile.PL verbose INSTALLDIRS=vendor
+	$(MAKE)
+	$(MAKE) test
+	
+	touch $@
 
 clean: unpatch
 	dh_testdir
 	dh_testroot
+	
+	dh_clean build-stamp install-stamp
+	
+	[ ! -f Makefile ] || $(MAKE) dist
 
-	[ ! -f Makefile ] || $(MAKE) clean
-	dh_clean Makefile.old
-
-install:
+install: install-stamp
+insall-stamp: build-stamp
 	dh_testdir
 	dh_testroot
 	dh_clean -k
-	dh_installdirs
-
-	$(MAKE) PREFIX=$(CURDIR)/debian/$(PACKAGE)/usr OPTIMIZE="-O2 -g -Wall" test install
-	-find $(CURDIR)/debian -type d | xargs rmdir -p --ignore-fail-on-non-empty
+	
+	$(MAKE) install DESTDIR=$(TMP)
+	[ ! -d $(TMP)/usr/lib/perl5 ] || rmdir --ignore-fail-on-non-empty --parents --verbose $(TMP)/usr/lib/perl5
+	
+	touch $@
 
 binary-arch:;
 binary-indep: build install

Modified: trunk/libtest-manifest-perl/debian/watch
URL: http://svn.debian.org/wsvn/trunk/libtest-manifest-perl/debian/watch?rev=12290&op=diff
==============================================================================
--- trunk/libtest-manifest-perl/debian/watch (original)
+++ trunk/libtest-manifest-perl/debian/watch Wed Jan  9 12:52:07 2008
@@ -1,2 +1,2 @@
 version=3
-http://search.cpan.org/dist/Test-Manifest/ .*/Test-Manifest-v?([[:digit:]].*)\.tar\.gz
+opts="uversionmangle=s/_/./g" http://search.cpan.org/dist/Test-Manifest/ .*/Test-Manifest-v?([[:digit:]].*)\.tar\.gz