[Pkg-ocaml-maint-commits] r1418 - trunk/packages/mldonkey/trunk/debian
Sylvain LE GALL
gildor-guest@costa.debian.org
Mon, 27 Jun 2005 22:38:48 +0000
Author: gildor-guest
Date: 2005-06-27 22:38:47 +0000 (Mon, 27 Jun 2005)
New Revision: 1418
Added:
trunk/packages/mldonkey/trunk/debian/NEWS.Debian
Removed:
trunk/packages/mldonkey/trunk/debian/mldonkey-server.default
Modified:
trunk/packages/mldonkey/trunk/debian/TODO
trunk/packages/mldonkey/trunk/debian/changelog
trunk/packages/mldonkey/trunk/debian/mldonkey-server.config
trunk/packages/mldonkey/trunk/debian/mldonkey-server.postinst
trunk/packages/mldonkey/trunk/debian/mldonkey-server.preinst
Log:
Unmark /etc/default/mldonkey-server as conffile (allow to use ucf) -- SLG
Added: trunk/packages/mldonkey/trunk/debian/NEWS.Debian
===================================================================
--- trunk/packages/mldonkey/trunk/debian/NEWS.Debian 2005-06-25 10:50:06 UTC (rev 1417)
+++ trunk/packages/mldonkey/trunk/debian/NEWS.Debian 2005-06-27 22:38:47 UTC (rev 1418)
@@ -0,0 +1,10 @@
+mldonkey (2.5.28.1-1) unstable; urgency=low
+
+ Starting from mldonkey 2.5.28-1, the file /etc/default/mldonkey-server has been managed through
+ ucf. But ucf was not well used. This version of the package should correct this problem by
+ removing the file /etc/default/mldonkey-server and recreating it, using ucf. This should be
+ automatic during the upgrade. You will find a backup of the former configuration file at
+ /etc/default/mldonkey-server.dpkg-bak, if something goes wrong.
+
+ -- Sylvain Le Gall <sylvain.le-gall@polytechnique.org> Tue, 28 Jun 2005 00:22:20 +0200
+
Modified: trunk/packages/mldonkey/trunk/debian/TODO
===================================================================
--- trunk/packages/mldonkey/trunk/debian/TODO 2005-06-25 10:50:06 UTC (rev 1417)
+++ trunk/packages/mldonkey/trunk/debian/TODO 2005-06-27 22:38:47 UTC (rev 1418)
@@ -4,9 +4,10 @@
- gnome_applet
- mozilla plugin
+* Explore the possibility to build a package for KMLDonkey (Bug: #274460)
+
* Correct bugs :
Grave functionality bugs - outstanding
- #279030: mldonkey-server: debconf configuration is entirely ignored
#300560: mldonkey-server: downloads.ini writable by group users, world-readable
Important bugs - outstanding
@@ -20,6 +21,3 @@
#263094: mldonkey: Extra files to distribute
#270371: mldonkey-gui: graphical availablility isn't displayed
#285202: disconnect mldonkey-server if non-iso8859-1 characters typed in search section
-
- Wishlist items - outstanding
- #274460: consider packaging KMLDonkey
Modified: trunk/packages/mldonkey/trunk/debian/changelog
===================================================================
--- trunk/packages/mldonkey/trunk/debian/changelog 2005-06-25 10:50:06 UTC (rev 1417)
+++ trunk/packages/mldonkey/trunk/debian/changelog 2005-06-27 22:38:47 UTC (rev 1418)
@@ -64,11 +64,29 @@
* Doesn't offer the possibility to keep the server running after upgrade:
this option can cause a lot of problems (version mismatch between server
and gui). (Closes: #300547)
- * Use Int64 to store integer extracted from ini files, in mldonkey_files. This
+ * Use Int64 to store integer extracted from ini files, in mldonkey_files. This
is more compliant with the way mldonkey write this value in his ini files.
(Closes: #291451)
+ * Modify priority of the debconf question :
+ * to priority low: run_as_user, mldonkey_group, mldonkey_umask,
+ mldonkey_niceness, max_alive
+ * to priority medium: mldonkey_dir (reasonable default, but are system
+ specific most of the time), client_name (reasonnable default, but most
+ of the time are changed by user),
+ * to priority critical: reown_file (because the server cannot restart if
+ the file permission are not changed),
+ * So now, configuring the system with priority high only ask you 3
+ question, with priority medium only 8 question.
+ * Doesn't distribute anymore /etc/default/mldonkey-server. So this file is
+ not automatically marked as conffile, allowing to manage it through
+ ucf (Closes: #279030):
+ * save the default from this file to debconf in the preinst script,
+ * move mldonkey-server to mldonkey-server.bak in the preinst script,
+ * generate mldonkey-server and manage it using ucf (at the same place, but
+ using ucf).
+ * add a note into NEWS.Debian to state this change
- -- Sylvain Le Gall <sylvain.le-gall@polytechnique.org> Wed, 22 Jun 2005 01:11:44 +0200
+ -- Sylvain Le Gall <sylvain.le-gall@polytechnique.org> Tue, 28 Jun 2005 00:22:20 +0200
mldonkey (2.5.28-2) unstable; urgency=medium
Modified: trunk/packages/mldonkey/trunk/debian/mldonkey-server.config
===================================================================
--- trunk/packages/mldonkey/trunk/debian/mldonkey-server.config 2005-06-25 10:50:06 UTC (rev 1417)
+++ trunk/packages/mldonkey/trunk/debian/mldonkey-server.config 2005-06-27 22:38:47 UTC (rev 1418)
@@ -1,15 +1,14 @@
#!/bin/sh -e
# Debconf configuration script for MLDonkey server.
-# by Sylvain LE GALL <sylvain.le-gall@polytechnique.org>
+# by Sylvain Le Gall <sylvain.le-gall@polytechnique.org>
# Source debconf library
. /usr/share/debconf/confmodule
CONFIGFILE=/etc/default/mldonkey-server
-if [ -e $CONFIGFILE ]
-then
+if [ -e $CONFIGFILE ]; then
MLDONKEY_DIR=
MLDONKEY_GROUP=
MLDONKEY_UMASK=
@@ -75,10 +74,10 @@
if [ "$launch_at_startup" = "true" ]; then
- db_input medium mldonkey-server/run_as_user || true
+ db_input low mldonkey-server/run_as_user || true
db_go
- db_input medium mldonkey-server/mldonkey_group || true
+ db_input low mldonkey-server/mldonkey_group || true
db_go
# Existence and owner test
@@ -95,14 +94,14 @@
if [ "$new_owner" != "$owner" ]; then
- db_input medium mldonkey-server/reown_file || true
+ db_input critical mldonkey-server/reown_file || true
db_go
fi
fi
- db_input high mldonkey-server/mldonkey_dir || true
+ db_input medium mldonkey-server/mldonkey_dir || true
db_go
# Existence test
@@ -117,13 +116,13 @@
fi
- db_input high mldonkey-server/mldonkey_umask || true
+ db_input low mldonkey-server/mldonkey_umask || true
db_go
- db_input high mldonkey-server/mldonkey_niceness || true
+ db_input low mldonkey-server/mldonkey_niceness || true
db_go
- db_input high mldonkey-server/client_name || true
+ db_input medium mldonkey-server/client_name || true
db_go
db_input medium mldonkey-server/plugin || true
@@ -135,7 +134,7 @@
db_input medium mldonkey-server/max_hard_upload_rate || true
db_go
- db_input high mldonkey-server/max_alive || true
+ db_input low mldonkey-server/max_alive || true
db_go
password="a"
Deleted: trunk/packages/mldonkey/trunk/debian/mldonkey-server.default
===================================================================
--- trunk/packages/mldonkey/trunk/debian/mldonkey-server.default 2005-06-25 10:50:06 UTC (rev 1417)
+++ trunk/packages/mldonkey/trunk/debian/mldonkey-server.default 2005-06-27 22:38:47 UTC (rev 1418)
@@ -1,12 +0,0 @@
-# MLDonkey configuration
-# please do not edit by hand
-# use dpkg-reconfigure mldonkey-server
-# This script is loaded by
-# /etc/init.d/mldonkey-server
-
-MLDONKEY_DIR=/var/lib/mldonkey
-MLDONKEY_GROUP=mldonkey
-MLDONKEY_UMASK=0022
-MAX_ALIVE=24
-LAUNCH_AT_STARTUP=false
-MLDONKEY_NICENESS=
Modified: trunk/packages/mldonkey/trunk/debian/mldonkey-server.postinst
===================================================================
--- trunk/packages/mldonkey/trunk/debian/mldonkey-server.postinst 2005-06-25 10:50:06 UTC (rev 1417)
+++ trunk/packages/mldonkey/trunk/debian/mldonkey-server.postinst 2005-06-27 22:38:47 UTC (rev 1418)
@@ -202,7 +202,7 @@
fi
CONF_NEW=`/bin/tempfile`
- $DEBUG && echo -n "Writing new values to $CONF_NEW : "
+ $DEBUG && echo -n "Writing new values to $CONF_NEW: "
cat > $CONF_NEW <<EOF
# MLDonkey configuration
Modified: trunk/packages/mldonkey/trunk/debian/mldonkey-server.preinst
===================================================================
--- trunk/packages/mldonkey/trunk/debian/mldonkey-server.preinst 2005-06-25 10:50:06 UTC (rev 1417)
+++ trunk/packages/mldonkey/trunk/debian/mldonkey-server.preinst 2005-06-27 22:38:47 UTC (rev 1418)
@@ -1,11 +1,76 @@
#!/bin/sh -e
-if [ "$1" = "upgrade" ] && \
- dpkg --compare-versions "$2" lt "2.5.1-5" && \
- [ -e /etc/mldonkey.conf ]; then
+CONFFILE=/etc/default/mldonkey-server
- echo "Moving /etc/mldonkey.conf to /etc/default/mldonkey-server"
- mv -f /etc/mldonkey.conf /etc/default/mldonkey-server
-fi
+case "$1" in
+ install|upgrade)
+ if dpkg --compare-version "$2" lt "2.5.1-5" && [ -e /etc/mldonkey.conf ]; then
+ echo "Moving /etc/mldonkey.conf to /etc/default/mldonkey-server"
+ mv -f /etc/mldonkey.conf $CONFFILE
+ fi
+
+ if dpkg --compare-versions "$2" le "2.5.28-2" && [ -e $CONFFILE ]; then
+ # Moving /etc/default/mldonkey-server from conffile to ucf management
+ echo "Migration of /etc/default/mldonkey-server to ucf"
+
+ # Read the former CONFFILE
+ echo -n " Loading default:"
+ MLDONKEY_DIR=
+ MLDONKEY_GROUP=
+ MLDONKEY_UMASK=
+ MAX_ALIVE=
+ LAUNCH_AT_STARTUP=
+ MLDONKEY_NICENESS=
+ . $CONFFILE || true
+ echo "done."
+
+ # Save the default which can be found in /etc/default/mldonkey-server
+ # in debconf
+ echo -n " Saving default: "
+ if [ "$MLDONKEY_DIR" != "" ]; then
+ echo -n "MLDONKEY_DIR "
+ db_set mldonkey-server/mldonkey_dir $MLDONKEY_DIR
+ fi
+
+ if [ "$MLDONKEY_GROUP" != "" ]; then
+ echo -n "MLDONKEY_GROUP "
+ db_set mldonkey-server/mldonkey_group $MLDONKEY_GROUP
+ fi
+
+ if [ "$MLDONKEY_UMASK" != "" ]; then
+ echo -n "MLDONKEY_UMASK "
+ db_set mldonkey-server/mldonkey_umask $MLDONKEY_UMASK
+ fi
+
+ if [ "$MAX_ALIVE" != "" ]; then
+ echo -n "MAX_ALIVE "
+ db_set mldonkey-server/max_alive $MAX_ALIVE
+ fi
+
+ if [ "$MLDONKEY_NICENESS" != "" ]; then
+ echo -n "MLDONKEY_NICENESS "
+ db_set mldonkey-server/mldonkey_niceness $MLDONKEY_NICENESS
+ fi
+
+ if [ "$LAUNCH_AT_STARTUP" != "" ]; then
+ echo -n "LAUNCH_AT_STARTUP "
+ if [ "$LAUNCH_AT_STARTUP" = "true" ]; then
+ db_set mldonkey-server/launch_at_startup true
+ else
+ db_set mldonkey-server/launch_at_startup false
+ fi
+ fi
+ echo "done."
+
+ # Move the file to a backup file
+ echo -n " Removing obsolete conffile (backup is $CONFFILE.dpkg-bak): "
+ mv -f "$CONFFILE" "$CONFILE.dpkg-bak"
+ echo "done."
+
+
+ echo "The file will be re-created using ucf."
+ fi
+esac
+
#DEBHELPER#