[Pkg-mozext-commits] [itsalltext] 02/02: Extend FTBFS workaround to Ruby >= 1.9

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository itsalltext.

commit b673a08095a32575e26d3366cf126558a4c16f64
Author: David Prévot <taffit at debian.org>
Date:   Sat Feb 22 18:35:54 2014 -0400

    Extend FTBFS workaround to Ruby >= 1.9
    
    Also handle patch with gbp pq.
    
    Closes: #739774
---
 .../0001-Workaround-FTBFS-in-minimal-chroot.patch  | 38 ++++++++++++++++++++++
 debian/patches/series                              |  2 +-
 debian/patches/utf8.patch                          | 26 ---------------
 3 files changed, 39 insertions(+), 27 deletions(-)

diff --git a/debian/patches/0001-Workaround-FTBFS-in-minimal-chroot.patch b/debian/patches/0001-Workaround-FTBFS-in-minimal-chroot.patch
new file mode 100644
index 0000000..b190eb5
--- /dev/null
+++ b/debian/patches/0001-Workaround-FTBFS-in-minimal-chroot.patch
@@ -0,0 +1,38 @@
+From: =?utf-8?q?David_Pr=C3=A9vot?= <taffit at debian.org>
+Date: Thu, 18 Jul 2013 12:22:25 -0400
+Subject: Workaround FTBFS in minimal chroot
+MIME-Version: 1.0
+Content-Type: text/plain; charset="utf-8"
+Content-Transfer-Encoding: 8bit
+
+rake aborted!
+invalid byte sequence in US-ASCII
+…/Rakefile:51:in `block in load_dtd_entities'
+…/Rakefile:50:in `map'
+…/Rakefile:50:in `load_dtd_entities'
+…/Rakefile:56:in `find_dtd_errors'
+…/Rakefile:103:in `block in diff_locale'
+…/Rakefile:94:in `each'
+…/Rakefile:94:in `diff_locale'
+…/Rakefile:41:in `block (2 levels) in <top (required)>'
+…/Rakefile:41:in `each'
+…/Rakefile:41:in `block in <top (required)>'
+
+Bug-Debian: https://bugs.debian.org/739774
+Forwarded: https://github.com/docwhat/itsalltext/pull/58
+---
+ Rakefile | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/Rakefile b/Rakefile
+index 4d36652..82870b9 100644
+--- a/Rakefile
++++ b/Rakefile
+@@ -1,3 +1,7 @@
++if RUBY_VERSION >= '1.9'
++	Encoding.default_external = Encoding::UTF_8
++	Encoding.default_internal = Encoding::UTF_8
++end
+ require_relative 'version'
+ require 'paint'
+ require 'set'
diff --git a/debian/patches/series b/debian/patches/series
index 58db470..759c248 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1 @@
-utf8.patch
+0001-Workaround-FTBFS-in-minimal-chroot.patch
diff --git a/debian/patches/utf8.patch b/debian/patches/utf8.patch
deleted file mode 100644
index bf7f5d9..0000000
--- a/debian/patches/utf8.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Description: Workaround FTBFS in minimal chroot
- rake aborted!
- invalid byte sequence in US-ASCII
- /tmp/buildd/itsalltext-1.8.1/Rakefile:51:in `block in load_dtd_entities'
- /tmp/buildd/itsalltext-1.8.1/Rakefile:50:in `map'
- /tmp/buildd/itsalltext-1.8.1/Rakefile:50:in `load_dtd_entities'
- /tmp/buildd/itsalltext-1.8.1/Rakefile:56:in `find_dtd_errors'
- /tmp/buildd/itsalltext-1.8.1/Rakefile:103:in `block in diff_locale'
- /tmp/buildd/itsalltext-1.8.1/Rakefile:94:in `each'
- /tmp/buildd/itsalltext-1.8.1/Rakefile:94:in `diff_locale'
- /tmp/buildd/itsalltext-1.8.1/Rakefile:41:in `block (2 levels) in <top (required)>'
- /tmp/buildd/itsalltext-1.8.1/Rakefile:41:in `each'
- /tmp/buildd/itsalltext-1.8.1/Rakefile:41:in `block in <top (required)>'
-Author: David Prévot <taffit at debian.org>
-Forwarded: no
-Last-Update: 2013-07-18
---- a/Rakefile
-+++ b/Rakefile
-@@ -1,3 +1,7 @@
-+if RUBY_VERSION =~ /1.9/
-+	Encoding.default_external = Encoding::UTF_8
-+	Encoding.default_internal = Encoding::UTF_8
-+end
- require_relative 'version'
- require 'paint'
- require 'set'

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/itsalltext.git