please unblock ucf/3.0010
Hi,
The changes are updated finnish and catalan translations, and an
important bugfix with too-large changes in the diffs between local and
maintainer version of a configuration file while updating. The non-i18n
related changes are shown below.
Thanks.
manoj
diff -Nru ucf-3.007/debian/changelog ucf-3.0010/debian/changelog
--- ucf-3.007/debian/changelog 2008-05-30 10:47:51.000000000 -0500
+++ ucf-3.0010/debian/changelog 2008-09-03 09:17:58.000000000 -0500
@@ -1,3 +1,36 @@
+ucf (3.0010) unstable; urgency=low
+
+ * Fix a typo in the fix for the important bug in the last release, so
+ arguably this too is an important fix. This is a one character patch,
+ thanks to Niko Tyni. Closes: #497658
+
+ -- Manoj Srivastava <srivasta@debian.org> Wed, 03 Sep 2008 09:17:58 -0500
+
+ucf (3.009) unstable; urgency=low
+
+ * There was an issue that using the sdiff or diff options of ucf would
+ either error out, or would hang due to a comminication snafu with
+ debconf. This fix handles exceptional sizes of diff output, correcting
+ both issues. This is an important bug fix meant for Lenny.
+ Closes: #486702, #490034
+ * The current Catalan translation of UCF has a few usability problems,
+ namely the same translation for all 3 different diff options. The
+ result is that you are presented with the same option twice in many
+ cases, and can't tell the difference between them. This i18n update
+ fixes that issue. Closes: #497391
+ * Updated Standards-Version: No changes.
+
+ -- Manoj Srivastava <srivasta@debian.org> Tue, 02 Sep 2008 21:24:53 -0500
+
+ucf (3.008) unstable; urgency=low
+
+ * Updated ucf man page. Fixes: "ucf(1) incorrectly claims that ucf has
+ bug". Documentation bug. Closes: #496489
+ * ucf: [INTL:fi] Updated Finnish translation of the debconf templates
+ Closes: #489174
+
+ -- Manoj Srivastava <srivasta@debian.org> Sat, 30 Aug 2008 03:19:44 -0500
+
ucf (3.007) unstable; urgency=low
* Move to the new make -j friendly targets in debian/rules
diff -Nru ucf-3.007/debian/control ucf-3.0010/debian/control
--- ucf-3.007/debian/control 2008-05-30 10:52:06.000000000 -0500
+++ ucf-3.0010/debian/control 2008-09-02 21:24:23.000000000 -0500
@@ -5,7 +5,7 @@
Priority: optional
Maintainer: Manoj Srivastava <srivasta@debian.org>
Build-Depends-Indep: po-debconf, gettext
-Standards-Version: 3.7.3.0
+Standards-Version: 3.8.0.0
Package: ucf
Architecture: all
diff -Nru ucf-3.007/ucf ucf-3.0010/ucf
--- ucf-3.007/ucf 2008-05-30 01:22:03.000000000 -0500
+++ ucf-3.0010/ucf 2008-09-03 09:15:54.000000000 -0500
@@ -60,10 +60,14 @@
# Use debconf to show the differences
show_diff() {
if [ -z "$1" ]; then
- echo >&2 "need a diff as argument"
- exit 1;
+ DIFF="There are no non-white space differences in the files."
+ else
+ if [ 99999 -lt $(echo $1 | wc -c | awk '{print $1; }') ]; then
+ DIFF="The differences between the files are too large to display."
+ else
+ DIFF="$1"
+ fi
fi
- DIFF="$1"
if [ "$DEBCONF_OK" = "YES" ] && [ "$DEBIAN_HAS_FRONTEND" ]; then
templ=ucf/show_diff
db_capb escape
diff -Nru ucf-3.007/ucf.1 ucf-3.0010/ucf.1
--- ucf-3.007/ucf.1 2008-05-30 10:44:12.000000000 -0500
+++ ucf-3.0010/ucf.1 2008-08-30 03:11:24.000000000 -0500
@@ -370,40 +370,6 @@
.B Debian
Emacs policy, shipped with the package
.I emacsen\-common.
-.SH BUGS
-Well, shortcomings, really. If the debconf database has been removed,
-or corrupted, debconf does not automatically install
-.B ucf
-templates, since usually the calling pattern is such that
-.B ucf
-is called from the maintainer script of another package. If the other
-package has already invoked debconf, then
-.B ucf
-uses the existing front end, which has already loaded the debconf
-database, installing the templates of that calling package. The
-.B ucf
-templates are not loaded automatically, since the front-end script has
-no idea that they should be, it just heuristically loads the templates
-of the package whose maintainer scripts are being run. In this
-scenario,
-.B ucf
-cannot load its templates, since the front-end script shall override
-the database when it exits, and there is no way to tell the front-end
-script to now load
-.B ucf
-templates on the fly. In this case, since the DB was corrupt, debconf
-can not find
-.B ucf
-templates. In case no debconf front-end is running, though,
-.B ucf
-tries hard to load its own templates, as long as the package
-.I debconf-utils
-is installed. The only reliable way to reload
-.B ucf
-templates is to call
-.RS
-.I dpkg-reconfigure ucf
-.RE
.SH AUTHOR
This manual page was written Manoj Srivastava <srivasta@debian.org>,
for the Debian GNU/Linux system.
--
The 11 is for people with the pride of a 10 and the pocketbook of an
8. R.B. Greenberg [referring to PDPs?]
Manoj Srivastava <srivasta@acm.org> <http://www.golden-gryphon.com/>
1024D/BF24424C print 4966 F272 D093 B493 410B 924B 21BA DABB BF24 424C
Reply to: