The following commit has been merged in the master branch:
commit b28bda38587833a486fb10566890f70269f5b48d
Author: Guillem Jover <guil...@debian.org>
Date: Tue May 18 23:14:03 2010 +0200
build: Pass --previous to msgmerge with the new MSGMERGE_OPTIONS variable
This new options got introduced in gettext 0.18, and helps significantly
translators' work.
diff --git a/dselect/po/Makevars b/dselect/po/Makevars
index e5d0592..fe58a32 100644
--- a/dselect/po/Makevars
+++ b/dselect/po/Makevars
@@ -10,6 +10,8 @@ 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
diff --git a/po/Makevars b/po/Makevars
index da67f5c..f929a0b 100644
--- a/po/Makevars
+++ b/po/Makevars
@@ -10,6 +10,8 @@ top_builddir = ..
# These options get passed to xgettext.
XGETTEXT_OPTIONS = --keyword=_ --keyword=N_ --keyword=_g --from-code=UTF-8
+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
diff --git a/scripts/po/Makevars b/scripts/po/Makevars
index 18febc6..a4cebad 100644
--- a/scripts/po/Makevars
+++ b/scripts/po/Makevars
@@ -10,6 +10,8 @@ top_builddir = ../..
# These options get passed to xgettext.
XGETTEXT_OPTIONS = --from-code=iso-8859-1 --keyword=_g
+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
--
dpkg's main repository
--
To UNSUBSCRIBE, email to debian-dpkg-cvs-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
