build: Bump gettext version to 0.19

This allows us to use the new --add-location option with the file
argument, which will remove a huge amount diff noise on source code
changes, while still retaining the useful origin of the string.

README

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

configure.ac

@@ -14,7 +14,7 @@ AC_USE_SYSTEM_EXTENSIONS
 AM_INIT_AUTOMAKE([1.11 foreign nostdinc no-dist-gzip dist-xz])
 AM_SILENT_RULES([yes])
 
-AM_GNU_GETTEXT_VERSION([0.18.2])
+AM_GNU_GETTEXT_VERSION([0.19])
 AM_GNU_GETTEXT([external])
 DPKG_DIST_CHECK([test "$GMSGFMT" = ":" && test "$USE_NLS" = "yes"],
                 [gettext required when NLS support enabled])

debian/changelog

@@ -41,6 +41,9 @@ dpkg (1.18.0) UNRELEASED; urgency=low
     field is missing.
   * Use dpkg-query instead of dpkg for --search in dpkg-shlibdeps so that
     the subprocesses get the correct admindir. Closes: #775258
+  * Bump gettext version to 0.19:
+    - Use --add-location=file in msgmerge and xgettext commands.
+    - Use --porefs=noline for po4a command.
 
  -- Guillem Jover <guillem@debian.org>  Tue, 09 Dec 2014 23:53:18 +0100
 

debian/control

@@ -10,7 +10,7 @@ Vcs-Browser: https://anonscm.debian.org/cgit/dpkg/dpkg.git
 Vcs-Git: git://anonscm.debian.org/dpkg/dpkg.git
 Standards-Version: 3.9.6
 Build-Depends: debhelper (>= 7), pkg-config, flex,
- gettext (>= 0.18), po4a (>= 0.41),
+ gettext (>= 0.19), po4a (>= 0.41),
  zlib1g-dev, libbz2-dev, liblzma-dev,
  libselinux1-dev (>= 1.28-4) [linux-any],
  libkvm-dev [kfreebsd-any],

dselect/po/Makevars

@@ -8,7 +8,8 @@ subdir = dselect/po
 top_builddir = ../..
 
 # These options get passed to xgettext.
-XGETTEXT_OPTIONS = --from-code=UTF-8 --keyword --keyword=_ --keyword=N_ \
+XGETTEXT_OPTIONS = --from-code=UTF-8 --add-location=file \
+                   --keyword --keyword=_ --keyword=N_ \
                    --keyword=P_:1,2 --keyword=C_:1c,2
 
 # This is the copyright holder that gets inserted into the header of the
@@ -51,6 +52,6 @@ USE_MSGCTXT = yes
 # Useful options are in particular:
 #   --previous            to keep previous msgids of translated messages,
 #   --quiet               to reduce the verbosity.
-MSGMERGE_OPTIONS = --previous --quiet
+MSGMERGE_OPTIONS = --previous --add-location=file --quiet
 
 DISTFILES.extra1 = ChangeLog.old

man/Makefile.am

@@ -74,6 +74,7 @@ PO4A_V_ = $(PO4A_V_@AM_DEFAULT_V@)
 PO4A_V_0 = @echo "  PO4A   $@";
 
 PO4A_OPTS = --previous --srcdir $(srcdir) --destdir $(CURDIR) --no-backups \
+            --porefs noline --msgmerge-opt=--add-location=file \
             --package-name dpkg-man --package-version $(PACKAGE_VERSION) \
             --copyright-holder "$(PACKAGE_COPYRIGHT_HOLDER)" \
             --msgid-bugs-address $(PACKAGE_BUGREPORT)

po/Makevars

@@ -8,7 +8,8 @@ subdir = po
 top_builddir = ..
 
 # These options get passed to xgettext.
-XGETTEXT_OPTIONS = --from-code=UTF-8 --keyword --keyword=_ --keyword=N_ \
+XGETTEXT_OPTIONS = --from-code=UTF-8 --add-location=file \
+                   --keyword --keyword=_ --keyword=N_ \
                    --keyword=P_:1,2 --keyword=C_:1c,2
 
 # This is the copyright holder that gets inserted into the header of the
@@ -51,6 +52,6 @@ USE_MSGCTXT = yes
 # Useful options are in particular:
 #   --previous            to keep previous msgids of translated messages,
 #   --quiet               to reduce the verbosity.
-MSGMERGE_OPTIONS = --previous --quiet
+MSGMERGE_OPTIONS = --previous --add-location=file --quiet
 
 DISTFILES.extra1 = ChangeLog.old

scripts/po/Makevars

@@ -8,7 +8,8 @@ subdir = scripts/po
 top_builddir = ../..
 
 # These options get passed to xgettext.
-XGETTEXT_OPTIONS = --from-code=UTF-8 --keyword --keyword=g_ --keyword=P_:1,2
+XGETTEXT_OPTIONS = --from-code=UTF-8 --add-location=file \
+                   --keyword --keyword=g_ --keyword=P_:1,2
 
 # 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
@@ -50,6 +51,6 @@ USE_MSGCTXT = yes
 # Useful options are in particular:
 #   --previous            to keep previous msgids of translated messages,
 #   --quiet               to reduce the verbosity.
-MSGMERGE_OPTIONS = --previous --quiet
+MSGMERGE_OPTIONS = --previous --add-location=file --quiet
 
 DISTFILES.extra1 = ChangeLog.old