r76629 - in /trunk/libhtml-packer-perl: Changes MANIFEST META.yml TODO debian/changelog debian/control debian/copyright lib/HTML/Packer.pm t/02-io.t t/html/s1-expected.html t/html/s1.html t/html/s3-expected.html t/html/s3.html

fabreg-guest at users.alioth.debian.org fabreg-guest at users.alioth.debian.org
Mon Jun 27 14:33:11 UTC 2011 

Author: fabreg-guest
Date: Mon Jun 27 14:33:10 2011
New Revision: 76629

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=76629
Log:
* New upstream release.
* Added myself as Uploaders and Copyright.

Added:
    trunk/libhtml-packer-perl/TODO
      - copied unchanged from r76628, branches/upstream/libhtml-packer-perl/current/TODO
Modified:
    trunk/libhtml-packer-perl/Changes
    trunk/libhtml-packer-perl/MANIFEST
    trunk/libhtml-packer-perl/META.yml
    trunk/libhtml-packer-perl/debian/changelog
    trunk/libhtml-packer-perl/debian/control
    trunk/libhtml-packer-perl/debian/copyright
    trunk/libhtml-packer-perl/lib/HTML/Packer.pm
    trunk/libhtml-packer-perl/t/02-io.t
    trunk/libhtml-packer-perl/t/html/s1-expected.html
    trunk/libhtml-packer-perl/t/html/s1.html
    trunk/libhtml-packer-perl/t/html/s3-expected.html
    trunk/libhtml-packer-perl/t/html/s3.html

Modified: trunk/libhtml-packer-perl/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libhtml-packer-perl/Changes?rev=76629&op=diff
==============================================================================
--- trunk/libhtml-packer-perl/Changes (original)
+++ trunk/libhtml-packer-perl/Changes Mon Jun 27 14:33:10 2011
@@ -1,4 +1,9 @@
 Revision history for HTML-Packer
+
+1.002001    2001-06-15
+    - Fixed embarrassing bug in comment regexp.
+    - Fixed tests.
+    - Added TODO.
 
 1.002   2011-06-07
     - Raised version number.

Modified: trunk/libhtml-packer-perl/MANIFEST
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libhtml-packer-perl/MANIFEST?rev=76629&op=diff
==============================================================================
--- trunk/libhtml-packer-perl/MANIFEST (original)
+++ trunk/libhtml-packer-perl/MANIFEST Mon Jun 27 14:33:10 2011
@@ -33,3 +33,4 @@
 t/html/s6-expected.html
 t/html/s6.html
 t/pod.t
+TODO

Modified: trunk/libhtml-packer-perl/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libhtml-packer-perl/META.yml?rev=76629&op=diff
==============================================================================
--- trunk/libhtml-packer-perl/META.yml (original)
+++ trunk/libhtml-packer-perl/META.yml Mon Jun 27 14:33:10 2011
@@ -26,4 +26,4 @@
   bugtracker: http://github.com/nevesenin/html-packer-perl/issues
   license: http://dev.perl.org/licenses/
   repository: http://github.com/nevesenin/html-packer-perl
-version: 1.002
+version: 1.002001

Modified: trunk/libhtml-packer-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libhtml-packer-perl/debian/changelog?rev=76629&op=diff
==============================================================================
--- trunk/libhtml-packer-perl/debian/changelog (original)
+++ trunk/libhtml-packer-perl/debian/changelog Mon Jun 27 14:33:10 2011
@@ -1,3 +1,10 @@
+libhtml-packer-perl (1.002001-1) UNRELEASED; urgency=low
+
+  * New upstream release.
+  * Added myself as Uploaders and Copyright.
+
+ -- Fabrizio Regalli <fabreg at fabreg.it>  Mon, 27 Jun 2011 16:30:42 +0200
+
 libhtml-packer-perl (1.002-1) unstable; urgency=low
 
   * New upstream release

Modified: trunk/libhtml-packer-perl/debian/control
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libhtml-packer-perl/debian/control?rev=76629&op=diff
==============================================================================
--- trunk/libhtml-packer-perl/debian/control (original)
+++ trunk/libhtml-packer-perl/debian/control Mon Jun 27 14:33:10 2011
@@ -7,7 +7,8 @@
 Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
 Uploaders: Ernesto Hernández-Novich (USB) <emhn at usb.ve>,
  gregor herrmann <gregoa at debian.org>,
- Jotam Jr. Trejo <jotamjr at debian.org.sv>
+ Jotam Jr. Trejo <jotamjr at debian.org.sv>,
+ Fabrizio Regalli <fabreg at fabreg.it>
 Standards-Version: 3.9.2
 Homepage: http://search.cpan.org/dist/HTML-Packer/
 Vcs-Svn: svn://svn.debian.org/pkg-perl/trunk/libhtml-packer-perl/

Modified: trunk/libhtml-packer-perl/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libhtml-packer-perl/debian/copyright?rev=76629&op=diff
==============================================================================
--- trunk/libhtml-packer-perl/debian/copyright (original)
+++ trunk/libhtml-packer-perl/debian/copyright Mon Jun 27 14:33:10 2011
@@ -17,6 +17,7 @@
 Copyright: 2009-2011, Ernesto Hernández-Novich (USB) <emhn at usb.ve>
  2011, gregor herrmann <gregoa at debian.org>
  2011, Jotam Jr. Trejo <jotamjr at debian.org.sv>
+ 2011, Fabrizio Regalli <fabreg at fabreg.it>
 License: Artistic or GPL-1+
 
 License: Artistic

Modified: trunk/libhtml-packer-perl/lib/HTML/Packer.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libhtml-packer-perl/lib/HTML/Packer.pm?rev=76629&op=diff
==============================================================================
--- trunk/libhtml-packer-perl/lib/HTML/Packer.pm (original)
+++ trunk/libhtml-packer-perl/lib/HTML/Packer.pm Mon Jun 27 14:33:10 2011
@@ -8,7 +8,7 @@
 
 # -----------------------------------------------------------------------------
 
-our $VERSION = '1.002';
+our $VERSION = '1.002001';
 
 our @BOOLEAN_ACCESSORS = (
     'remove_comments',
@@ -30,13 +30,13 @@
 );
 
 our @VOID_ELEMENTS = (
-        'area', 'base', 'br', 'col', 'command', 'embed', 'hr', 'img', 'input',
-        'keygen', 'link', 'meta', 'param', 'source', 'track', 'wbr'
+    'area', 'base', 'br', 'col', 'command', 'embed', 'hr', 'img', 'input',
+    'keygen', 'link', 'meta', 'param', 'source', 'track', 'wbr'
 );
 
 # Some regular expressions are from HTML::Clean
 
-our $COMMENT        = '((?>\s*))(<!--(?:(?:[^#\[]|(?! google_ad_section_)).*?)?-->)((?>\s*))';
+our $COMMENT        = '((?>\s*))(<!--(?:(?![#\[]| google_ad_section_).*?)?-->)((?>\s*))';
 
 our $PACKER_COMMENT = '<!--\s*HTML::Packer\s*(\w+)\s*-->';
 
@@ -59,7 +59,7 @@
         modifier    => 'm'
     },
     {
-        regexp      => '\s*$',
+        regexp      => '[^\S\n]*$',
         replacement => '',
         modifier    => 'm'
     },
@@ -405,7 +405,7 @@
 
 =head1 VERSION
 
-Version 1.002
+Version 1.002001
 
 =head1 DESCRIPTION
 

Modified: trunk/libhtml-packer-perl/t/02-io.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libhtml-packer-perl/t/02-io.t?rev=76629&op=diff
==============================================================================
--- trunk/libhtml-packer-perl/t/02-io.t (original)
+++ trunk/libhtml-packer-perl/t/02-io.t Mon Jun 27 14:33:10 2011
@@ -26,10 +26,10 @@
 
 EOT
 
-my $js_expected             = '<script type="javascript">/*<![CDATA[*/alert(\'test\');/*]]>*/</script><a href="/">link 1 </a> <a href="/"> link 2 </a>';
-my $js_expected_html5       = '<script>alert(\'test\');</script><a href="/">link 1 </a> <a href="/"> link 2 </a>';
-my $js_expected_html5_no_js = '<script>' . "\n\n\n\n" . '  alert(\'test\');</script><a href="/">link 1 </a> <a href="/"> link 2 </a>';
-my $js_expected_no_js       = '<script type="javascript">' . "\n\n\n\n" . '  alert(\'test\');</script><a href="/">link 1 </a> <a href="/"> link 2 </a>';
+my $js_expected             = '<script type="javascript">/*<![CDATA[*/alert(\'test\');/*]]>*/</script> <a href="/">link 1 </a> <a href="/"> link 2 </a>';
+my $js_expected_html5       = '<script>alert(\'test\');</script> <a href="/">link 1 </a> <a href="/"> link 2 </a>';
+my $js_expected_html5_no_js = '<script>' . "\n\n\n\n" . '  alert(\'test\');</script> <a href="/">link 1 </a> <a href="/"> link 2 </a>';
+my $js_expected_no_js       = '<script type="javascript">' . "\n\n\n\n" . '  alert(\'test\');</script> <a href="/">link 1 </a> <a href="/"> link 2 </a>';
 
 my $css_input = <<EOT;
 
@@ -55,8 +55,8 @@
 
 EOT
 
-my $css_expected        = '<style type="text/css">' . "\nfoo{\nasdf:asdf;\new:12;\n}\n" . '</style><a href="/">link 1 </a> <a href="/"> link 2 </a>';
-my $css_expected_no_css = '<style type="text/css">' . "\n\n  foo {\n    asdf:asdf;\n    ew:12;\n  }\n" . '</style><a href="/">link 1 </a> <a href="/"> link 2 </a>';
+my $css_expected        = '<style type="text/css">' . "\nfoo{\nasdf:asdf;\new:12;\n}\n" . '</style> <a href="/">link 1 </a> <a href="/"> link 2 </a>';
+my $css_expected_no_css = '<style type="text/css">' . "\n\n  foo {\n    asdf:asdf;\n    ew:12;\n  }\n" . '</style> <a href="/">link 1 </a> <a href="/"> link 2 </a>';
 
 my $html_input = <<EOT;
 <script type="javascript">/*<![CDATA[*/

Modified: trunk/libhtml-packer-perl/t/html/s1-expected.html
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libhtml-packer-perl/t/html/s1-expected.html?rev=76629&op=diff
==============================================================================
--- trunk/libhtml-packer-perl/t/html/s1-expected.html (original)
+++ trunk/libhtml-packer-perl/t/html/s1-expected.html Mon Jun 27 14:33:10 2011
@@ -2,4 +2,5 @@
 1 </a>
 <!-- comment -->
 <a href="/"> link 2
-</a>
+</a>
+<!-- comment 2 -->

Modified: trunk/libhtml-packer-perl/t/html/s1.html
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libhtml-packer-perl/t/html/s1.html?rev=76629&op=diff
==============================================================================
--- trunk/libhtml-packer-perl/t/html/s1.html (original)
+++ trunk/libhtml-packer-perl/t/html/s1.html Mon Jun 27 14:33:10 2011
@@ -1,13 +1,17 @@
 
 
-<a href="/"  >link 
+<a href="/"  >link
 
 1   < /a>
 
 
 <!-- comment -->
 
-    <  a href="/">   link 2   
+    <  a href="/">   link 2
     < / a  >
 
 
+
+
+
+    <!-- comment 2 -->

Modified: trunk/libhtml-packer-perl/t/html/s3-expected.html
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libhtml-packer-perl/t/html/s3-expected.html?rev=76629&op=diff
==============================================================================
--- trunk/libhtml-packer-perl/t/html/s3-expected.html (original)
+++ trunk/libhtml-packer-perl/t/html/s3-expected.html Mon Jun 27 14:33:10 2011
@@ -1,4 +1,11 @@
 <a href="/">link
 1 </a>
 <a href="/"> link 2
-</a>
+</a>
+<!--[if lte IE 6]><iframe frameborder="0" src="javascript:'<html></html>'"></iframe><![endif]-->
+<a href="/">link 3
+1 </a>
+<!-- google_ad_section_start -->
+<a href="/"> link 4
+</a>
+<!-- google_ad_section_end -->

Modified: trunk/libhtml-packer-perl/t/html/s3.html
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libhtml-packer-perl/t/html/s3.html?rev=76629&op=diff
==============================================================================
--- trunk/libhtml-packer-perl/t/html/s3.html (original)
+++ trunk/libhtml-packer-perl/t/html/s3.html Mon Jun 27 14:33:10 2011
@@ -1,13 +1,37 @@
 
 
-<a href="/"  >link 
+<a href="/"  >link
 
 1   < /a>
 
 
 <!-- comment -->
 
-    <  a href="/">   link 2   
+    <  a href="/">   link 2
     < / a  >
 
 
+<!--[if lte IE 6]><iframe frameborder="0" src="javascript:'<html></html>'"></iframe><![endif]-->
+
+
+<a href="/"  >link 3
+
+1   < /a>
+
+
+<!-- google_ad_section_start -->
+
+    <  a href="/">   link 4
+    < / a  >
+
+
+  <!-- google_ad_section_end -->
+
+
+
+
+
+
+
+
+

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