[DRE-commits] [SCM] ruby-redcloth.git branch, master, updated. upstream/4.2.8-4-g6c740aa

[Dmitry Borodaenko]

The following commit has been merged in the master branch:
commit 6c740aa1a8feeb34da73233db303de520a2dde39
Author: Dmitry Borodaenko <angdraug at debian.org>
Date:   Sun Oct 9 18:25:14 2011 +0300

    patch: use RbConfig

diff --git a/debian/changelog b/debian/changelog
index ac6f058..edd23e6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ruby-redcloth (4.2.8-2) unstable; urgency=low
+
+  * Really point watch file to GitHub.
+  * Fix Config deprecation warning with Ruby 1.9.3.
+
+ -- Dmitry Borodaenko <angdraug at debian.org>  Sun, 09 Oct 2011 18:26:33 +0300
+
 ruby-redcloth (4.2.8-1) unstable; urgency=low
 
   * New upstream version.
diff --git a/debian/patches/0001-use-RbConfig.patch b/debian/patches/0001-use-RbConfig.patch
new file mode 100644
index 0000000..b706801
--- /dev/null
+++ b/debian/patches/0001-use-RbConfig.patch
@@ -0,0 +1,29 @@
+From: Dmitry Borodaenko <angdraug at debian.org>
+Date: Sun, 9 Oct 2011 18:24:56 +0300
+Subject: use RbConfig
+
+---
+ lib/redcloth.rb |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/lib/redcloth.rb b/lib/redcloth.rb
+index 0df3a9c..162d7ad 100644
+--- a/lib/redcloth.rb
++++ b/lib/redcloth.rb
+@@ -7,7 +7,7 @@ Object.send(:remove_const, :RedCloth) if Object.const_defined?(:RedCloth) && Red
+ 
+ require 'rbconfig'
+ begin
+-  prefix = Config::CONFIG['arch'] =~ /mswin|mingw/ ? "#{Config::CONFIG['MAJOR']}.#{Config::CONFIG['MINOR']}/" : ''
++  prefix = RbConfig::CONFIG['arch'] =~ /mswin|mingw/ ? "#{RbConfig::CONFIG['MAJOR']}.#{RbConfig::CONFIG['MINOR']}/" : ''
+   lib = "#{prefix}redcloth_scan"
+   require lib
+ rescue LoadError => e
+@@ -41,4 +41,4 @@ begin
+   require 'redcloth/erb_extension'
+   include ERB::Util
+ rescue LoadError
+-end
+\ No newline at end of file
++end
+-- 
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..6876afa
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-use-RbConfig.patch

-- 
ruby-redcloth.git