diff -Nru bluefish-2.2.6/debian/changelog bluefish-2.2.6/debian/changelog --- bluefish-2.2.6/debian/changelog 2014-05-10 21:13:42.000000000 +0000 +++ bluefish-2.2.6/debian/changelog 2014-11-15 16:58:43.000000000 +0000 @@ -1,3 +1,12 @@ +bluefish (2.2.6-1+rpi1) jessie-staging; urgency=medium + + * change GETTEXT_MACRO_VERSION to 0.19 to fix FTBFS with new gettext + patch taken from post to + https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=759935 + by Brahadambal Srinivasan + + -- Peter Michael Green Sat, 15 Nov 2014 16:58:31 +0000 + bluefish (2.2.6-1) unstable; urgency=medium * New upstream release. diff -Nru bluefish-2.2.6/debian/patches/gettext.patch bluefish-2.2.6/debian/patches/gettext.patch --- bluefish-2.2.6/debian/patches/gettext.patch 1970-01-01 00:00:00.000000000 +0000 +++ bluefish-2.2.6/debian/patches/gettext.patch 2014-11-15 16:57:07.000000000 +0000 @@ -0,0 +1,80 @@ +Taken from https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=759935 +The patch was originally called bluefish-ppc64le.patch but it's not actually +ppc64el specific. +--- bluefish-2.2.6.orig/src/plugin_about/po/Makefile.in.in ++++ bluefish-2.2.6/src/plugin_about/po/Makefile.in.in +@@ -9,7 +9,7 @@ + # General Public License and is *not* in the public domain. + # + # Origin: gettext-0.18 +-GETTEXT_MACRO_VERSION = 0.18 ++GETTEXT_MACRO_VERSION = 0.19 + + PACKAGE = @PACKAGE@ + VERSION = @VERSION@ +--- bluefish-2.2.6.orig/src/plugin_charmap/po/Makefile.in.in ++++ bluefish-2.2.6/src/plugin_charmap/po/Makefile.in.in +@@ -9,7 +9,7 @@ + # General Public License and is *not* in the public domain. + # + # Origin: gettext-0.18 +-GETTEXT_MACRO_VERSION = 0.18 ++GETTEXT_MACRO_VERSION = 0.19 + + PACKAGE = @PACKAGE@ + VERSION = @VERSION@ +--- bluefish-2.2.6.orig/src/plugin_entities/po/Makefile.in.in ++++ bluefish-2.2.6/src/plugin_entities/po/Makefile.in.in +@@ -9,7 +9,7 @@ + # General Public License and is *not* in the public domain. + # + # Origin: gettext-0.18 +-GETTEXT_MACRO_VERSION = 0.18 ++GETTEXT_MACRO_VERSION = 0.19 + + PACKAGE = @PACKAGE@ + VERSION = @VERSION@ +--- bluefish-2.2.6.orig/src/plugin_htmlbar/po/Makefile.in.in ++++ bluefish-2.2.6/src/plugin_htmlbar/po/Makefile.in.in +@@ -9,7 +9,7 @@ + # General Public License and is *not* in the public domain. + # + # Origin: gettext-0.18 +-GETTEXT_MACRO_VERSION = 0.18 ++GETTEXT_MACRO_VERSION = 0.19 + + PACKAGE = @PACKAGE@ + VERSION = @VERSION@ +--- bluefish-2.2.6.orig/src/plugin_infbrowser/po/Makefile.in.in ++++ bluefish-2.2.6/src/plugin_infbrowser/po/Makefile.in.in +@@ -9,7 +9,7 @@ + # General Public License and is *not* in the public domain. + # + # Origin: gettext-0.18 +-GETTEXT_MACRO_VERSION = 0.18 ++GETTEXT_MACRO_VERSION = 0.19 + + PACKAGE = @PACKAGE@ + VERSION = @VERSION@ +--- bluefish-2.2.6.orig/src/plugin_snippets/po/Makefile.in.in ++++ bluefish-2.2.6/src/plugin_snippets/po/Makefile.in.in +@@ -9,7 +9,7 @@ + # General Public License and is *not* in the public domain. + # + # Origin: gettext-0.18 +-GETTEXT_MACRO_VERSION = 0.18 ++GETTEXT_MACRO_VERSION = 0.19 + + PACKAGE = @PACKAGE@ + VERSION = @VERSION@ +--- bluefish-2.2.6.orig/src/plugin_zencoding/po/Makefile.in.in ++++ bluefish-2.2.6/src/plugin_zencoding/po/Makefile.in.in +@@ -9,7 +9,7 @@ + # General Public License and is *not* in the public domain. + # + # Origin: gettext-0.18 +-GETTEXT_MACRO_VERSION = 0.18 ++GETTEXT_MACRO_VERSION = 0.19 + + PACKAGE = @PACKAGE@ + VERSION = @VERSION@ diff -Nru bluefish-2.2.6/debian/patches/series bluefish-2.2.6/debian/patches/series --- bluefish-2.2.6/debian/patches/series 2013-05-09 12:31:02.000000000 +0000 +++ bluefish-2.2.6/debian/patches/series 2014-11-15 16:55:45.000000000 +0000 @@ -0,0 +1 @@ +gettext.patch