[jhbuild] Use upstream gettext instead intltool

[Javier Jardón Cabezas <jjardon src gnome org>]

commit 7108a86523e9aaf18676481288b8ccdfaba2ae7f
Author: Javier Jardón <jjardon gnome org>
Date:   Wed Jan 6 15:35:55 2016 +0000

    Use upstream gettext instead intltool
    
    https://bugzilla.gnome.org/show_bug.cgi?id=760226

 .gitignore           |    4 --
 Makefile.am          |   23 ++++++--------
 configure.ac         |    3 +-
 examples/Makefile.am |   10 +++---
 po/Makevars          |   80 ++++++++++++++++++++++++++++++++++++++++++++++++--
 5 files changed, 94 insertions(+), 26 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index a434114..a46c099 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,9 +22,6 @@ mo/
 /examples/jhbuild.desktop
 /gnome-doc-utils.make
 /install-sh
-/intltool-extract.in
-/intltool-merge.in
-/intltool-update.in
 /jhbuild.desktop
 /jhbuild.desktop.in
 /ltmain.sh
@@ -33,7 +30,6 @@ mo/
 /missing
 /mkinstalldirs
 /po/*.gmo
-/po/.intltool-merge-cache
 /po/Makefile.in.in
 /po/Makevars.template
 /po/POTFILES
diff --git a/Makefile.am b/Makefile.am
index 612007d..b588c1d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -12,29 +12,26 @@ DTDS = \
        $(NULL)
 
 desktopdir = $(datadir)/applications
-desktop_in_files = jhbuild.desktop.in
-desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
+desktop_DATA = jhbuild.desktop
 
- INTLTOOL_DESKTOP_RULE@
+jhbuild.desktop.in: jhbuild.desktop.in.in
+       $(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
 
-INTLTOOL =                     \
-       intltool-extract.in     \
-       intltool-merge.in       \
-       intltool-update.in
+# Substitute variables in a Desktop Entry file.
+jhbuild.desktop: jhbuild.desktop.in
+       $(AM_V_GEN) sed -e 's|@bindir[ ]|$(bindir)|g' $< > $@
 
 EXTRA_DIST = $(PATCHES) $(MODULESETS) $(DTDS) \
        modulesets/moduleset.xsl \
        autogen.sh \
-       $(desktop_in_files) $(INTLTOOL)
-
-DISTCLEANFILES =               \
-       intltool-extract        \
-       intltool-merge          \
-       intltool-update
+       jhbuild.desktop.in.in jhbuild.desktop.in
 
 CLEANFILES = \
        $(desktop_DATA)
 
+MAINTAINERCLEANFILES = \
+       jhbuild.desktop.in
+
 install-exec-local:
        $(srcdir)/scripts/debian-python2-postinstall-hook.sh $(DESTDIR)$(bindir)
 
diff --git a/configure.ac b/configure.ac
index e7cec09..08078a0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -17,7 +17,8 @@ AM_PATH_PYTHON
 PKG_PROG_PKG_CONFIG
 
 # i18n
-IT_PROG_INTLTOOL([0.40.0])
+AM_GNU_GETTEXT([external])
+AM_GNU_GETTEXT_VERSION([0.19])
 
 GETTEXT_PACKAGE=AC_PACKAGE_TARNAME
 AC_SUBST([GETTEXT_PACKAGE])
diff --git a/examples/Makefile.am b/examples/Makefile.am
index 1262e49..fef249c 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -1,10 +1,10 @@
+noinst_DATA = jhbuild.desktop
 
-xsession_in_files = jhbuild.desktop.in
-noinst_DATA = $(xsession_in_files:.desktop.in=.desktop)
+jhbuild.desktop: jhbuild.desktop.in
+       $(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
+
+CLEANFILES = $(desktop_DATA)
 
 EXTRA_DIST = jhbuild.desktop.in
 
 DISTCLEANFILES = jhbuild.desktop
-
- INTLTOOL_DESKTOP_RULE@
-
diff --git a/po/Makevars b/po/Makevars
index f6d0033..579ebd1 100644
--- a/po/Makevars
+++ b/po/Makevars
@@ -1,4 +1,78 @@
-top_builddir=..
-top_srcdir=..
+# Makefile variables for PO directory in any package using GNU gettext.
 
-DOMAIN=jhbuild
+# Usually the message domain is the same as the package name.
+DOMAIN = $(PACKAGE)
+
+# These two variables depend on the location of this directory.
+subdir = po
+top_builddir = ..
+
+# These options get passed to xgettext.
+XGETTEXT_OPTIONS = --keyword=_ --keyword=N_
+
+# 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
+# package.  (Note that the msgstr strings, extracted from the package's
+# sources, belong to the copyright holder of the package.)  Translators are
+# expected to transfer the copyright for their translations to this person
+# or entity, or to disclaim their copyright.  The empty string stands for
+# the public domain; in this case the translators are expected to disclaim
+# their copyright.
+COPYRIGHT_HOLDER = Free Software Foundation, Inc.
+
+# This tells whether or not to prepend "GNU " prefix to the package
+# name that gets inserted into the header of the $(DOMAIN).pot file.
+# Possible values are "yes", "no", or empty.  If it is empty, try to
+# detect it automatically by scanning the files in $(top_srcdir) for
+# "GNU packagename" string.
+PACKAGE_GNU =
+
+# This is the email address or URL to which the translators shall report
+# bugs in the untranslated strings:
+# - Strings which are not entire sentences, see the maintainer guidelines
+#   in the GNU gettext documentation, section 'Preparing Strings'.
+# - Strings which use unclear terms or require additional context to be
+#   understood.
+# - Strings which make invalid assumptions about notation of date, time or
+#   money.
+# - Pluralisation problems.
+# - Incorrect English spelling.
+# - Incorrect formatting.
+# It can be your email address, or a mailing list address where translators
+# can write to without being subscribed, or the URL of a web page through
+# which the translators can contact you.
+MSGID_BUGS_ADDRESS =
+
+# This is the list of locale categories, beyond LC_MESSAGES, for which the
+# message catalogs shall be used.  It is usually empty.
+EXTRA_LOCALE_CATEGORIES =
+
+# This tells whether the $(DOMAIN).pot file contains messages with an 'msgctxt'
+# context.  Possible values are "yes" and "no".  Set this to yes if the
+# package uses functions taking also a message context, like pgettext(), or
+# if in $(XGETTEXT_OPTIONS) you define keywords with a context argument.
+USE_MSGCTXT = no
+
+# These options get passed to msgmerge.
+# Useful options are in particular:
+#   --previous            to keep previous msgids of translated messages,
+#   --quiet               to reduce the verbosity.
+MSGMERGE_OPTIONS =
+
+# These options get passed to msginit.
+# If you want to disable line wrapping when writing PO files, add
+# --no-wrap to MSGMERGE_OPTIONS, XGETTEXT_OPTIONS, and
+# MSGINIT_OPTIONS.
+MSGINIT_OPTIONS =
+
+# This tells whether or not to regenerate a PO file when $(DOMAIN).pot
+# has changed.  Possible values are "yes" and "no".  Set this to no if
+# the POT file is checked in the repository and the version control
+# program ignores timestamps.
+PO_DEPENDS_ON_POT = no
+
+# This tells whether or not to forcibly update $(DOMAIN).pot and
+# regenerate PO files on "make dist".  Possible values are "yes" and
+# "no".  Set this to no if the POT file and PO files are maintained
+# externally.
+DIST_DEPENDS_ON_UPDATE_PO = no