[DRE-commits] [SCM] webgen0.5.git branch, master, updated. debian/0.5.17+dfsg1-1-3-gb6019da

[=?UTF-8?Q?Marc=20Dequ=C3=A8nes=20?=(Duck)]

The following commit has been merged in the master branch:
commit 586391869df37d2a87225a9a34ef43d5064603f3
Author: Marc Dequènes (Duck) <Duck at DuckCorp.org>
Date:   Wed Jul 31 19:32:12 2013 +0200

    [fix] #714927

diff --git a/debian/changelog b/debian/changelog
index a90dbf8..c843452 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+webgen0.5 (0.5.17+dfsg1-2) UNRELEASED; urgency=low
+
+  * Fixed '1.9_yaml' patch to avoid patch comment from leaking into the
+    generated documentation (Closes: #714927).
+
+ -- Marc Dequènes (Duck) <Duck at DuckCorp.org>  Wed, 31 Jul 2013 19:31:40 +0200
+
 webgen0.5 (0.5.17+dfsg1-1) unstable; urgency=low
 
   [ Cédric Boutillier ]
diff --git a/debian/patches/1.9_yaml b/debian/patches/1.9_yaml
index bfbcfd8..b2ac6ea 100644
--- a/debian/patches/1.9_yaml
+++ b/debian/patches/1.9_yaml
@@ -1,14 +1,15 @@
+# added by Debian to prevent failure when using the new YAML parser in Ruby 1.9
+# see http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=680227
+
 Index: webgen0.5/lib/webgen/website.rb
 ===================================================================
---- webgen0.5.orig/lib/webgen/website.rb	2011-09-20 02:04:12.642477467 +0200
-+++ webgen0.5/lib/webgen/website.rb	2012-07-04 22:12:53.041052320 +0200
-@@ -1,5 +1,9 @@
- # -*- encoding: utf-8 -*-
- 
-+# added by Debian to prevent failure when using the new YAML parser in Ruby 1.9
-+# see http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=680227
+--- webgen0.5.orig/lib/webgen/website.rb	2013-07-31 19:54:25.525136689 +0200
++++ webgen0.5/lib/webgen/website.rb	2013-07-31 19:55:00.008876467 +0200
+@@ -10,6 +10,7 @@
+ require 'logger'
+ require 'set'
+ require 'fileutils'
 +require 'syck'
-+
- ##
- # Welcome to the API documentation of wegen!
- #
+ 
+ # Requirements for Website
+ require 'webgen/coreext'

-- 
webgen0.5.git