[giggle] Do not depend on intltool: Use upstream gettext instead

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

commit 1873274a2fed1e307e31004055f05064685e7afe
Author: Javier Jardón <jjardon gnome org>
Date:   Tue Jul 30 00:31:14 2013 +0100

    Do not depend on intltool: Use upstream gettext instead
    
    gettext recently added GtkBuilder format support, so no need
    on depend on intltool anymore

 autogen.sh                                         |   11 +----
 configure.ac                                       |    4 +-
 data/Makefile.am                                   |    8 +--
 data/{giggle.desktop.in => giggle.desktop}         |    3 +-
 plugins/Makefile.am                                |    6 +-
 plugins/{hello-world.xml => hello-world.ui}        |    0
 .../{personal-details.xml => personal-details.ui}  |    0
 plugins/{terminal-view.xml => terminal-view.ui}    |    0
 po/Makevars                                        |   53 ++++++++++++++++++++
 po/POTFILES.in                                     |    9 ++--
 10 files changed, 65 insertions(+), 29 deletions(-)
---
diff --git a/autogen.sh b/autogen.sh
index 69c883f..81b082d 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -13,12 +13,6 @@ if test -z $AUTORECONF; then
         exit 1
 fi
 
-INTLTOOLIZE=`which intltoolize`
-if test -z $INTLTOOLIZE; then
-        echo "*** No intltoolize found, please install the intltool package ***"
-        exit 1
-fi
-
 GNOMEDOC=`which yelp-build`
 if test -z $GNOMEDOC; then
         echo "*** The tools to build the documentation are not found,"
@@ -26,10 +20,7 @@ if test -z $GNOMEDOC; then
         exit 1
 fi
 
-mkdir -p build-aux
-
-autopoint --force
-AUTOPOINT='intltoolize --automake --copy' autoreconf --force --install --verbose
+autoreconf --force --install --verbose
 
 cd $olddir
 test -n "$NOCONFIGURE" || "$srcdir/configure" "$@"
diff --git a/configure.ac b/configure.ac
index e4b8460..249c6bf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -138,9 +138,7 @@ AC_RUN_IFELSE(
 dnl  ------------------
 dnl | Language Support |---------------------------------------
 dnl  ------------------
-IT_PROG_INTLTOOL([0.41.0])
-
-AM_GNU_GETTEXT_VERSION([0.18.1])
+AM_GNU_GETTEXT_VERSION([0.18.3])
 AM_GNU_GETTEXT([external])
 
 AC_SUBST([GETTEXT_PACKAGE], [giggle])
diff --git a/data/Makefile.am b/data/Makefile.am
index b1a105c..fd13cec 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -2,11 +2,7 @@ gladedir = $(datadir)/giggle/glade
 dist_glade_DATA = \
        main-window.ui
 
-desktop_in_data=giggle.desktop.in
-desktop_DATA=$(desktop_in_data:.desktop.in=.desktop)
+desktop_DATA=giggle.desktop
 desktopdir=$(datadir)/applications
- INTLTOOL_DESKTOP_RULE@
 
-CLEANFILES=$(desktop_DATA)
-
-EXTRA_DIST=giggle.desktop.in
+EXTRA_DIST=$(desktop_DATA)
diff --git a/data/giggle.desktop.in b/data/giggle.desktop
similarity index 78%
rename from data/giggle.desktop.in
rename to data/giggle.desktop
index 7606f9b..4ff2da8 100644
--- a/data/giggle.desktop.in
+++ b/data/giggle.desktop
@@ -1,8 +1,7 @@
 [Desktop Entry]
 Version=1.0
 Type=Application
-_Name=Giggle
-_Comment=Git repository viewer
+Name=Giggle
 Exec=giggle %F
 Icon=giggle
 StartupNotify=true
diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index ae09bda..8808839 100644
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -17,12 +17,12 @@ AM_LDFLAGS = \
 plugin_LTLIBRARIES = \
        libpersonal-details.la
 dist_plugin_DATA = \
-       personal-details.xml
+       personal-details.ui
 
 noinst_LTLIBRARIES = \
        libhello-world.la
 dist_noinst_DATA = \
-       hello-world.xml     
+       hello-world.ui
 
 libhello_world_la_SOURCES = \
        giggle-hello-world-plugin.c
@@ -46,7 +46,7 @@ if USE_VTE
 plugin_LTLIBRARIES += \
        libterminal-view.la
 dist_plugin_DATA += \
-       terminal-view.xml
+       terminal-view.ui
 libterminal_view_la_SOURCES = \
        giggle-view-terminal-plugin.c \
        giggle-view-terminal.c \
diff --git a/plugins/hello-world.xml b/plugins/hello-world.ui
similarity index 100%
rename from plugins/hello-world.xml
rename to plugins/hello-world.ui
diff --git a/plugins/personal-details.xml b/plugins/personal-details.ui
similarity index 100%
rename from plugins/personal-details.xml
rename to plugins/personal-details.ui
diff --git a/plugins/terminal-view.xml b/plugins/terminal-view.ui
similarity index 100%
rename from plugins/terminal-view.xml
rename to plugins/terminal-view.ui
diff --git a/po/Makevars b/po/Makevars
new file mode 100644
index 0000000..b603fcd
--- /dev/null
+++ b/po/Makevars
@@ -0,0 +1,53 @@
+# Makefile variables for PO directory in any package using GNU gettext.
+
+# 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_ --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
+# 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 =
+
+# 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 =
diff --git a/po/POTFILES.in b/po/POTFILES.in
index c6946da..cd144ea 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,11 +1,10 @@
-data/giggle.desktop.in
-[type: gettext/glade]data/main-window.ui
+data/main-window.ui
 libgiggle/giggle-plugin.c
-[type: gettext/glade]plugins/hello-world.xml
+plugins/hello-world.ui
 plugins/giggle-personal-details-window.c
 plugins/giggle-view-terminal.c
-[type: gettext/glade]plugins/personal-details.xml
-[type: gettext/glade]plugins/terminal-view.xml
+plugins/personal-details.ui
+plugins/terminal-view.ui
 src/eggfindbar.c
 src/giggle-authors-view.c
 src/giggle-branches-view.c