r20325 - in /trunk/libhtml-format-perl/debian: changelog control patches/ patches/make_tests_not_modify_source.patch patches/series rules

tincho at users.alioth.debian.org tincho at users.alioth.debian.org
Fri May 23 09:05:14 UTC 2008


Author: tincho
Date: Fri May 23 09:05:12 2008
New Revision: 20325

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=20325
Log:
debian/rules, debian/control, debian/patches: tests were overwriting
existant files in source, included a patch that makes them idempotent.

Added:
    trunk/libhtml-format-perl/debian/patches/
    trunk/libhtml-format-perl/debian/patches/make_tests_not_modify_source.patch
    trunk/libhtml-format-perl/debian/patches/series
Modified:
    trunk/libhtml-format-perl/debian/changelog
    trunk/libhtml-format-perl/debian/control
    trunk/libhtml-format-perl/debian/rules

Modified: trunk/libhtml-format-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libhtml-format-perl/debian/changelog?rev=20325&op=diff
==============================================================================
--- trunk/libhtml-format-perl/debian/changelog (original)
+++ trunk/libhtml-format-perl/debian/changelog Fri May 23 09:05:12 2008
@@ -20,6 +20,8 @@
     - Improved short description.
   * debian/watch: added by-author URL, as there's a nameclash currently.
   * debian/rules: updated from templates again :).
+  * debian/rules, debian/control, debian/patches: tests were overwriting
+    existant files in source, included a patch that makes them idempotent.
 
  -- gregor herrmann <gregor+debian at comodo.priv.at>  Sat, 01 Dec 2007 18:54:55 +0100
 

Modified: trunk/libhtml-format-perl/debian/control
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libhtml-format-perl/debian/control?rev=20325&op=diff
==============================================================================
--- trunk/libhtml-format-perl/debian/control (original)
+++ trunk/libhtml-format-perl/debian/control Fri May 23 09:05:12 2008
@@ -3,7 +3,7 @@
 Uploaders: Jay Bonci <jaybonci at debian.org>, Martín Ferrari <tincho at debian.org>
 Section: perl
 Priority: optional
-Build-Depends: debhelper (>= 5)
+Build-Depends: debhelper (>= 5), quilt
 Build-Depends-Indep: perl (>= 5.6.0-16), libhtml-tree-perl (>= 3.15),
  libfont-afm-perl (>= 1.17)
 Standards-Version: 3.7.3

Added: trunk/libhtml-format-perl/debian/patches/make_tests_not_modify_source.patch
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libhtml-format-perl/debian/patches/make_tests_not_modify_source.patch?rev=20325&op=file
==============================================================================
--- trunk/libhtml-format-perl/debian/patches/make_tests_not_modify_source.patch (added)
+++ trunk/libhtml-format-perl/debian/patches/make_tests_not_modify_source.patch Fri May 23 09:05:12 2008
@@ -1,0 +1,50 @@
+Index: libhtml-format-perl/t/ps.t
+===================================================================
+--- libhtml-format-perl.orig/t/ps.t
++++ libhtml-format-perl/t/ps.t
+@@ -7,7 +7,7 @@ ok 1;
+ 
+ use HTML::FormatPS;
+ 
+-open(PS, ">test.ps") || die "Can't create test.ps";
++open(PS, ">_test.ps") || die "Can't create _test.ps";
+ binmode(PS);
+ print PS HTML::FormatPS->format_file(
+   "test.html",
+@@ -16,8 +16,9 @@ print PS HTML::FormatPS->format_file(
+ );
+ close PS;
+ sleep 0;
+-ok(-s "test.ps");
+-print "# Resulting file is ", -s "test.ps", " bytes long.\n";
++ok(-s "_test.ps");
++print "# Resulting file is ", -s "_test.ps", " bytes long.\n";
++unlink("_test.ps");
+ 
+ ok(  HTML::FormatPS->format_string('puppies'), '/puppies/'  );
+ 
+Index: libhtml-format-perl/t/rtf.t
+===================================================================
+--- libhtml-format-perl.orig/t/rtf.t
++++ libhtml-format-perl/t/rtf.t
+@@ -7,7 +7,7 @@ ok 1;
+ 
+ use HTML::FormatRTF;
+ 
+-open(RTF, ">test.rtf") || die "Can't create test.rtf";
++open(RTF, ">_test.rtf") || die "Can't create _test.rtf";
+ binmode(RTF);
+ print RTF HTML::FormatRTF->format_file(
+   "test.html",
+@@ -16,8 +16,9 @@ print RTF HTML::FormatRTF->format_file(
+ );
+ close RTF;
+ sleep 0;
+-ok(-s "test.rtf");
+-print "# Resulting file is ", -s "test.rtf", " bytes long.\n";
++ok(-s "_test.rtf");
++print "# Resulting file is ", -s "_test.rtf", " bytes long.\n";
++unlink("_test.rtf");
+ 
+ ok(  HTML::FormatRTF->format_string('puppies'), '/puppies/'  );
+ 

Added: trunk/libhtml-format-perl/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libhtml-format-perl/debian/patches/series?rev=20325&op=file
==============================================================================
--- trunk/libhtml-format-perl/debian/patches/series (added)
+++ trunk/libhtml-format-perl/debian/patches/series Fri May 23 09:05:12 2008
@@ -1,0 +1,1 @@
+make_tests_not_modify_source.patch

Modified: trunk/libhtml-format-perl/debian/rules
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libhtml-format-perl/debian/rules?rev=20325&op=diff
==============================================================================
--- trunk/libhtml-format-perl/debian/rules (original)
+++ trunk/libhtml-format-perl/debian/rules Fri May 23 09:05:12 2008
@@ -1,4 +1,5 @@
 #!/usr/bin/make -f
+include /usr/share/quilt/quilt.make
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
@@ -12,14 +13,14 @@
 TMP     = $(CURDIR)/debian/$(PACKAGE)
 
 build: build-stamp
-build-stamp:
+build-stamp: $(QUILT_STAMPFN)
 	dh_testdir
 	$(PERL) Makefile.PL INSTALLDIRS=vendor
 	$(MAKE)
 	$(MAKE) test
 	touch $@
 
-clean:
+clean: unpatch
 	dh_testdir
 	dh_testroot
 	dh_clean build-stamp install-stamp




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