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

[Dmitry Borodaenko]

The following commit has been merged in the master branch:
commit 26dc05780986bebeaae95ad476f907358dce22d2
Author: Dmitry Borodaenko <angdraug at debian.org>
Date:   Sun Jan 8 19:38:50 2012 +0300

    new upstream version 4.2.9

diff --git a/debian/changelog b/debian/changelog
index edd23e6..b3ee8de 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+ruby-redcloth (4.2.9-1) unstable; urgency=low
+
+  [ Dmitry Borodaenko ]
+  * New upstream version:
+    - RbConfig warning fix merged.
+  * Transitional packages are oldlibs/extra.
+  * Point Vcs-* control fields at git.debian.org.
+  * Recompile Ragel sources, added Build-Depends: ragel.
+
+  [ Cedric Boutillier ]
+  * Fix debian/watch to adapt to modified github.com.
+
+ -- Dmitry Borodaenko <angdraug at debian.org>  Sun, 08 Jan 2012 19:32:30 +0300
+
 ruby-redcloth (4.2.8-2) unstable; urgency=low
 
   * Really point watch file to GitHub.
diff --git a/debian/control b/debian/control
index cb7f9e1..be117ef 100644
--- a/debian/control
+++ b/debian/control
@@ -4,10 +4,10 @@ Priority: optional
 Maintainer: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
 Uploaders: Dmitry Borodaenko <angdraug at debian.org>
 DM-Upload-Allowed: yes
-Build-Depends: debhelper (>= 7.0.50~), gem2deb (>= 0.2.7~), rake (>= 0.8.7~), ruby-rspec (>= 2.4~)
+Build-Depends: debhelper (>= 7.0.50~), gem2deb (>= 0.2.7~), rake (>= 0.8.7~), ruby-rspec (>= 2.4~), ragel
 Standards-Version: 3.9.2
-Vcs-Git: git://github.com/jgarber/redcloth.git
-Vcs-Browser: https://github.com/jgarber/redcloth
+Vcs-Git: git://git.debian.org/pkg-ruby-extras/ruby-redcloth.git
+Vcs-Browser: http://git.debian.org/?p=pkg-ruby-extras/ruby-redcloth.git;a=summary
 Homepage: https://github.com/jgarber/redcloth
 XS-Ruby-Versions: all
 
diff --git a/debian/patches/0001-restore-extconf.rb.patch b/debian/patches/0001-restore-extconf.rb.patch
new file mode 100644
index 0000000..7446b7b
--- /dev/null
+++ b/debian/patches/0001-restore-extconf.rb.patch
@@ -0,0 +1,22 @@
+From: Dmitry Borodaenko <angdraug at debian.org>
+Date: Sun, 12 Feb 2012 14:05:31 +0300
+Subject: restore extconf.rb
+Forwarded: not-needed
+
+---
+ ext/redcloth_scan/extconf.rb |    6 ++++++
+ 1 files changed, 6 insertions(+), 0 deletions(-)
+ create mode 100644 ext/redcloth_scan/extconf.rb
+
+diff --git a/ext/redcloth_scan/extconf.rb b/ext/redcloth_scan/extconf.rb
+new file mode 100644
+index 0000000..506d4a3
+--- /dev/null
++++ b/ext/redcloth_scan/extconf.rb
+@@ -0,0 +1,6 @@
++require 'mkmf'
++CONFIG['warnflags'].gsub!(/-Wshorten-64-to-32/, '') if CONFIG['warnflags']
++$CFLAGS << ' -O0 -Wall ' if CONFIG['CC'] =~ /gcc/
++dir_config("redcloth_scan")
++have_library("c", "main")
++create_makefile("redcloth_scan")
diff --git a/debian/patches/0001-use-RbConfig.patch b/debian/patches/0001-use-RbConfig.patch
deleted file mode 100644
index b706801..0000000
--- a/debian/patches/0001-use-RbConfig.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-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
index 6876afa..fb58cc7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1 @@
-0001-use-RbConfig.patch
+0001-restore-extconf.rb.patch
diff --git a/debian/rules b/debian/rules
index 40eb63f..e6f9abb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,6 +14,13 @@
 %:
 	dh $@ --buildsystem=ruby --with ruby
 
+override_dh_auto_build:
+	ragel ragel/redcloth_scan.c.rl -o ext/redcloth_scan/redcloth_scan.c
+	ragel ragel/redcloth_inline.c.rl -o ext/redcloth_scan/redcloth_inline.c
+	ragel ragel/redcloth_attributes.c.rl -o ext/redcloth_scan/redcloth_attributes.c
+	ragel ragel/redcloth_common.c.rl -o ext/redcloth_scan/redcloth_common.c
+	dh_auto_build
+
 override_dh_installdocs:
 	rdoc --inline-source --line-numbers --op rdoc \
 		--main README.rdoc --title "RedCloth" \

-- 
ruby-redcloth.git