Run msgmerge with --previous. (This requires gettext >= 0.16)

diff --git a/ChangeLog b/ChangeLog
index 4773f9a1fcea7103f98ae05215d085709628775a..2304b79096804c6f01ff631cb64b5ec95b6d239f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-05-25  Nicolas François  <nicolas.francois@centraliens.net>
+
+       * po/Makevars, man/po/Makefile.in.in: Run msgmerge with
+       --previous. (This requires gettext >= 0.16)
+
 2008-05-24  Nicolas François  <nicolas.francois@centraliens.net>
 
        * libmisc/copydir.c (remove_tree): As we always use remove_tree

diff --git a/man/po/Makefile.in.in b/man/po/Makefile.in.in
index 49cbe183a3c92df0f5002bba97c0ec76e31084ee..9de17f05be302ef61fced8b4a14752a6142ec177 100644 (file)
--- a/man/po/Makefile.in.in
+++ b/man/po/Makefile.in.in
@@ -31,7 +31,7 @@ XGETTEXT_no = @XGETTEXT@
 XGETTEXT_yes = @XGETTEXT_015@
 XGETTEXT = $(XGETTEXT_$(USE_MSGCTXT))
 MSGMERGE = msgmerge --previous
-MSGMERGE_UPDATE = @MSGMERGE@ --update
+MSGMERGE_UPDATE = @MSGMERGE@ --update --previous
 MSGINIT = msginit
 MSGCONV = msgconv
 MSGFILTER = msgfilter

diff --git a/po/Makevars b/po/Makevars
index 0cc560750faa4a64d507ba009fc9367358e28881..c2b35f88bed4eaf4c985228df89b491773ecb5df 100644 (file)
--- a/po/Makevars
+++ b/po/Makevars
@@ -25,3 +25,7 @@ COPYRIGHT_HOLDER = Free Software Foundation, Inc.
 EXTRA_LOCALE_CATEGORIES =
 
 MSGID_BUGS_ADDRESS = pkg-shadow-devel@lists.alioth.debian.org
+
+MSGMERGE += --previous
+MSGMERGE_UPDATE += --previous
+