[Pkg-ocaml-maint-commits] [SCM] mldonkey packaging branch, master, updated. debian/2.9.5-2-59-g5d511aa

[Samuel Mimram]

The following commit has been merged in the master branch:
commit 5d511aa2c78aebaf84d470d4795ef2febca4cb9a
Author: Samuel Mimram <samuel.mimram at ens-lyon.org>
Date:   Tue Feb 24 09:52:22 2009 +0100

    Pass --debconf-ok option to ucf.

diff --git a/debian/changelog b/debian/changelog
index 2dbd2c4..89cf36e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,7 @@ mldonkey (2.9.7-1) UNRELEASED; urgency=low
   * Fixes alignement problem on ARM, closes: #487803.
   * Remove useless line in init script, closes: #509001.
   * Better handling of errors in init script, closes: #508538.
+  * Pass --debconf-ok option to ucf, closes: #514449.
   * Mention default telnet port in README.Debian, closes: #508436.
   * Updated vietnamese debconf translation, closes: #513369.
 
@@ -27,7 +28,7 @@ mldonkey (2.9.7-1) UNRELEASED; urgency=low
   * Simplify debian/rules
   * Create a manpage for mldonkey (link to mlnet's manpage)
 
- -- Samuel Mimram <smimram at debian.org>  Wed, 28 Jan 2009 13:50:58 +0100
+ -- Samuel Mimram <smimram at debian.org>  Tue, 24 Feb 2009 09:51:28 +0100
 
 mldonkey (2.9.5-2) unstable; urgency=low
 
diff --git a/debian/mldonkey-server.postinst b/debian/mldonkey-server.postinst
index 42bcc3a..0288d02 100644
--- a/debian/mldonkey-server.postinst
+++ b/debian/mldonkey-server.postinst
@@ -224,7 +224,7 @@ LAUNCH_AT_STARTUP=$launch_at_startup
 MLDONKEY_NICENESS=$mldonkey_niceness
 EOF
 
-        ucf "$CONF_NEW" "$CONF"
+        ucf --debconf-ok "$CONF_NEW" "$CONF"
 
         $DEBUG && echo "done."
         ;;

-- 
mldonkey packaging