[DRE-commits] [SCM] rbot.git branch, master, updated. debian/0.9.15+post20100705+gitb3aa806-3-16-g84dbc44

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

The following commit has been merged in the master branch:
commit 03ff6a74b5f7780a12b4eca020ae32409c7e8418
Author: Marc Dequènes (Duck) <Duck at DuckCorp.org>
Date:   Wed Jun 26 16:04:21 2013 +0200

    [fix] updated rakefile to handle recent ruby-gettext (was FTBFS)

diff --git a/debian/changelog b/debian/changelog
index 3246c44..2343f18 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,7 @@ rbot (0.9.15+post20100705+gitb3aa806-4) UNRELEASED; urgency=low
 
   [ Marc Dequènes (Duck) ]
   * Updated documentation build rule to use current rdoc parameters.
+  * Patched buildsys to work with recent ruby-gettext.
 
  -- Christian Hofstaedtler <christian at hofstaedtler.name>  Mon, 06 May 2013 16:10:46 +0200
 
diff --git a/debian/patches/buildsys_recent_gettext b/debian/patches/buildsys_recent_gettext
new file mode 100644
index 0000000..75acf01
--- /dev/null
+++ b/debian/patches/buildsys_recent_gettext
@@ -0,0 +1,42 @@
+Index: rbot/Rakefile
+===================================================================
+--- rbot.orig/Rakefile	2013-06-26 15:40:20.684877578 +0200
++++ rbot/Rakefile	2013-06-26 15:59:38.257906086 +0200
+@@ -40,7 +40,7 @@
+ task :define_po_rules do
+   # generate pot file from rb files
+   rgettext_proc = proc do |t|
+-    require 'gettext/utils'
++    require 'gettext/tools'
+     source_files, pot_file = t.prerequisites, t.name
+     new_pot_file = "#{pot_file}.new"
+     puts "#{source_files.join(', ')} => #{pot_file}"
+@@ -72,7 +72,7 @@
+ 
+   # update po file from pot file
+   msgmerge_proc = proc do |t|
+-    require 'gettext/utils'
++    require 'gettext/tools'
+     po_file, pot_file = t.name, t.source
+     puts "#{pot_file} => #{po_file}"
+     if File.exists? po_file
+@@ -112,8 +112,8 @@
+ }) do |t|
+   po_file, mo_file = t.source, t.name
+   puts "#{po_file} => #{mo_file}"
+-  require 'gettext/utils'
+-  GetText.rmsgfmt po_file, mo_file
++  require 'gettext/tools'
++  GetText::Tools::MsgFmt.run(po_file, "-o", mo_file)
+ end
+ 
+ task :check_po_tools do
+@@ -171,7 +171,7 @@
+ # to make installation not fail because of lack of ruby-gettext
+ task :buildext do
+   begin
+-    require 'gettext/utils'
++    require 'gettext/tools'
+     Rake::Task[:makemo].invoke
+   rescue LoadError
+     warn 'Ruby-gettext cannot be located, so mo files cannot be built and installed' 
diff --git a/debian/patches/series b/debian/patches/series
index a2e2be3..d7df1e0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 buildsys_no_rubygems
 spell_module_use_aspell_not_ispell
+buildsys_recent_gettext

-- 
rbot.git