[DRE-commits] r4253 - in trunk/webgen0.4/debian: . patches

[Vincent Fourmond]

Author: fourmond
Date: 2009-10-13 19:15:58 +0000 (Tue, 13 Oct 2009)
New Revision: 4253

Added:
   trunk/webgen0.4/debian/README.source
   trunk/webgen0.4/debian/patches/textile-line-breaks.diff
Modified:
   trunk/webgen0.4/debian/changelog
   trunk/webgen0.4/debian/compat
   trunk/webgen0.4/debian/control
   trunk/webgen0.4/debian/patches/series
Log:
[webgen0.4] Fix a very annoying bug + various packaging updates. Ready for upload

Added: trunk/webgen0.4/debian/README.source
===================================================================
--- trunk/webgen0.4/debian/README.source	                        (rev 0)
+++ trunk/webgen0.4/debian/README.source	2009-10-13 19:15:58 UTC (rev 4253)
@@ -0,0 +1,9 @@
+Note about the source package of webgen0.4
+
+This package uses dpatch quilt manage all modifications to the
+upstream source. See /usr/share/doc/quilt/README.source to get more
+information on how to use it.
+
+ -- Vincent Fourmond <fourmond at debian.org>, Tue, 13 Oct 2009 20:29:44 +0200
+
+

Modified: trunk/webgen0.4/debian/changelog
===================================================================
--- trunk/webgen0.4/debian/changelog	2009-10-13 18:06:49 UTC (rev 4252)
+++ trunk/webgen0.4/debian/changelog	2009-10-13 19:15:58 UTC (rev 4253)
@@ -1,3 +1,17 @@
+webgen0.4 (0.4.7-3) unstable; urgency=low
+
+  * Added myself and the Debian Ruby team to uploaders
+  * textile-line-breaks.diff: Fix the behaviour of the Textile plugin with
+    respect to line breaks (closes: #525553)
+  * Added a debian/README.source
+  * Now conforms to Standards 3.8.3
+  * In addition, it seems that the FTBS on amd64 does not occur anymore,
+    though the reason why isn't very clear (closes: 533957)
+  * Bumped dh compatibility level to 5
+  * Added ${misc:Depends} for potential dh_-induced dependencies
+
+ -- Vincent Fourmond <fourmond at debian.org>  Tue, 13 Oct 2009 20:54:46 +0200
+
 webgen0.4 (0.4.7-2) unstable; urgency=low
 
   [ Vincent Fourmond ]

Modified: trunk/webgen0.4/debian/compat
===================================================================
--- trunk/webgen0.4/debian/compat	2009-10-13 18:06:49 UTC (rev 4252)
+++ trunk/webgen0.4/debian/compat	2009-10-13 19:15:58 UTC (rev 4253)
@@ -1 +1 @@
-4
+5

Modified: trunk/webgen0.4/debian/control
===================================================================
--- trunk/webgen0.4/debian/control	2009-10-13 18:06:49 UTC (rev 4252)
+++ trunk/webgen0.4/debian/control	2009-10-13 19:15:58 UTC (rev 4253)
@@ -2,14 +2,16 @@
 Section: web
 Priority: optional
 Maintainer: Arnaud Cornet <acornet at debian.org>
-Build-Depends: cdbs, debhelper (>= 4.0.0), quilt, ruby, ruby-pkg-tools (>= 0.14), libcmdparse2-ruby, libbluecloth-ruby, libredcloth-ruby, libbuilder-ruby, librmagick-ruby, libmaruku-ruby, graphviz
+Uploaders: Vincent Fourmond <fourmond at debian.org>, Debian Ruby Extras
+ Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
+Build-Depends: cdbs, debhelper (>= 5.0.0), quilt, ruby, ruby-pkg-tools (>= 0.14), libcmdparse2-ruby, libbluecloth-ruby, libredcloth-ruby, libbuilder-ruby, librmagick-ruby, libmaruku-ruby, graphviz
 Build-Conflicts: libxml2-utils, webgen (< 0.4)
-Standards-Version: 3.8.0
+Standards-Version: 3.8.3
 Homepage: http://webgen.rubyforge.org/
 
 Package: webgen0.4
 Architecture: all
-Depends: ruby, libcmdparse2-ruby, rdoc
+Depends: ruby, libcmdparse2-ruby, rdoc, ${misc:Depends}
 Recommends: libredcloth-ruby, librmagick-ruby, libexif-ruby, libbluecloth-ruby, libbuilder-ruby, webgen0.4-doc
 Conflicts: webgen
 Description: A template based static website generator
@@ -20,6 +22,7 @@
 
 Package: webgen0.4-doc
 Architecture: all
+Depends: ${misc:Depends}
 Section: doc
 Description: A template based static website generator
  Webgen is used to generate web pages from page description and template files.

Modified: trunk/webgen0.4/debian/patches/series
===================================================================
--- trunk/webgen0.4/debian/patches/series	2009-10-13 18:06:49 UTC (rev 4252)
+++ trunk/webgen0.4/debian/patches/series	2009-10-13 19:15:58 UTC (rev 4253)
@@ -2,3 +2,4 @@
 trash_statcounter.diff
 shebang-ruby.diff
 drop-fucking-rubygems.diff
+textile-line-breaks.diff

Added: trunk/webgen0.4/debian/patches/textile-line-breaks.diff
===================================================================
--- trunk/webgen0.4/debian/patches/textile-line-breaks.diff	                        (rev 0)
+++ trunk/webgen0.4/debian/patches/textile-line-breaks.diff	2009-10-13 19:15:58 UTC (rev 4253)
@@ -0,0 +1,16 @@
+Index: webgen0.4-0.4.7/lib/webgen/plugins/contentconverters/textile.rb
+===================================================================
+--- webgen0.4-0.4.7.orig/lib/webgen/plugins/contentconverters/textile.rb	2008-01-12 13:41:25.000000000 +0100
++++ webgen0.4-0.4.7/lib/webgen/plugins/contentconverters/textile.rb	2009-10-13 20:25:40.000000000 +0200
+@@ -41,7 +41,10 @@
+       register_handler 'textile'
+ 
+       def call( content )
+-        RedCloth.new( content ).to_html
++        converter = RedCloth.new( content )
++        # Cope for both old and new behavior of Textile...
++        converter.hard_breaks = false 
++        converter.to_html
+       rescue Exception => e
+         log(:error) { "Error converting Textile text to HTML: #{e.message}" }
+         content