Package: ucf
Version: 3.002
Severity: important
Tags: patch

For "keep current" and "threeway merge", ucf expects answers from
debconf which differ from what is specified in the template master. I
assumed that the template master is more up-to-date than ucf itself, so
the attached patch changes the expected answers in ucf and not the
template.

-- System Information:
Debian Release: lenny/sid
  APT prefers unstable
  APT policy: (500, 'unstable')
Architecture: amd64 (x86_64)

Kernel: Linux 2.6.22 (SMP w/2 CPU cores)
Locale: LANG=de_DE.UTF-8, LC_CTYPE=de_DE.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

Versions of packages ucf depends on:
ii  coreutils                     5.97-5.4   The GNU core utilities
ii  debconf [debconf-2.0]         1.5.14     Debian configuration management sy

Versions of packages ucf recommends:
pn  debconf-utils                 <none>     (no description available)

-- debconf information:
* ucf/changeprompt: keep the local version currently installed
* ucf/show_diff:
  ucf/changeprompt_threeway: keep the local version currently installed
  ucf/title:
--- ucf	2007-09-19 14:30:44.000000000 +0200
+++ ucf~	2007-09-19 14:37:38.000000000 +0200
@@ -195,11 +195,11 @@
 # These are strings that must match the untranslated choices
 # of the debconf question.
 choice_install_new="install the package maintainer's version"
-choice_keep_current="keep the local version currently installed"
+choice_keep_current="keep your currently-installed version"
 choice_diff="show the differences between the versions"
 choice_sdiff="show a side-by-side difference between the versions"
 choice_diff_threeway="show a 3 way difference between available versions of the file"
-choice_merge_threeway="do a 3 way merge between available versions (experimental)"
+choice_merge_threeway="do a 3 way merge between available versions of the file [Very Experimental]"
 choice_shell="start a new shell to examine the situation"
 
 

Reply via email to