[Pkg-privacy-commits] [nautilus-wipe] 06/20: Switch (back) to AM_GNU_GETTEXT

[Intrigeri]

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

intrigeri pushed a commit to branch experimental
in repository nautilus-wipe.

commit 32a5e3b24713dc6e37517713514e9bcca908dbc2
Author: Colomban Wendling <ban at herbesfolles.org>
Date:   Sat Jul 9 02:28:12 2016 +0200

    Switch (back) to AM_GNU_GETTEXT
    
    I don't remember why ec28f21e32119b7e27f7fb2a7f62ceac5e11c54 switched
    away from it in, but AM_GLIB_GNU_GETTEXT is mostly deprecated and
    AM_GNU_GETTEXT does all we need.
---
 .gitignore   |  5 +++++
 autogen.sh   |  2 --
 configure.ac |  4 ++--
 po/Makevars  | 41 +++++++++++++++++++++++++++++++++++++++++
 4 files changed, 48 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 20d41db..6f4be78 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,4 +15,9 @@ build/
 
 po/Makefile.in.in
 po/POTFILES
+po/Makevars.template
+po/Rules-quot
 po/*.gmo
+po/*.header
+po/*.sed
+po/*.sin
diff --git a/autogen.sh b/autogen.sh
index d1524b6..a29cb61 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -3,8 +3,6 @@
 mkdir -p build/aux                    || exit 1
 mkdir -p build/m4                     || exit 1
 #gtkdocize --flavour no-tmpl || exit 1
-echo "no" | glib-gettextize -f -c     || exit 1
-intltoolize -c -f --automake          || exit 1
 autoreconf -vfi                       || exit 1
 
 #~ ./configure "$@"
diff --git a/configure.ac b/configure.ac
index 7d20dda..1cba2f0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -15,7 +15,6 @@ LT_PREREQ([2.2.6])
 LT_INIT([disable-static])
 AC_PROG_CC
 AM_PROG_CC_C_O
-IT_PROG_INTLTOOL
 PKG_PROG_PKG_CONFIG([0.9])
 
 YELP_HELP_INIT
@@ -76,7 +75,8 @@ GETTEXT_PACKAGE="${PACKAGE}"
 AC_SUBST([GETTEXT_PACKAGE])
 AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE], ["${GETTEXT_PACKAGE}"], [GNU gettext package])
 
-AM_GLIB_GNU_GETTEXT
+AM_GNU_GETTEXT_VERSION([0.17])
+AM_GNU_GETTEXT([external])
 
 # Checks for header files.
 
diff --git a/po/Makevars b/po/Makevars
new file mode 100644
index 0000000..86f403b
--- /dev/null
+++ b/po/Makevars
@@ -0,0 +1,41 @@
+# 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_ --keyword=g_dngettext:2,3
+
+# 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 = Colomban Wendling <ban at herbesfolles.org>
+
+# 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 = $(PACKAGE_BUGREPORT)
+
+# 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 =

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/nautilus-wipe.git