Просмотр исходного кода

build: Bump gettext version to 0.18.2

This gets rid of an autoconf warning due to usage of an obsolete macro
by gettext. The Build-Depends does not need to be bumped as the
Makefiles can work with macros from any gettext 0.18.x.
Guillem Jover лет назад: 13
Родитель
Сommit
e804d8f65d
5 измененных файлов с 38 добавлено и 8 удалено
  1. 1 1
      README
  2. 1 1
      configure.ac
  3. 12 2
      dselect/po/Makevars
  4. 12 2
      po/Makevars
  5. 12 2
      scripts/po/Makevars

+ 1 - 1
README

@@ -44,7 +44,7 @@ some required software needs to be installed:
 
   GNU autoconf >= 2.60
   GNU automake >= 1.8
-  GNU gettext >= 0.18 (or just autopoint if using --disable-nls)
+  GNU gettext >= 0.18.2 (or just autopoint if using --disable-nls)
   flex
 
 After installing the needed software, and running the following command on

+ 1 - 1
configure.ac

@@ -15,7 +15,7 @@ AM_INIT_AUTOMAKE([1.8 foreign nostdinc no-dist-gzip dist-xz])
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])],
                             [AC_SUBST([AM_DEFAULT_VERBOSITY], [1])])
 
-AM_GNU_GETTEXT_VERSION([0.18])
+AM_GNU_GETTEXT_VERSION([0.18.2])
 AM_GNU_GETTEXT([external])
 DPKG_DIST_CHECK([test "$GMSGFMT" = ":" && test "$USE_NLS" = "yes"],
                 [gettext required when NLS support enabled])

+ 12 - 2
dselect/po/Makevars

@@ -10,8 +10,6 @@ top_builddir = ../..
 # These options get passed to xgettext.
 XGETTEXT_OPTIONS = --keyword=_ --keyword=N_
 
-MSGMERGE_OPTIONS = --previous
-
 # 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
@@ -42,4 +40,16 @@ MSGID_BUGS_ADDRESS = $(PACKAGE_BUGREPORT)
 # 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 = yes
+
+# 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 = --previous
+
 DISTFILES.extra1 = ChangeLog.old

+ 12 - 2
po/Makevars

@@ -11,8 +11,6 @@ top_builddir = ..
 XGETTEXT_OPTIONS = --from-code=UTF-8 --keyword=_ --keyword=N_ \
                    --keyword=P_:1,2 --keyword=C_:1c,2
 
-MSGMERGE_OPTIONS = --previous
-
 # 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
@@ -43,4 +41,16 @@ MSGID_BUGS_ADDRESS = $(PACKAGE_BUGREPORT)
 # 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 = yes
+
+# 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 = --previous
+
 DISTFILES.extra1 = ChangeLog.old

+ 12 - 2
scripts/po/Makevars

@@ -10,8 +10,6 @@ top_builddir = ../..
 # These options get passed to xgettext.
 XGETTEXT_OPTIONS = --from-code=iso-8859-1 --keyword=_g --keyword=P_:1,2
 
-MSGMERGE_OPTIONS = --previous
-
 # 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
@@ -42,4 +40,16 @@ MSGID_BUGS_ADDRESS = $(PACKAGE_BUGREPORT)
 # 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 = yes
+
+# 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 = --previous
+
 DISTFILES.extra1 = ChangeLog.old