[SCM] pluma Debian package branch, master, updated. 913c1accc11dd22790ac00e27f018bc19be8d51e

[Mike Gabriel]

Gitweb-URL: http://git.debian.org/?p=pkg-mate/pluma.git;a=commitdiff;h=913c1ac

The following commit has been merged in the master branch:
commit 913c1accc11dd22790ac00e27f018bc19be8d51e
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Tue Feb 18 13:13:42 2014 +0100

    debian/patches: (a) fix FTBFS, (b) skip building non-DFSG help files
---
 debian/patches/0001_fix-ftbfs-due-to-gettext.patch      | 13 +++++++++++++
 debian/patches/2001_omit-gfdl-licensed-help-files.patch |  2 +-
 debian/patches/series                                   |  1 +
 3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/debian/patches/0001_fix-ftbfs-due-to-gettext.patch b/debian/patches/0001_fix-ftbfs-due-to-gettext.patch
new file mode 100644
index 0000000..e8b5088
--- /dev/null
+++ b/debian/patches/0001_fix-ftbfs-due-to-gettext.patch
@@ -0,0 +1,13 @@
+Description: Fix FTBFS due to a non-copied po/Makefile.in.in
+Author: Stefano Karapetsas <stefano at karapetsas.com>
+Origin: http://git.mate-desktop.org/pluma/commit/?id=f9933b9afdf50f311b48749fd4b6f88323f2266
+--- a/configure.ac
++++ b/configure.ac
+@@ -157,7 +157,6 @@
+ IT_PROG_INTLTOOL([0.40.0])
+ GETTEXT_PACKAGE=pluma
+ AC_SUBST([GETTEXT_PACKAGE])
+-AM_GNU_GETTEXT_VERSION([0.17])
+ AM_GLIB_GNU_GETTEXT
+ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Define to the Gettext package name])
+ 
diff --git a/debian/patches/2001_omit-gfdl-licensed-help-files.patch b/debian/patches/2001_omit-gfdl-licensed-help-files.patch
index eef5b35..8512887 100644
--- a/debian/patches/2001_omit-gfdl-licensed-help-files.patch
+++ b/debian/patches/2001_omit-gfdl-licensed-help-files.patch
@@ -15,7 +15,7 @@ Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
  EXTRA_DIST = 			\
 --- a/configure.ac
 +++ b/configure.ac
-@@ -524,7 +524,6 @@
+@@ -523,7 +523,6 @@
  pluma/smclient/Makefile
  pluma/osx/Makefile
  pluma/Makefile
diff --git a/debian/patches/series b/debian/patches/series
index 83b110e..f44f40e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
+0001_fix-ftbfs-due-to-gettext.patch
 2001_omit-gfdl-licensed-help-files.patch

-- 
pluma Debian package