[giac] 02/05: Fix generating */giac.mo files

[Ximin Luo]

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

infinity0 pushed a commit to branch master
in repository giac.

commit caba9d69e6b69e5a0f88cb1df13a0cb441f59492
Author: Ximin Luo <infinity0 at debian.org>
Date:   Tue Jun 27 12:32:40 2017 +0200

    Fix generating */giac.mo files
---
 debian/copyright                         |  1 +
 debian/patches/fix-gettext-options.patch | 11 +++++++++++
 debian/patches/series                    |  1 +
 debian/rules                             |  2 ++
 4 files changed, 15 insertions(+)

diff --git a/debian/copyright b/debian/copyright
index 55d732e..fbab285 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -17,6 +17,7 @@ Files-Excluded:
  configure config.guess config.sub config.h.* config/* aclocal.m4 m4/* */Makefile.in
  po/Makefile.in.in
  po/*.gmo
+ po/*.pot
  intl/*
  src/mk*
  mkdebian mkdebian2 debian debianold
diff --git a/debian/patches/fix-gettext-options.patch b/debian/patches/fix-gettext-options.patch
new file mode 100644
index 0000000..470fdbc
--- /dev/null
+++ b/debian/patches/fix-gettext-options.patch
@@ -0,0 +1,11 @@
+--- a/po/Makevars
++++ b/po/Makevars
+@@ -8,7 +8,7 @@
+ top_builddir = ..
+ 
+ # These options get passed to xgettext.
+-XGETTEXT_OPTIONS = --keyword=_ --keyword=N_
++XGETTEXT_OPTIONS = --keyword=_ --keyword=N_ --from-code=UTF-8
+ 
+ # This is the copyright holder that gets inserted into the header of the
+ # $(DOMAIN).pot file.  Set this to the copyright holder of the surrounding
diff --git a/debian/patches/series b/debian/patches/series
index ac405ee..557aa28 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,5 @@
 # For upstreaming
+fix-gettext-options.patch
 no-useless-deps.patch
 system-gl2ps.patch
 missing-build-rules.patch
diff --git a/debian/rules b/debian/rules
index 4e05af8..e2ce319 100755
--- a/debian/rules
+++ b/debian/rules
@@ -26,6 +26,8 @@ override_dh_autoreconf:
 # Deal with french documentation
 	cp -a debian/upstream-doc-fr doc/fr
 	mv doc/fr/Makefile.am.Debian doc/fr/Makefile.am
+# TODO: rm on next upstream import
+	$(RM) po/giac.pot
 # Actually configure
 	dh_autoreconf
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/giac.git