Bug#318875: udpkg: Should merge translations by default

[Petter Reinholdtsen <pere@hungry.com>]

Package: udpkg
Version: 1.01
Tags: patch

It would be great if d-i was able to handle extra translations
provided in udebs, to make it possible to add translations to udebs
after they are released.  To make this possible, I believe udpkg need
to use the --merge argument to debconf-loadtemplate when installing
udebs.

Here is an untested patch to make this happen.  I've not commited it
as it is not tested, and I lack a test framework for d-i at the
moment.

Index: debian/changelog
===================================================================
--- debian/changelog	(revisjon 29315)
+++ debian/changelog	(arbeidskopi)
@@ -7,6 +7,9 @@
   [Petter Reinholdtsen]
   * Remove myself as uploaders.  Leaving this package to others in the
     debian-boot team.
+  * Use --merge by default when calling debconf-loadtemplate, to
+    make it possible to append new translations to d-i by providing
+    udebs with only the new translations in them.
 
  -- Colin Watson <cjwatson@debian.org>  Mon, 11 Jul 2005 18:24:12 +0100
 
Index: udpkg.c
===================================================================
--- udpkg.c	(revisjon 29314)
+++ udpkg.c	(arbeidskopi)
@@ -173,7 +173,7 @@
 					di_exec_shell_log(buf);
 					
 					snprintf(buf, sizeof(buf),
-						 "debconf-loadtemplate %s %s",
+						 "debconf-loadtemplate --merge %s %s",
 						 pkg->package, buf2);
 					if (di_exec_shell_log(buf) != 0)
 						r = 1;