-----BEGIN PGP SIGNED MESSAGE----- Hash: RIPEMD160 Format: 1.8 Date: Thu, 27 Aug 2009 00:23:16 -0500 Source: ucf Binary: ucf Architecture: source all Version: 3.0021 Distribution: unstable Urgency: low Maintainer: Manoj Srivastava <srivasta@debian.org> Changed-By: Manoj Srivastava <srivasta@debian.org> Description: ucf - Update Configuration File: preserve user changes to config files. Closes: 543593 Changes: ucf (3.0021) unstable; urgency=low . * [f70b2c6]: Handle errors in three way merges This fix is one that was first implemented in Ubuntu, and has only been lightly modified. The problem was the handling of merge failures in three way merges, ucf used to just pass the error through to the maintainer script, and so a merge failure resulted in a maintainer script failure, which could cascade in a upgrade. However, trapping the error, and showing it via debconf, and then returning to the ucf debconf menu allows users to resolve this issue as they please. This patch implements that. Bug fix: "three-way-merge errors cause upgrade pains", thanks to Steve Langasek (Closes: #543593). Checksums-Sha1: 7f092f53a1c9dbe19956e809d00e0f74122fa59f 826 ucf_3.0021.dsc a2354b0e871d3d879e5d5bceec3f5093b0ef6239 93344 ucf_3.0021.tar.gz 8429deff50abe827372b681942c7e29accf954df 67092 ucf_3.0021_all.deb Checksums-Sha256: 0ba547b584ebf26049b2c7b64a9befffee6e5f90778f69bf969047d08dad03af 826 ucf_3.0021.dsc 47c78d5aa759e6c0804684f4ef7a080398bc6074a73f84a2ac80c2c70e639c2f 93344 ucf_3.0021.tar.gz 5ae701b638cdd22dc64feef076d3b54128b5edbe3f6bbe10875708b7d7ff21ce 67092 ucf_3.0021_all.deb Files: 1f62de74cda73964e8a1339c03af21b6 826 utils standard ucf_3.0021.dsc 4a56cd8a5aa8215df864d64f6cee8496 93344 utils standard ucf_3.0021.tar.gz 724eb3a48ed0e0a035a4edc3a5161905 67092 utils standard ucf_3.0021_all.deb -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.13-svn0 (GNU/Linux) iEYEAREDAAYFAkqWH/EACgkQIbrau78kQkzBLgCg2WbHo5SMvChKWPyg9fMZwbzL Qw4AnAyOMYOeJoEd3mF/GlzwB5/j3ZiI =HBwe -----END PGP SIGNATURE----- Accepted: ucf_3.0021.dsc to pool/main/u/ucf/ucf_3.0021.dsc ucf_3.0021.tar.gz to pool/main/u/ucf/ucf_3.0021.tar.gz ucf_3.0021_all.deb to pool/main/u/ucf/ucf_3.0021_all.deb