[jhbuild/jjardon/autotools: 1/3] Use upstream gettext instead intltool

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

commit 2856150242d2168144533308d77061404ebc7f3a
Author: Javier Jardón <jjardon gnome org>
Date:   Fri Aug 30 00:23:59 2013 +0100

    Use upstream gettext instead intltool

 Makefile.am                                      |   19 +---------
 autogen.sh                                       |    1 -
 configure.ac                                     |    5 ++-
 examples/Makefile.am                             |   11 +-----
 examples/{jhbuild.desktop.in => jhbuild.desktop} |    4 +-
 jhbuild.desktop.in.in => jhbuild.desktop.in      |    4 +-
 po/Makevars                                      |   43 ++++++++++++++++++++--
 po/POTFILES.in                                   |    1 -
 8 files changed, 51 insertions(+), 37 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 4c506da..d13ffc5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -12,28 +12,13 @@ DTDS = \
        $(NULL)
 
 desktopdir = $(datadir)/applications
-desktop_in_files = jhbuild.desktop.in
-desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
-
- INTLTOOL_DESKTOP_RULE@
-
-INTLTOOL =                     \
-       intltool-extract.in     \
-       intltool-merge.in       \
-       intltool-update.in
+desktop_DATA = jhbuild.desktop
 
 EXTRA_DIST = $(PATCHES) $(MODULESETS) $(DTDS) \
        modulesets/moduleset.xsl \
        install-check.c \
        autogen.sh \
-       $(desktop_in_files) $(INTLTOOL)
-
-DISTCLEANFILES =               \
-       intltool-extract        \
-       intltool-merge          \
-       intltool-update
-
-CLEANFILES = \
+       build-aux/config.rpath \
        $(desktop_DATA)
 
 bin_PROGRAMS = install-check
diff --git a/autogen.sh b/autogen.sh
index 67de110..de9d409 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -158,7 +158,6 @@ configure_with_autotools()
   export PKG_NAME
   REQUIRED_AUTOCONF_VERSION=2.57 \
   REQUIRED_AUTOMAKE_VERSION=1.8 \
-  REQUIRED_INTLTOOL_VERSION=0.35.0 \
   REQUIRED_PKG_CONFIG_VERSION=0.16.0 \
   gnome-autogen.sh $@
 }
diff --git a/configure.ac b/configure.ac
index e7cec09..f81a683 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.18])
 
 GETTEXT_PACKAGE=AC_PACKAGE_TARNAME
 AC_SUBST([GETTEXT_PACKAGE])
@@ -40,7 +41,7 @@ AC_CONFIG_FILES([
        examples/Makefile
        scripts/Makefile
        triggers/Makefile
-       jhbuild.desktop.in
+       jhbuild.desktop
        jhbuild/Makefile
        jhbuild/buildbot/Makefile
        jhbuild/buildbot/status/web/Makefile
diff --git a/examples/Makefile.am b/examples/Makefile.am
index 1262e49..a4db6b4 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -1,10 +1,3 @@
+noinst_DATA = jhbuild.desktop
 
-xsession_in_files = jhbuild.desktop.in
-noinst_DATA = $(xsession_in_files:.desktop.in=.desktop)
-
-EXTRA_DIST = jhbuild.desktop.in
-
-DISTCLEANFILES = jhbuild.desktop
-
- INTLTOOL_DESKTOP_RULE@
-
+EXTRA_DIST = jhbuild.desktop
diff --git a/examples/jhbuild.desktop.in b/examples/jhbuild.desktop
similarity index 75%
rename from examples/jhbuild.desktop.in
rename to examples/jhbuild.desktop
index 69d06ff..5b01d0e 100644
--- a/examples/jhbuild.desktop.in
+++ b/examples/jhbuild.desktop
@@ -1,8 +1,8 @@
 [Desktop Entry]
 # Install this into /usr/share/xsessions
 Encoding=UTF-8
-_Name=jhbuild
-_Comment=This session logs you into jhbuild GNOME
+Name=jhbuild
+Comment=This session logs you into jhbuild GNOME
 Exec=jhbuild-session
 TryExec=jhbuild-session
 # no icon yet, only the top three are currently used
diff --git a/jhbuild.desktop.in.in b/jhbuild.desktop.in
similarity index 84%
rename from jhbuild.desktop.in.in
rename to jhbuild.desktop.in
index 8af766d..36a5265 100644
--- a/jhbuild.desktop.in.in
+++ b/jhbuild.desktop.in
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Application
-_Name=GNOME Build Tool
-_Comment=Build GNOME modules
+Name=GNOME Build Tool
+Comment=Build GNOME modules
 Exec=jhbuild gui
 Categories=GNOME;Development;Building;
 Icon=applications-development
diff --git a/po/Makevars b/po/Makevars
index f6d0033..32692ab 100644
--- a/po/Makevars
+++ b/po/Makevars
@@ -1,4 +1,41 @@
-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 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 =
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 9f1820b..d0cdc82 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -20,7 +20,6 @@ jhbuild/commands/tinderbox.py
 jhbuild/commands/twoninetynine.py
 jhbuild/commands/uninstall.py
 jhbuild/config.py
-jhbuild.desktop.in.in
 jhbuild/frontends/autobuild.py
 jhbuild/frontends/buildscript.py
 jhbuild/frontends/gtkui.py