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

[Mehdi Dogguy]

The following commit has been merged in the master branch:
commit a7d74468ed315f556f98f36dd9042e65ad44fecd
Author: Mehdi Dogguy <dogguy at pps.jussieu.fr>
Date:   Fri Mar 13 15:02:36 2009 +0100

    Move the daemon's log in /var/log/mldonkey, closes: #508533.

diff --git a/debian/NEWS.Debian b/debian/NEWS.Debian
index 42b41a3..d404b0a 100644
--- a/debian/NEWS.Debian
+++ b/debian/NEWS.Debian
@@ -3,6 +3,12 @@ mldonkey (3.0.0-1) unstable; urgency=low
   * makejail is not suggested anymore: all support for chrooted-mldonkey is
     dropped. Scripts remain is the Git repository but won't be installed.
   * Downloaded (commits) files can be found in /var/lib/mldonkey.
+  * All utils are now in /usr/lib/mldonkey:
+    - mldonkey_files
+    - mldonkey_command
+    - mldonkey_options
+    - mldonkey_submit
+  * All logs can be found now in /var/log/mldonkey
 
  -- Mehdi Dogguy <dogguy at pps.jussieu.fr>  Wed, 11 Mar 2009 16:57:46 +0100
 
diff --git a/debian/changelog b/debian/changelog
index 30b750a..fc669a3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -37,6 +37,7 @@ mldonkey (3.0.0-1) UNRELEASED; urgency=low
   * Add missing build-dependency libbz2-dev to enable Directconnect protocol.
   * Move mldonkey_{files,options,command,submit} to /usr/lib/mldonkey.
     Closes: #484674
+  * Move the daemon's log in /var/log/mldonkey, closes: #508533.
 
  -- Mehdi Dogguy <dogguy at pps.jussieu.fr>  Thu, 12 Mar 2009 22:46:51 +0100
 
diff --git a/debian/mldonkey-server.init b/debian/mldonkey-server.init
index 7c6a9d8..b06dd72 100644
--- a/debian/mldonkey-server.init
+++ b/debian/mldonkey-server.init
@@ -30,8 +30,8 @@ DESC="MLDonkey"
 CONFIG=/etc/default/mldonkey-server
 PIDDIR=/var/run/mldonkey
 PIDFILE=$PIDDIR/$NAME.pid
-LOGFILE=/var/log/mldonkey/$NAME.log
-SERVERLOG=/var/lib/mldonkey/mlnet.log
+LOGFILE=/var/log/mldonkey/mldonkey-server.log
+SERVERLOG=/var/log/mldonkey/mlnet.log
 
 test -e $CONFIG || exit 0
 
@@ -114,7 +114,7 @@ case "$1" in
     fi
 
     USER=`/usr/bin/stat --format="%U" "$MLDONKEY_DIR/downloads.ini"`
-    WRAPPER_OPTIONS="$WRAPPER_OPTIONS --user $USER"
+    WRAPPER_OPTIONS="$WRAPPER_OPTIONS --user $USER -log_file $SERVERLOG"
 
     start-stop-daemon --start $WRAPPER_OPTIONS \
     --pidfile $PIDFILE --background --exec $EXEC \

-- 
mldonkey packaging