r935 - in packages/libhtml-clean-perl/trunk: debian lib/HTML

[Gunnar Wolf]

Author: gwolf
Date: 2005-04-16 17:36:31 +0000 (Sat, 16 Apr 2005)
New Revision: 935

Modified:
   packages/libhtml-clean-perl/trunk/debian/changelog
   packages/libhtml-clean-perl/trunk/debian/rules
   packages/libhtml-clean-perl/trunk/lib/HTML/Clean.pm
Log:
Fixed: double comment tag at end of javascript


Modified: packages/libhtml-clean-perl/trunk/debian/changelog
===================================================================
--- packages/libhtml-clean-perl/trunk/debian/changelog	2005-04-16 16:53:19 UTC (rev 934)
+++ packages/libhtml-clean-perl/trunk/debian/changelog	2005-04-16 17:36:31 UTC (rev 935)
@@ -1,3 +1,9 @@
+libhtml-clean-perl (0.8-7) unstable; urgency=low
+
+  * Fixed double comment tag at end of javascript (Closes: #303619)
+
+ -- Gunnar Wolf <gwolf@debian.org>  Sat, 16 Apr 2005 12:33:09 -0500
+
 libhtml-clean-perl (0.8-6) unstable; urgency=low
 
   * Added the test when building the package

Modified: packages/libhtml-clean-perl/trunk/debian/rules
===================================================================
--- packages/libhtml-clean-perl/trunk/debian/rules	2005-04-16 16:53:19 UTC (rev 934)
+++ packages/libhtml-clean-perl/trunk/debian/rules	2005-04-16 17:36:31 UTC (rev 935)
@@ -23,9 +23,9 @@
 clean:	checkroot
 	rm -f build-stamp
 	dh_clean
-	-$(MAKE) distclean
 	# Remove the output from the test
 	rm -f t/testpages/t*.html
+	-$(MAKE) distclean
 
 binary-indep:	checkroot build
 	dh_clean

Modified: packages/libhtml-clean-perl/trunk/lib/HTML/Clean.pm
===================================================================
--- packages/libhtml-clean-perl/trunk/lib/HTML/Clean.pm	2005-04-16 16:53:19 UTC (rev 934)
+++ packages/libhtml-clean-perl/trunk/lib/HTML/Clean.pm	2005-04-16 17:36:31 UTC (rev 935)
@@ -220,9 +220,10 @@
   $js =~ s,\s+//.*?\n,\n,sig;
 
   # insure javascript is hidden
-  
   if ($js =~ m,<!--,) {
-     $js =~ s,</script>,// -->\n</script>,si;
+      unless ($js =~ m,(-->[\s\r\n]*</script>),i) {
+	  $js =~ s,</script>,// -->\n</script>,si;
+      }
   }
   return($js);
 }