Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: freeze-exception
Hello there,
I'm planning to upload libhtml-template-perl/2.9-2 with the attached
changes. There are no upstream code changes involved.
Diffstat as follows:
| Template.pm | 2
| debian/changelog | 17 ++++
| debian/control | 11 +-
| debian/patches/manpage_back_doesnt_take_parameters.patch | 16 +++
| debian/patches/manpage_html_fix.patch | 19 ++++
| debian/patches/manpage_spelling_fixes.patch | 61 +++++++++++++++
| debian/patches/series | 3
| debian/rules | 2
| debian/source/format | 1
| 9 files changed, 124 insertions(+), 8 deletions(-)
$ debdiff libhtml-template-perl_2.9-1_i386.changes libhtml-template-perl_2.9-2_amd64.changes
| File lists identical on package level (after any substitutions)
|
| Control files: lines which differ (wdiff format)
| ------------------------------------------------
| Depends: perl [-(>= 5.6.0-16)-]
| Description: [-HTML::Template : A-] module for using HTML Templates with
| Perl
| [-This module-]
| {+HTML::Template+} attempts make using HTML templates simple and
| natural. It
| [-.-]
| Installed-Size: [-208-] {+204+}
| Version: [-2.9-1-] {+2.9-2+}
This is a late cleanup, actually planned to be done shortly before the
freeze, but it seems I had false assumptions and was thus now surprised.
Sorry for the additional work.
Would you still accept this for Squeeze?
unblock libhtml-template-perl/2.9-2
-- System Information:
Debian Release: squeeze/sid
APT prefers oldstable
APT policy: (990, 'oldstable'), (990, 'testing'), (990, 'stable'), (500, 'oldstable-proposed-updates'), (50, 'testing-proposed-updates'), (50, 'proposed-updates'), (50, 'unstable'), (1, 'experimental')
Architecture: amd64 (x86_64)
Kernel: Linux 2.6.32-5-amd64 (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -Nru libhtml-template-perl-2.9/debian/changelog libhtml-template-perl-2.9/debian/changelog
--- libhtml-template-perl-2.9/debian/changelog 2010-08-14 13:38:34.000000000 +0200
+++ libhtml-template-perl-2.9/debian/changelog 2010-08-14 13:33:06.000000000 +0200
@@ -1,3 +1,20 @@
+libhtml-template-perl (2.9-2) unstable; urgency=low
+
+ * Template.pm:
+ + convert existing patch for fixing HTML to manpage_html_fix.patch
+ + fix POD error "=back doesn't take any parameters" via
+ manpage_back_doesnt_take_parameters.patch
+ + fix manpage spelling errors via manpage_spelling_fixes.patch
+ * debian/rules: DESTDIR instead of PREFIX (Debian Perl Policy section 4.3)
+ * debian/source/format: use "3.0 (quilt)"
+ * debian/control:
+ + improve package description; make use of Homepage: field (Closes: #530737)
+ + drop versioning from Build-Depends-Indep on perl as even oldstable
+ provides this
+ + packaging now conforms with Standards-Version 3.9.1
+
+ -- Florian Ernst <florian@debian.org> Sat, 14 Aug 2010 13:32:59 +0200
+
libhtml-template-perl (2.9-1) unstable; urgency=low
* New upstream release
diff -Nru libhtml-template-perl-2.9/debian/control libhtml-template-perl-2.9/debian/control
--- libhtml-template-perl-2.9/debian/control 2010-08-14 13:38:34.000000000 +0200
+++ libhtml-template-perl-2.9/debian/control 2010-08-11 20:22:09.000000000 +0200
@@ -3,15 +3,16 @@
Priority: optional
Maintainer: Florian Ernst <florian@debian.org>
Build-Depends: debhelper (>= 5)
-Build-Depends-Indep: perl (>= 5.6.0-16), libipc-sharedcache-perl
-Standards-Version: 3.7.2
+Build-Depends-Indep: perl, libipc-sharedcache-perl
+Standards-Version: 3.9.1
+Homepage: http://search.cpan.org/~samtregar/HTML-Template/
Package: libhtml-template-perl
Architecture: all
Suggests: libipc-sharedcache-perl
Depends: ${perl:Depends}, ${misc:Depends}
-Description: HTML::Template : A module for using HTML Templates with Perl
- This module attempts make using HTML templates simple and natural. It
+Description: module for using HTML Templates with Perl
+ HTML::Template attempts make using HTML templates simple and natural. It
extends standard HTML with a few new HTML-esque tags - <TMPL_VAR>,
<TMPL_LOOP>, <TMPL_INCLUDE>, <TMPL_IF> and <TMPL_ELSE>. The file
written with HTML and these new tags is called a template. It is
@@ -24,5 +25,3 @@
This module allows you to store its cache in shared memory using the
IPC::SharedCache module, please install libipc-sharedcache-perl if you
want to make use of this.
- .
- Homepage: http://search.cpan.org/~samtregar/HTML-Template/
diff -Nru libhtml-template-perl-2.9/debian/patches/manpage_back_doesnt_take_parameters.patch libhtml-template-perl-2.9/debian/patches/manpage_back_doesnt_take_parameters.patch
--- libhtml-template-perl-2.9/debian/patches/manpage_back_doesnt_take_parameters.patch 1970-01-01 01:00:00.000000000 +0100
+++ libhtml-template-perl-2.9/debian/patches/manpage_back_doesnt_take_parameters.patch 2010-08-12 19:37:14.000000000 +0200
@@ -0,0 +1,16 @@
+Description: Fix several spelling errors
+Author: Florian Ernst <florian@debian.org>
+Bug: https://rt.cpan.org/Ticket/Display.html?id=60284
+Last-Update: 2010-08-11
+
+--- a/Template.pm
++++ b/Template.pm
+@@ -902,7 +902,7 @@
+
+ =back
+
+-=back 4
++=back
+
+ =cut
+
diff -Nru libhtml-template-perl-2.9/debian/patches/manpage_html_fix.patch libhtml-template-perl-2.9/debian/patches/manpage_html_fix.patch
--- libhtml-template-perl-2.9/debian/patches/manpage_html_fix.patch 1970-01-01 01:00:00.000000000 +0100
+++ libhtml-template-perl-2.9/debian/patches/manpage_html_fix.patch 2010-08-12 19:37:27.000000000 +0200
@@ -0,0 +1,19 @@
+Description: Fix HTML by closing head correctly
+Author: Thomas Poindessous <thomas@poindessous.com>
+Origin: http://bugs.debian.org/cgi-bin/bugreport.cgi?msg=5;filename=libhtml-template-perl.diff;att=1;bug=204075
+Bug: https://rt.cpan.org/Ticket/Display.html?id=60283
+Bug-Debian: http://bugs.debian.org/204075
+Reviewed-By: Florian Ernst <florian@debian.org>
+Last-Update: 2010-08-11
+
+--- a/Template.pm
++++ b/Template.pm
+@@ -14,7 +14,7 @@ extra tags, the simplest being <TMPL_VAR
+ For example, test.tmpl:
+
+ <html>
+- <head><title>Test Template</title>
++ <head><title>Test Template</title></head>
+ <body>
+ My Home Directory is <TMPL_VAR NAME=HOME>
+ <p>
diff -Nru libhtml-template-perl-2.9/debian/patches/manpage_spelling_fixes.patch libhtml-template-perl-2.9/debian/patches/manpage_spelling_fixes.patch
--- libhtml-template-perl-2.9/debian/patches/manpage_spelling_fixes.patch 1970-01-01 01:00:00.000000000 +0100
+++ libhtml-template-perl-2.9/debian/patches/manpage_spelling_fixes.patch 2010-08-12 19:37:39.000000000 +0200
@@ -0,0 +1,61 @@
+Description: Fix several spelling errors
+Author: Florian Ernst <florian@debian.org>
+Bug: https://rt.cpan.org/Ticket/Display.html?id=60282
+Last-Update: 2010-08-11
+
+--- a/Template.pm
++++ b/Template.pm
+@@ -271,7 +271,7 @@
+ directly. See below for more information on HTML_TEMPLATE_ROOT and
+ the "path" option to new().
+
+-As a protection against infinitly recursive includes, an arbitary
++As a protection against infinitely recursive includes, an arbitrary
+ limit of 10 levels deep is imposed. You can alter this limit with the
+ "max_includes" option. See the entry for the "max_includes" option
+ below for more details.
+@@ -715,7 +715,7 @@
+ The old associateCGI() call is still supported, but should be
+ considered obsolete.
+
+-NOTE: The parameter names are matched in a case-insensitve manner. If
++NOTE: The parameter names are matched in a case-insensitive manner. If
+ you have two parameters in a CGI object like 'NAME' and 'Name' one
+ will be chosen randomly by associate. This behavior can be changed by
+ the following option.
+@@ -852,7 +852,7 @@
+ template tags.
+
+ In the most simple usage, you simply assign a code reference to the
+-filter parameter. This subroutine will recieve a single argument - a
++filter parameter. This subroutine will receive a single argument - a
+ reference to a string containing the template file text. Here is an
+ example that accepts templates with tags that look like "!!!ZAP_VAR
+ FOO!!!" and transforms them into HTML::Template tags:
+@@ -867,7 +867,7 @@
+ filter => $filter);
+
+ More complicated usages are possible. You can request that your
+-filter receieve the template text as an array of lines rather than as
++filter receive the template text as an array of lines rather than as
+ a single scalar. To do that you need to specify your filter using a
+ hash-ref. In this form you specify the filter using the C<sub> key and
+ the desired argument format using the C<format> key. The available
+@@ -2428,7 +2428,7 @@
+ $self->param(PARAM => 'value');
+
+ # with a subroutine reference that gets called to get the value
+- # of the scalar. The sub will recieve the template object as a
++ # of the scalar. The sub will receive the template object as a
+ # parameter.
+ $self->param(PARAM => sub { return 'value' });
+
+@@ -3263,7 +3263,7 @@
+
+ A: Short answer: you can't. Longer answer: you shouldn't since this
+ violates the fundamental concept behind HTML::Template - that design
+-and code should be seperate.
++and code should be separate.
+
+ But, inevitably some people still want to do it. If that describes
+ you then you should take a look at
diff -Nru libhtml-template-perl-2.9/debian/patches/series libhtml-template-perl-2.9/debian/patches/series
--- libhtml-template-perl-2.9/debian/patches/series 1970-01-01 01:00:00.000000000 +0100
+++ libhtml-template-perl-2.9/debian/patches/series 2010-08-12 19:35:06.000000000 +0200
@@ -0,0 +1,3 @@
+manpage_html_fix.patch
+manpage_spelling_fixes.patch
+manpage_back_doesnt_take_parameters.patch
diff -Nru libhtml-template-perl-2.9/debian/rules libhtml-template-perl-2.9/debian/rules
--- libhtml-template-perl-2.9/debian/rules 2010-08-14 13:38:34.000000000 +0200
+++ libhtml-template-perl-2.9/debian/rules 2010-08-11 19:07:54.000000000 +0200
@@ -28,7 +28,7 @@
dh_testdir
dh_testroot
dh_clean -k
- $(MAKE) install PREFIX=$(CURDIR)/debian/libhtml-template-perl/usr
+ $(MAKE) install DESTDIR=$(CURDIR)/debian/libhtml-template-perl
rm -rfv $(CURDIR)/debian/libhtml-template-perl/usr/lib
binary-arch: build install
diff -Nru libhtml-template-perl-2.9/debian/source/format libhtml-template-perl-2.9/debian/source/format
--- libhtml-template-perl-2.9/debian/source/format 1970-01-01 01:00:00.000000000 +0100
+++ libhtml-template-perl-2.9/debian/source/format 2010-08-11 19:21:38.000000000 +0200
@@ -0,0 +1 @@
+3.0 (quilt)
diff -Nru libhtml-template-perl-2.9/Template.pm libhtml-template-perl-2.9/Template.pm
--- libhtml-template-perl-2.9/Template.pm 2010-08-14 13:38:34.000000000 +0200
+++ libhtml-template-perl-2.9/Template.pm 2007-01-29 20:32:21.000000000 +0100
@@ -14,7 +14,7 @@
For example, test.tmpl:
<html>
- <head><title>Test Template</title></head>
+ <head><title>Test Template</title>
<body>
My Home Directory is <TMPL_VAR NAME=HOME>
<p>
Attachment:
signature.asc
Description: Digital signature