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

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

The following commit has been merged in the master branch:
commit 322c56264e97667baff902f9d5ada33989d39d61
Author: Marc Dequènes (Duck) <Duck at DuckCorp.org>
Date:   Wed Jul 4 22:19:09 2012 +0200

    fixed #680227 and prepared for upload

diff --git a/debian/changelog b/debian/changelog
index efc83cd..8be31ac 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
-webgen0.5 (0.5.14+dfsg1-3) UNRELEASED; urgency=low
+webgen0.5 (0.5.14+dfsg1-3) unstable; urgency=low
 
   * Use new policy packages for exif, haml, and erubis.
+  * Fixed breakage with the new YAML parser in Ruby 1.9, which is now
+    the default version, thanks to Sebastian Reichel (Closes: #680227).
 
  -- Marc Dequènes (Duck) <Duck at DuckCorp.org>  Tue, 26 Jun 2012 00:38:52 +0200
 
diff --git a/debian/patches/1.9_yaml b/debian/patches/1.9_yaml
new file mode 100644
index 0000000..bfbcfd8
--- /dev/null
+++ b/debian/patches/1.9_yaml
@@ -0,0 +1,14 @@
+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
++require 'syck'
++
+ ##
+ # Welcome to the API documentation of wegen!
+ #
diff --git a/debian/patches/series b/debian/patches/series
index d111fab..9b23e19 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 cmdparse2.diff
 disable_webgui.diff
 default_style_dfsg
+1.9_yaml

-- 
webgen0.5.git