r9054 - in /trunk/libtk-splashscreen-perl/debian: changelog control rules

[djpig at users.alioth.debian.org]

Author: djpig
Date: Thu Nov  8 18:07:41 2007
New Revision: 9054

URL: http://svn.debian.org/wsvn/?sc=1&rev=9054
Log:
debian/rules cleanup

Modified:
    trunk/libtk-splashscreen-perl/debian/changelog
    trunk/libtk-splashscreen-perl/debian/control
    trunk/libtk-splashscreen-perl/debian/rules

Modified: trunk/libtk-splashscreen-perl/debian/changelog
URL: http://svn.debian.org/wsvn/trunk/libtk-splashscreen-perl/debian/changelog?rev=9054&op=diff
==============================================================================
--- trunk/libtk-splashscreen-perl/debian/changelog (original)
+++ trunk/libtk-splashscreen-perl/debian/changelog Thu Nov  8 18:07:41 2007
@@ -1,10 +1,22 @@
 libtk-splashscreen-perl (1.0-4) UNRELEASED; urgency=low
 
+  [ gregor herrmann ]
   * debian/control: Added: Vcs-Svn field (source stanza); Vcs-Browser
     field (source stanza); Homepage field (source stanza). Removed: XS-
     Vcs-Svn fields.
 
- -- gregor herrmann <gregor+debian at comodo.priv.at>  Tue, 09 Oct 2007 22:33:00 +0200
+  [ Frank Lichtenheld ]
+  * debian/rules: Cleanup:
+     + move build to build target
+     + make install depend on build
+     + introduce build-stamp
+     + split PREFIX into DESTDIR and PREFIX
+     + move dh_clean before $(MAKE) clean
+     + remove non-existant configure target from .PHONY
+     + enable tests
+  * debian/control: Add xvfb to b-d-i for tests
+
+ -- Frank Lichtenheld <djpig at debian.org>  Thu, 08 Nov 2007 19:06:22 +0100
 
 libtk-splashscreen-perl (1.0-3) unstable; urgency=low
 

Modified: trunk/libtk-splashscreen-perl/debian/control
URL: http://svn.debian.org/wsvn/trunk/libtk-splashscreen-perl/debian/control?rev=9054&op=diff
==============================================================================
--- trunk/libtk-splashscreen-perl/debian/control (original)
+++ trunk/libtk-splashscreen-perl/debian/control Thu Nov  8 18:07:41 2007
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
 Uploaders: Carlo Segre <segre at debian.org>, Gustavo Franco <stratus at debian.org>, gregor herrmann <gregor+debian at comodo.priv.at>
-Build-Depends-Indep: perl, perl-tk
+Build-Depends-Indep: perl, perl-tk, xvfb
 Build-Depends: debhelper (>= 5.0.0)
 Standards-Version: 3.7.2
 Homepage: http://search.cpan.org/dist/Tk-Splashscreen/

Modified: trunk/libtk-splashscreen-perl/debian/rules
URL: http://svn.debian.org/wsvn/trunk/libtk-splashscreen-perl/debian/rules?rev=9054&op=diff
==============================================================================
--- trunk/libtk-splashscreen-perl/debian/rules (original)
+++ trunk/libtk-splashscreen-perl/debian/rules Thu Nov  8 18:07:41 2007
@@ -9,25 +9,31 @@
 version := $(shell head -1 debian/changelog | \
                         perl -nle 'm/\S+\s+\((\S+)\)/ && print $$1')
 debtmp  := $(CURDIR)/debian/$(package)
-build:
+
+build: build-stamp
+build-stamp:
 	dh_testdir
 	perl Makefile.PL verbose INSTALLDIRS=vendor
+	$(MAKE)
+	xvfb-run $(MAKE) test
+
+	touch build-stamp
 
 clean:
 	dh_testdir
 	dh_testroot
+	dh_clean build-stamp
 	[ ! -f Makefile ] || $(MAKE) clean
 	rm -f Makefile.old
-	dh_clean
 
-install:
+install: build
 	dh_testdir
 	dh_testroot
 	dh_clean -k
 	dh_installdirs
 	echo "$(CURDIR)"
 	echo "$(debtmp)"
-	$(MAKE) install PREFIX=$(debtmp)/usr/ INSTALLDIRS=vendor
+	$(MAKE) install DESTDIR=$(debtmp) PREFIX=/usr
 	rm -rf $(debtmp)/usr/lib
 
 binary-indep: build install
@@ -47,4 +53,4 @@
 binary-arch: build install
 
 binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure
+.PHONY: build clean binary-indep binary-arch binary install