[Pkg-ocaml-maint-commits] r2852 - in /trunk/packages/mldonkey/trunk/debian: changelog utils/mldonkey_server.ml watch

[smimram at users.alioth.debian.org]

Author: smimram
Date: Thu Jun 22 12:28:56 2006
New Revision: 2852

URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=2852
Log:
Fixing some more bugs.

Modified:
    trunk/packages/mldonkey/trunk/debian/changelog
    trunk/packages/mldonkey/trunk/debian/utils/mldonkey_server.ml
    trunk/packages/mldonkey/trunk/debian/watch

Modified: trunk/packages/mldonkey/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/mldonkey/trunk/debian/changelog?rev=2852&op=diff
==============================================================================
--- trunk/packages/mldonkey/trunk/debian/changelog (original)
+++ trunk/packages/mldonkey/trunk/debian/changelog Thu Jun 22 12:28:56 2006
@@ -6,9 +6,12 @@
     - the bus error should be gone on sparc, closes: #347465.
   * Build-depend on ocaml-nox (>= 3.09.2), closes: #369770.
   * init.d script of mldonkey-server called with stop now exits with 0 even
-    when the server was not running, closes: #368118, #338875.
+    when the server was not running, closes: #338875.
+  * Correcly set $HOME in mldonkey_server, closes: #355913.
+  * Updated the Czech debconf templates translation, closes: #335353.
   * Added a .desktop file for mldonkey-gui.
   * Updated standards version to 3.7.2, no changes needed.
+  * Updated the watch file.
 
  -- Samuel Mimram <smimram at debian.org>  Wed, 21 Jun 2006 23:15:23 +0000
 

Modified: trunk/packages/mldonkey/trunk/debian/utils/mldonkey_server.ml
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/mldonkey/trunk/debian/utils/mldonkey_server.ml?rev=2852&op=diff
==============================================================================
--- trunk/packages/mldonkey/trunk/debian/utils/mldonkey_server.ml (original)
+++ trunk/packages/mldonkey/trunk/debian/utils/mldonkey_server.ml Thu Jun 22 12:28:56 2006
@@ -333,8 +333,8 @@
 ;;
 
 let go_home st =
-  debug st ("Chdir to home dir: "^(get_chdir st));
-  Unix.putenv "HOME" (get_chdir st);
+  debug st ("Chdir to home dir: "^(user_home st));
+  Unix.putenv "HOME" (user_home st);
   Unix.putenv "MLDONKEY_STRINGS" (Filename.concat (get_chdir st) "mlnet_strings");
   Sys.chdir (get_chdir st)
 ;;
@@ -641,7 +641,7 @@
   in
   if !timeout then
   begin
-    debug st ("Process "^(string_of_int pid)^" not responding, taking measure : SIGKILL");
+    debug st ("Process "^(string_of_int pid)^" not responding, taking measure: SIGKILL");
     try
       Unix.kill pid Sys.sigkill
     with Unix.Unix_error(_, _, _) ->
@@ -816,14 +816,14 @@
           begin
           match Unix.wait () with
           x,WEXITED(y) ->
-            debug st ("Process PID ( "^(string_of_int x)^
-            " ) exit with return code "^(string_of_int y))
+            debug st ("Process PID ("^(string_of_int x)^
+            ") exit with return code "^(string_of_int y))
           | x,WSIGNALED(y) ->
-            debug st ("Process PID ( "^(string_of_int x)^
-            " ) was killed by signal "^(string_of_int y))
+            debug st ("Process PID ("^(string_of_int x)^
+            ") was killed by signal "^(string_of_int y))
           | x,WSTOPPED(y) ->
-            debug st ("Process PID ( "^(string_of_int x)^
-            " ) was stopped by signal "^(string_of_int y))
+            debug st ("Process PID ("^(string_of_int x)^
+            ") was stopped by signal "^(string_of_int y))
           end;
           state := MlnetDied
         (* On peut etre interrompu par un signal extérieur *)
@@ -842,14 +842,14 @@
       | MlnetDied ->
         if Unix.time () -. last_respawn < st.min_alive then
         begin
-          debug st ("Process respawning too fast : only live "^
+          debug st ("Process respawning too fast: only live "^
             (string_of_float(Unix.time () -. last_respawn)));
           stop_mlnet st mlnet;
           terminate := true
         end
         else
         begin
-          debug st ("Process died, respawning : live for "^
+          debug st ("Process died, respawning: live for "^
             (string_of_float(Unix.time () -. last_respawn)));
           stop_mlnet st mlnet;
           reload := true
@@ -867,7 +867,7 @@
   if daemon_is_running st then
     let pid_server = read_pidfile st
     in
-    debug st ("Sending signal "^signal_name^" to process PID ( "^(string_of_int pid_server)^" )");
+    debug st ("Sending signal "^signal_name^" to process PID ("^(string_of_int pid_server)^")");
     if signal = Sys.sigterm then
       stop_or_die st pid_server
     else
@@ -905,7 +905,7 @@
     exit 0
   with No_home_variable ->  
     begin
-    prerr_string (" Could not guess $HOME environnement variable : provide a --chdir or $HOME");
+    prerr_string (" Could not guess $HOME environnement variable: provide a --chdir or $HOME");
     prerr_newline ()
     end
   | No_home_to_chdir ->
@@ -920,7 +920,7 @@
     end
   | Already_running ->
     begin
-    prerr_string (" Some others mldonkey_server are running ( a pidfile exists )");
+    prerr_string (" Some others mldonkey_server are running (a pidfile exists)");
     prerr_newline ()
     end
   | No_pidfile ->

Modified: trunk/packages/mldonkey/trunk/debian/watch
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/mldonkey/trunk/debian/watch?rev=2852&op=diff
==============================================================================
--- trunk/packages/mldonkey/trunk/debian/watch (original)
+++ trunk/packages/mldonkey/trunk/debian/watch Thu Jun 22 12:28:56 2006
@@ -1,2 +1,2 @@
-version=2
-http://savannah.nongnu.org/download/mldonkey/mldonkey-(.*)\.tar\.bz2
+version=3
+http://sf.net/mldonkey/mldonkey-([\d\.]+)\.tar\.bz2