r31772 - in /trunk/libtemplate-plugin-class-perl/debian: changelog compat control patches/ patches/do-not-check-error.diff patches/series rules

ansgar-guest at users.alioth.debian.org ansgar-guest at users.alioth.debian.org
Mon Mar 9 01:15:23 UTC 2009


Author: ansgar-guest
Date: Mon Mar  9 01:15:19 2009
New Revision: 31772

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=31772
Log:
* Add myself to Uploaders.
* Do not check value of $tt->error in t/class.t: It's value is undocumented
  in case $tt->process returns no error and has changed in version 2.20
  of Template::Toolkit (Closes: #518859)
  + debian/rules: Add quilt framework.
* Refresh debian/rules for debhelper 7.

Added:
    trunk/libtemplate-plugin-class-perl/debian/patches/
    trunk/libtemplate-plugin-class-perl/debian/patches/do-not-check-error.diff
    trunk/libtemplate-plugin-class-perl/debian/patches/series
Modified:
    trunk/libtemplate-plugin-class-perl/debian/changelog
    trunk/libtemplate-plugin-class-perl/debian/compat
    trunk/libtemplate-plugin-class-perl/debian/control
    trunk/libtemplate-plugin-class-perl/debian/rules

Modified: trunk/libtemplate-plugin-class-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtemplate-plugin-class-perl/debian/changelog?rev=31772&op=diff
==============================================================================
--- trunk/libtemplate-plugin-class-perl/debian/changelog (original)
+++ trunk/libtemplate-plugin-class-perl/debian/changelog Mon Mar  9 01:15:19 2009
@@ -1,10 +1,9 @@
-libtemplate-plugin-class-perl (0.13-3) UNRELEASED; urgency=low
+libtemplate-plugin-class-perl (0.13-3) unstable; 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.
-  * Refresh debian/rules, no functional changes; except: don't create
-    .packlist file any more.
   * debian/watch: use dist-based URL.
   * Move libmodule-build-perl to Build-Depends.
   * Set Standards-Version to 3.8.0 (no changes).
@@ -12,7 +11,15 @@
     (source stanza).
   * debian/control: Added: ${misc:Depends} to Depends: field.
 
- -- gregor herrmann <gregor+debian at comodo.priv.at>  Tue, 09 Oct 2007 22:32:12 +0200
+  [ Ansgar Burchardt ]
+  * Add myself to Uploaders.
+  * Do not check value of $tt->error in t/class.t: It's value is undocumented
+    in case $tt->process returns no error and has changed in version 2.20
+    of Template::Toolkit (Closes: #518859)
+    + debian/rules: Add quilt framework.
+  * Refresh debian/rules for debhelper 7.
+
+ -- Ansgar Burchardt <ansgar at 43-1.org>  Mon, 09 Mar 2009 02:14:43 +0100
 
 libtemplate-plugin-class-perl (0.13-2) unstable; urgency=low
 

Modified: trunk/libtemplate-plugin-class-perl/debian/compat
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtemplate-plugin-class-perl/debian/compat?rev=31772&op=diff
==============================================================================
--- trunk/libtemplate-plugin-class-perl/debian/compat (original)
+++ trunk/libtemplate-plugin-class-perl/debian/compat Mon Mar  9 01:15:19 2009
@@ -1,1 +1,1 @@
-5
+7

Modified: trunk/libtemplate-plugin-class-perl/debian/control
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtemplate-plugin-class-perl/debian/control?rev=31772&op=diff
==============================================================================
--- trunk/libtemplate-plugin-class-perl/debian/control (original)
+++ trunk/libtemplate-plugin-class-perl/debian/control Mon Mar  9 01:15:19 2009
@@ -2,8 +2,9 @@
 Section: perl
 Priority: optional
 Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
-Uploaders: Krzysztof Krzyzaniak (eloy) <eloy at debian.org>
-Build-Depends: debhelper (>= 5), libmodule-build-perl
+Uploaders: Krzysztof Krzyzaniak (eloy) <eloy at debian.org>,
+ Ansgar Burchardt <ansgar at 43-1.org>
+Build-Depends: debhelper (>= 7), quilt, libmodule-build-perl
 Build-Depends-Indep: perl (>= 5.6.0-16), libtemplate-perl
 Standards-Version: 3.8.0
 Homepage: http://search.cpan.org/dist/Template-Plugin-Class/

Added: trunk/libtemplate-plugin-class-perl/debian/patches/do-not-check-error.diff
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtemplate-plugin-class-perl/debian/patches/do-not-check-error.diff?rev=31772&op=file
==============================================================================
--- trunk/libtemplate-plugin-class-perl/debian/patches/do-not-check-error.diff (added)
+++ trunk/libtemplate-plugin-class-perl/debian/patches/do-not-check-error.diff Mon Mar  9 01:15:19 2009
@@ -1,0 +1,28 @@
+Subject: Do not check value of $tt->error
+From: Ansgar Burchardt <ansgar at 43-1.org>
+Date: Mon, 09 Mar 2009 02:02:22 +0100
+
+We already check if $tt->process returns an error, so do not check the value
+of $tt->error as well. The value of the latter is undocumented in case there is
+no error and has changed from undef to '' in Template::Toolkit 2.20.
+
+See http://bugs.debian.org/518859
+
+--- libtemplate-plugin-class-perl.orig/t/class.t
++++ libtemplate-plugin-class-perl/t/class.t
+@@ -1,13 +1,13 @@
+ #!perl -w
+ use strict;
+-use Test::More tests => 3;
++use Test::More tests => 2;
+ use Template;
+ my $tt = Template->new;
+ 
+ my $template = "[% USE foo=Class('Foo') %][% foo.bar %]";
+ my $out;
+ ok( $tt->process(\$template, {}, \$out), "processed ok" );
+-is( $tt->error, undef, "no error" );
++#is( $tt->error, undef, "no error" );
+ 
+ is( $out, Foo->bar, "method was called" );
+ 

Added: trunk/libtemplate-plugin-class-perl/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtemplate-plugin-class-perl/debian/patches/series?rev=31772&op=file
==============================================================================
--- trunk/libtemplate-plugin-class-perl/debian/patches/series (added)
+++ trunk/libtemplate-plugin-class-perl/debian/patches/series Mon Mar  9 01:15:19 2009
@@ -1,0 +1,1 @@
+do-not-check-error.diff

Modified: trunk/libtemplate-plugin-class-perl/debian/rules
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtemplate-plugin-class-perl/debian/rules?rev=31772&op=diff
==============================================================================
--- trunk/libtemplate-plugin-class-perl/debian/rules (original)
+++ trunk/libtemplate-plugin-class-perl/debian/rules Mon Mar  9 01:15:19 2009
@@ -1,63 +1,25 @@
 #!/usr/bin/make -f
-# This debian/rules file is provided as a template for normal perl
-# packages. It was created by Marc Brockschmidt <marc at dch-faq.de> for
-# the Debian Perl Group (http://pkg-perl.alioth.debian.org/) but may
-# be used freely wherever it is useful.
-#
-# It was later modified by Jason Kohles <email at jasonkohles.com>
-# http://www.jasonkohles.com/ to support Module::Build installed modules
 
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-# If set to a true value then MakeMaker's prompt function will
-# always return the default without waiting for user input.
-export PERL_MM_USE_DEFAULT=1
-
-PERL   ?= /usr/bin/perl
-PACKAGE = $(shell dh_listpackages)
-TMP     = $(CURDIR)/debian/$(PACKAGE)
+include /usr/share/quilt/quilt.make
 
 build: build-stamp
-build-stamp:
-	dh_testdir
-	# Add commands to compile the package here
-	$(PERL) Build.PL installdirs=vendor
-	$(PERL) Build
-	$(PERL) Build test
+build-stamp: $(QUILT_STAMPFN)
+	dh build
 	touch $@
 
-clean:
-	dh_testdir
-	dh_testroot
-	dh_clean build-stamp install-stamp
-	# Add commands to clean up after the build process here
-	[ ! -f Build ] || $(PERL) Build --allow_mb_mismatch 1 distclean
+clean: unpatch
+	dh $@
 
 install: install-stamp
 install-stamp: build-stamp
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-	# Add commands to install the package into $(TMP) here
-	$(PERL) Build install destdir=$(TMP) create_packlist=0
+	dh install
 	touch $@
 
 binary-arch:
-# We have nothing to do here for an architecture-independent package
 
-binary-indep: build install
-	dh_testdir
-	dh_testroot
-	dh_installdocs README
-	dh_installchangelogs Changes
-	dh_perl
-	dh_compress
-	dh_fixperms
-	dh_installdeb
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
+binary-indep: install
+	dh $@
 
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
+binary: binary-arch binary-indep
+
+.PHONY: binary binary-arch binary-indep install clean build




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