r54672 - in /trunk/libhtml-tree-perl: ./ debian/ debian/patches/ debian/source/ lib/HTML/ lib/HTML/Tree/

ansgar-guest at users.alioth.debian.org ansgar-guest at users.alioth.debian.org
Tue Mar 23 12:07:13 UTC 2010


Author: ansgar-guest
Date: Tue Mar 23 12:06:12 2010
New Revision: 54672

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=54672
Log:
* Use source format 3.0 (quilt).
* Refresh rules for debhelper 7.
* Convert debian/copyright to proposed machine-readable format.
* debian/control: Add build-dep on libtest-pod-perl to enable an additional
  test.
* Move changes to upstream source to a patch and a call to sed in d/rules.
* Add patch to close optionally empty XML tags. (Closes: #575068)
  + new patch: missing_close_tag.patch
* Bump Standards-Version to 3.8.4.
* Add myself to Uploaders.

Added:
    trunk/libhtml-tree-perl/debian/libhtml-tree-perl.docs
    trunk/libhtml-tree-perl/debian/patches/
    trunk/libhtml-tree-perl/debian/patches/missing_close_tag.patch
    trunk/libhtml-tree-perl/debian/patches/series
    trunk/libhtml-tree-perl/debian/patches/spelling.patch
    trunk/libhtml-tree-perl/debian/source/
    trunk/libhtml-tree-perl/debian/source/format
Modified:
    trunk/libhtml-tree-perl/debian/changelog
    trunk/libhtml-tree-perl/debian/compat
    trunk/libhtml-tree-perl/debian/control
    trunk/libhtml-tree-perl/debian/copyright
    trunk/libhtml-tree-perl/debian/rules
    trunk/libhtml-tree-perl/htmltree
    trunk/libhtml-tree-perl/lib/HTML/Element.pm
    trunk/libhtml-tree-perl/lib/HTML/Tree/AboutTrees.pod

Modified: trunk/libhtml-tree-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libhtml-tree-perl/debian/changelog?rev=54672&op=diff
==============================================================================
--- trunk/libhtml-tree-perl/debian/changelog (original)
+++ trunk/libhtml-tree-perl/debian/changelog Tue Mar 23 12:06:12 2010
@@ -1,11 +1,9 @@
-libhtml-tree-perl (3.23-2) UNRELEASED; urgency=low
+libhtml-tree-perl (3.23-2) unstable; urgency=low
 
   [ Krzysztof Krzyżaniak (eloy) ]
-  * NOT RELEASED YET
   * Move package to Debian Perl Group repo
   * debian/control: 
    + changed headers to match transition
-   + updated to Standards-Version 3.7.3 (no changes)
 
   [ gregor herrmann ]
   * debian/watch: use dist-based URL.
@@ -17,7 +15,19 @@
   [ Nathan Handler ]
   * debian/watch: Update to ignore development releases.
 
- -- Krzysztof Krzyżaniak (eloy) <eloy at debian.org>  Fri, 06 Jun 2008 12:12:38 +0200
+  [ Ansgar Burchardt ]
+  * Use source format 3.0 (quilt).
+  * Refresh rules for debhelper 7.
+  * Convert debian/copyright to proposed machine-readable format.
+  * debian/control: Add build-dep on libtest-pod-perl to enable an additional
+    test.
+  * Move changes to upstream source to a patch and a call to sed in d/rules.
+  * Add patch to close optionally empty XML tags. (Closes: #575068)
+    + new patch: missing_close_tag.patch
+  * Bump Standards-Version to 3.8.4.
+  * Add myself to Uploaders.
+
+ -- Ansgar Burchardt <ansgar at 43-1.org>  Tue, 23 Mar 2010 21:00:51 +0900
 
 libhtml-tree-perl (3.23-1) unstable; urgency=low
 

Modified: trunk/libhtml-tree-perl/debian/compat
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libhtml-tree-perl/debian/compat?rev=54672&op=diff
==============================================================================
--- trunk/libhtml-tree-perl/debian/compat (original)
+++ trunk/libhtml-tree-perl/debian/compat Tue Mar 23 12:06:12 2010
@@ -1,1 +1,1 @@
-5
+7

Modified: trunk/libhtml-tree-perl/debian/control
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libhtml-tree-perl/debian/control?rev=54672&op=diff
==============================================================================
--- trunk/libhtml-tree-perl/debian/control (original)
+++ trunk/libhtml-tree-perl/debian/control Tue Mar 23 12:06:12 2010
@@ -1,22 +1,24 @@
 Source: libhtml-tree-perl
 Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
-Uploaders: Krzysztof Krzyżaniak (eloy) <eloy at debian.org>
+Uploaders: Krzysztof Krzyżaniak (eloy) <eloy at debian.org>,
+ Ansgar Burchardt <ansgar at 43-1.org>
 Section: perl
 Priority: optional
-Build-Depends: debhelper (>= 5)
-Build-Depends-Indep: libhtml-parser-perl, libhtml-tagset-perl (>= 3.02), perl
+Build-Depends: debhelper (>= 7.0.50~)
+Build-Depends-Indep: libhtml-parser-perl, libhtml-tagset-perl (>= 3.02), perl,
+ libtest-pod-perl (>= 1.14)
 Homepage: http://search.cpan.org/dist/HTML-Tree/
 Vcs-Svn: svn://svn.debian.org/pkg-perl/trunk/libhtml-tree-perl/
 Vcs-Browser: http://svn.debian.org/viewsvn/pkg-perl/trunk/libhtml-tree-perl/
-Standards-Version: 3.7.3
+Standards-Version: 3.8.4
 
 Package: libhtml-tree-perl
 Architecture: all
 Depends: ${misc:Depends}, ${perl:Depends}, libhtml-parser-perl, libhtml-tagset-perl (>= 3.02)
 Replaces: libwww-perl (<< 5.36-0)
 Conflicts: libwww-perl (<< 5.36-0)
-Description: represent and create HTML syntax trees
- This is a collection of modules that represent, create and extract
+Description: Perl module to represent and create HTML syntax trees
+ HTML::Tree is a collection of modules that represent, create and extract
  information from HTML syntax trees.  These modules used to be part of
  the libwww-perl distribution, but are now unbundled in order to
  facilitate a separate development track.

Modified: trunk/libhtml-tree-perl/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libhtml-tree-perl/debian/copyright?rev=54672&op=diff
==============================================================================
--- trunk/libhtml-tree-perl/debian/copyright (original)
+++ trunk/libhtml-tree-perl/debian/copyright Tue Mar 23 12:06:12 2010
@@ -1,36 +1,38 @@
-This is Debian GNU/Linux's prepackaged version of HTML::Tree.  This is
-a set of perl modules which provide access to the structure of world
-wide web documents.
+Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=135
+Maintainer: Pete Krawczyk
+Source: http://search.cpan.org/dist/HTML-Tree/
+Name: HTML-Tree
 
-It is currently maintained by Kenneth J. Pronovici <pronovic at debian.org>,
-and was originally packaged by Michael Alan Dorman <mdorman at debian.org>.
+Copyright:
+ © 1995-1998, Gisle Aas
+ © 1999-2004, Sean M. Burke
+ © 2005,      Andy Lester
+ © 2006,      Pete Krawczyk
+License: Artistic or GPL-1+
 
-The original sources should always be available from the Comprehensive Perl
-Archive Network (CPAN). Visit <URL:http://www.perl.com/CPAN/> to find a CPAN
-site near you.
+Files: lib/HTML/Tree/*
+Copyright: © 2000, The Perl Journal
+License: Artistic or GPL-1+
 
-The HTML::Tree copyright is as follows:
+Files: debian/*
+Copyright:
+ © 1998-2001, Michael Alan Dorman <mdorman at debian.org>
+ © 2003,      Kenneth J. Pronovici <pronovic at debian.org>
+ © 2005-2007, Krzysztof Krzyzaniak (eloy) <eloy at debian.org>
+ © 2005,      Florian Ragwitz <rafl at debianforum.de>
+ © 2010,      Ansgar Burchardt <ansgar at 43-1.org>
+License: Artistic or GPL-1+
 
-   COPYRIGHT
+License: Artistic
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the Artistic License, which comes with Perl.
+    On Debian GNU/Linux systems, the complete text of the Artistic License
+    can be found in `/usr/share/common-licenses/Artistic'
 
-   Copyright 1995-1998 Gisle Aas; copyright 1999-2002 Sean M. Burke.
-   (Except the articles contained in HTML::Tree::AboutObjects,
-   HTML::Tree::AboutTrees, and HTML::Tree::Scanning, which are all
-   copyright 2000 The Perl Journal.)
-
-   Except for those three TPJ articles, the whole HTML-Tree distribution,
-   of which this file is a part, is free software; you can redistribute
-   it and/or modify it under the same terms as Perl itself.
-
-   Those three TPJ articles may be distributed under the same terms as
-   Perl itself.
-
-   The programs in this library are distributed in the hope that they
-   will be useful, but without any warranty; without even the implied
-   warranty of merchantability or fitness for a particular purpose.
-
-Perl is distributed under your choice of the GNU General Public License or the
-Artistic License.  On Debian GNU/Linux systems, the complete text of the GNU
-General Public License can be found in `/usr/share/common-licenses/GPL' and the
-Artistic Licence in `/usr/share/common-licenses/Artistic'.
-
+License: GPL-1+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 1, or (at your option)
+    any later version.
+    On Debian GNU/Linux systems, the complete text of the GNU General
+    Public License can be found in `/usr/share/common-licenses/GPL'

Added: trunk/libhtml-tree-perl/debian/libhtml-tree-perl.docs
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libhtml-tree-perl/debian/libhtml-tree-perl.docs?rev=54672&op=file
==============================================================================
--- trunk/libhtml-tree-perl/debian/libhtml-tree-perl.docs (added)
+++ trunk/libhtml-tree-perl/debian/libhtml-tree-perl.docs Tue Mar 23 12:06:12 2010
@@ -1,0 +1,1 @@
+TODO

Added: trunk/libhtml-tree-perl/debian/patches/missing_close_tag.patch
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libhtml-tree-perl/debian/patches/missing_close_tag.patch?rev=54672&op=file
==============================================================================
--- trunk/libhtml-tree-perl/debian/patches/missing_close_tag.patch (added)
+++ trunk/libhtml-tree-perl/debian/patches/missing_close_tag.patch Tue Mar 23 12:06:12 2010
@@ -1,0 +1,26 @@
+Origin: other, http://rt.cpan.org/Public/Bug/Display.html?id=49932
+Bug: http://rt.cpan.org/Public/Bug/Display.html?id=49932
+Bug-Debian: http://bugs.debian.org/575068
+Bug-Redhat: https://bugzilla.redhat.com/show_bug.cgi?id=525587
+Last-Update: 2010-03-23
+Subject: close tag missing from optionally empty XML tags
+
+When you add a tag to empty_element_map and it optionally contains text
+or other content, when the content is present the opening tag correctly
+has '<foo>' instead of '<foo/>', however the closing tag is missing from
+the text returned by as_XML.
+
+This is due to traverse not correctly validating tags as empty in the
+check for setting callbacks.
+
+--- libhtml-tree-perl.orig/lib/HTML/Element.pm
++++ libhtml-tree-perl/lib/HTML/Element.pm
+@@ -2041,7 +2041,7 @@
+          and ref($this) # sanity
+          and not(
+                  $this->{'_empty_element'}
+-                 || $empty_element_map->{$this->{'_tag'} || ''}
++                 || ($empty_element_map->{$this->{'_tag'} || ''} && !@{$this->{'_content'}})
+                 ) # things that don't get post-order callbacks
+       ) {
+         shift @I;

Added: trunk/libhtml-tree-perl/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libhtml-tree-perl/debian/patches/series?rev=54672&op=file
==============================================================================
--- trunk/libhtml-tree-perl/debian/patches/series (added)
+++ trunk/libhtml-tree-perl/debian/patches/series Tue Mar 23 12:06:12 2010
@@ -1,0 +1,2 @@
+missing_close_tag.patch
+spelling.patch

Added: trunk/libhtml-tree-perl/debian/patches/spelling.patch
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libhtml-tree-perl/debian/patches/spelling.patch?rev=54672&op=file
==============================================================================
--- trunk/libhtml-tree-perl/debian/patches/spelling.patch (added)
+++ trunk/libhtml-tree-perl/debian/patches/spelling.patch Tue Mar 23 12:06:12 2010
@@ -1,0 +1,51 @@
+From: Ansgar Burchardt <ansgar at 43-1.org>
+Date: Tue, 23 Mar 2010 20:47:55 +0900
+Forwarded: https://rt.cpan.org/Ticket/Display.html?id=55836
+Subject: Fix spelling error
+
+--- libhtml-tree-perl.orig/lib/HTML/AsSubs.pm
++++ libhtml-tree-perl/lib/HTML/AsSubs.pm
+@@ -22,7 +22,7 @@
+ 
+ This module exports functions that can be used to construct various
+ HTML elements. The functions are named after the tags of the
+-correponding HTML element and are all written in lower case. If the
++corresponding HTML element and are all written in lower case. If the
+ first argument is a hash reference then it will be used to initialize the
+ attributes of this element. The remaining arguments are regarded as
+ content.
+--- libhtml-tree-perl.orig/lib/HTML/Tree/AboutObjects.pod
++++ libhtml-tree-perl/lib/HTML/Tree/AboutObjects.pod
+@@ -562,7 +562,7 @@
+ into limitations with others.  For example, a Business::US_Amort
+ object can be turned into a string with Data::Dumper, and that string
+ written to a file.  When it's restored later, its attributes will be
+-accessable as normal.  But in the unlikely case that the loan object was
++accessible as normal.  But in the unlikely case that the loan object was
+ saved in mid-calculation, the calculation may not be resumable.  This is
+ because of the way that that I<particular> class does its calculations,
+ but similar limitations may occur with objects from other classses.
+--- libhtml-tree-perl.orig/lib/HTML/Tree/AboutTrees.pod
++++ libhtml-tree-perl/lib/HTML/Tree/AboutTrees.pod
+@@ -670,8 +670,8 @@
+ For the computer to decide which of these is the best move to make, it
+ needs to quantify the benefit of these moves as a number -- call that
+ the "payoff".  The payoff of a move can be figured as just the number
+-of x pieces removed by the most recent move, minus the nubmer of o
+-pieces removed by the mots recent move.  (It so happens that the rules
++of x pieces removed by the most recent move, minus the number of o
++pieces removed by the most recent move.  (It so happens that the rules
+ of the game mean that no move can delete both o's and x's, but the
+ formula still applies.)  Since none of these moves removed any pieces,
+ all these moves have the same immediate payoff: 0.
+--- libhtml-tree-perl.orig/lib/HTML/Element.pm
++++ libhtml-tree-perl/lib/HTML/Element.pm
+@@ -3042,7 +3042,7 @@
+   for (@{  $e->extract_links('a', 'img')  }) {
+       my($link, $element, $attr, $tag) = @$_;
+       print
+-        "Hey, there's a $tag that links to "
++        "Hey, there's a $tag that links to ",
+         $link, ", in its $attr attribute, at ",
+         $element->address(), ".\n";
+   }

Modified: trunk/libhtml-tree-perl/debian/rules
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libhtml-tree-perl/debian/rules?rev=54672&op=diff
==============================================================================
--- trunk/libhtml-tree-perl/debian/rules (original)
+++ trunk/libhtml-tree-perl/debian/rules Tue Mar 23 12:06:12 2010
@@ -1,50 +1,10 @@
 #!/usr/bin/make -f
 
-PERL=/usr/bin/perl
+TMP = $(CURDIR)/debian/libhtml-tree-perl
 
-binary: binary-indep
+%:
+	dh $@
 
-binary-arch: 
-
-binary-indep: build install
-	dh_testdir
-	dh_testroot
-	dh_installdocs README TODO
-	dh_installexamples htmltree
-	dh_installchangelogs Changes
-	dh_fixperms
-	dh_compress
-	dh_installdeb
-	dh_perl
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_installdirs
-	$(MAKE) install INSTALLDIRS=vendor PREFIX=$(CURDIR)/debian/libhtml-tree-perl/usr
-	rm -rf debian/libhtml-tree-perl/usr/lib
-
-build: configure-stamp build-stamp
-build-stamp: 
-	dh_testdir
-	$(MAKE)
-	$(MAKE) test
-	touch build-stamp
-
-configure: configure-stamp
-configure-stamp:
-	dh_testdir
-	$(PERL) Makefile.PL INSTALLDIRS=vendor
-	touch configure-stamp
-
-clean:
-	dh_testdir
-	dh_testroot
-	if [ -e Makefile ]; then $(MAKE) -i distclean; fi
-	rm -f build-stamp configure-stamp
-	dh_clean
-
-.PHONY: binary binary-arch binary-indep install build configure clean
+override_dh_installexamples:
+	dh_installexamples
+	sed -i s,/usr/local/bin/perl,/usr/bin/perl, $(TMP)/usr/share/doc/libhtml-tree-perl/examples/htmltree

Added: trunk/libhtml-tree-perl/debian/source/format
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libhtml-tree-perl/debian/source/format?rev=54672&op=file
==============================================================================
--- trunk/libhtml-tree-perl/debian/source/format (added)
+++ trunk/libhtml-tree-perl/debian/source/format Tue Mar 23 12:06:12 2010
@@ -1,0 +1,1 @@
+3.0 (quilt)

Modified: trunk/libhtml-tree-perl/htmltree
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libhtml-tree-perl/htmltree?rev=54672&op=diff
==============================================================================
--- trunk/libhtml-tree-perl/htmltree (original)
+++ trunk/libhtml-tree-perl/htmltree Tue Mar 23 12:06:12 2010
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/local/bin/perl
 # Time-stamp: "2000-10-02 14:48:15 MDT"
 #
 # Parse the given HTML file(s) and dump the parse tree

Modified: trunk/libhtml-tree-perl/lib/HTML/Element.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libhtml-tree-perl/lib/HTML/Element.pm?rev=54672&op=diff
==============================================================================
--- trunk/libhtml-tree-perl/lib/HTML/Element.pm (original)
+++ trunk/libhtml-tree-perl/lib/HTML/Element.pm Tue Mar 23 12:06:12 2010
@@ -3042,7 +3042,7 @@
   for (@{  $e->extract_links('a', 'img')  }) {
       my($link, $element, $attr, $tag) = @$_;
       print
-        "Hey, there's a $tag that links to ",
+        "Hey, there's a $tag that links to "
         $link, ", in its $attr attribute, at ",
         $element->address(), ".\n";
   }

Modified: trunk/libhtml-tree-perl/lib/HTML/Tree/AboutTrees.pod
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libhtml-tree-perl/lib/HTML/Tree/AboutTrees.pod?rev=54672&op=diff
==============================================================================
--- trunk/libhtml-tree-perl/lib/HTML/Tree/AboutTrees.pod (original)
+++ trunk/libhtml-tree-perl/lib/HTML/Tree/AboutTrees.pod Tue Mar 23 12:06:12 2010
@@ -671,7 +671,7 @@
 needs to quantify the benefit of these moves as a number -- call that
 the "payoff".  The payoff of a move can be figured as just the number
 of x pieces removed by the most recent move, minus the nubmer of o
-pieces removed by the most recent move.  (It so happens that the rules
+pieces removed by the mots recent move.  (It so happens that the rules
 of the game mean that no move can delete both o's and x's, but the
 formula still applies.)  Since none of these moves removed any pieces,
 all these moves have the same immediate payoff: 0.




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