[DRE-commits] r3146 - in packages/libhaml-ruby/trunk/debian: . patches

[gwolf at alioth.debian.org]

Author: gwolf
Date: 2008-12-22 04:08:08 +0000 (Mon, 22 Dec 2008)
New Revision: 3146

Removed:
   packages/libhaml-ruby/trunk/debian/patches/supress_end_in_html_conversor
Modified:
   packages/libhaml-ruby/trunk/debian/changelog
   packages/libhaml-ruby/trunk/debian/html2haml.1
   packages/libhaml-ruby/trunk/debian/patches/series
Log:
Remove patch that was rejected upstream, document the behaviour as
expected. And now, truly, prepare for the real upload.


Modified: packages/libhaml-ruby/trunk/debian/changelog
===================================================================
--- packages/libhaml-ruby/trunk/debian/changelog	2008-12-22 00:11:13 UTC (rev 3145)
+++ packages/libhaml-ruby/trunk/debian/changelog	2008-12-22 04:08:08 UTC (rev 3146)
@@ -1,14 +1,5 @@
-libhaml-ruby (2.0.6-2) unstable; urgency=low
-
-  * Added missing Homepage, Vcs-Svn, Vcs-Browser fields in debian/control
-  * Added the Sass and Haml Emacs modes in the haml-elisp binary package
-  * Patched lib/haml/html.rb to supress 'end' blocks in Haml generated
-    from RHTML, as the parser regars it as invalid
-
- -- Gunnar Wolf <gwolf at debian.org>  Fri, 19 Dec 2008 15:12:11 -0600
-
 libhaml-ruby (2.0.6-1) unstable; urgency=low
 
   * Initial upload (Closes: #509159)
 
- -- Gunnar Wolf <gwolf at debian.org>  Thu, 18 Dec 2008 17:42:16 -0600
+ -- Gunnar Wolf <gwolf at debian.org>  Fri, 19 Dec 2008 15:12:11 -0600

Modified: packages/libhaml-ruby/trunk/debian/html2haml.1
===================================================================
--- packages/libhaml-ruby/trunk/debian/html2haml.1	2008-12-22 00:11:13 UTC (rev 3145)
+++ packages/libhaml-ruby/trunk/debian/html2haml.1	2008-12-22 04:08:08 UTC (rev 3146)
@@ -28,6 +28,12 @@
 .TP 8
 .B \-v, --version
 Print version
+.PP
+Please note this program's function is to make a \fIfirst approach\R
+towards converting your HTML. Although usually it will give you a
+nearly good result, it will often need tweaking \- This is specially
+true when you are parsing RHTML, as it can include parsable and
+conditional tags which can be misinterpreted and break nesting.
 .SH SEE ALSO
 This program is shipped as part of the libhaml-ruby1.8 library
 package, you can check its corresponding documentation can be found in

Modified: packages/libhaml-ruby/trunk/debian/patches/series
===================================================================
--- packages/libhaml-ruby/trunk/debian/patches/series	2008-12-22 00:11:13 UTC (rev 3145)
+++ packages/libhaml-ruby/trunk/debian/patches/series	2008-12-22 04:08:08 UTC (rev 3146)
@@ -1,3 +1,2 @@
-supress_end_in_html_conversor
 fix-hardcoded-gem-paths
 get-version-from-right-path

Deleted: packages/libhaml-ruby/trunk/debian/patches/supress_end_in_html_conversor
===================================================================
--- packages/libhaml-ruby/trunk/debian/patches/supress_end_in_html_conversor	2008-12-22 00:11:13 UTC (rev 3145)
+++ packages/libhaml-ruby/trunk/debian/patches/supress_end_in_html_conversor	2008-12-22 04:08:08 UTC (rev 3146)
@@ -1,17 +0,0 @@
-# This patch has been sent to the upstream author; RHTML is usually
-# converted into Haml with spurious, invalid 'end' blocks. This fixes
-# it. 
-Index: libhaml-ruby-2.0.6/lib/haml/html.rb
-===================================================================
---- libhaml-ruby-2.0.6.orig/lib/haml/html.rb	2008-12-19 15:11:14.000000000 -0600
-+++ libhaml-ruby-2.0.6/lib/haml/html.rb	2008-12-19 15:11:58.000000000 -0600
-@@ -211,7 +211,8 @@
-     end
- 
-     def self.haml_tag_silent(text)
--      text.split("\n").map { |line| "- #{line.strip}\n" }.join
-+      text.split("\n").map { |line| "- #{line.strip}\n" }.
-+        reject {|line| line == "- end\n"}.join
-     end
- 
-     private