[Pkg-ocaml-maint-commits] r3330 - in /trunk/packages/mldonkey/trunk/debian: changelog patches/00list patches/mlguistarter.dpatch

[smimram at users.alioth.debian.org]

Author: smimram
Date: Tue Nov  7 16:10:00 2006
New Revision: 3330

URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=3330
Log:
Added mlguistarter.dpatch to print an error message when no argument is given to mlguistarter.

Added:
    trunk/packages/mldonkey/trunk/debian/patches/mlguistarter.dpatch   (with props)
Modified:
    trunk/packages/mldonkey/trunk/debian/changelog
    trunk/packages/mldonkey/trunk/debian/patches/00list

Modified: trunk/packages/mldonkey/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/mldonkey/trunk/debian/changelog?rev=3330&op=diff
==============================================================================
--- trunk/packages/mldonkey/trunk/debian/changelog (original)
+++ trunk/packages/mldonkey/trunk/debian/changelog Tue Nov  7 16:10:00 2006
@@ -3,6 +3,8 @@
   * Using start-stop-daemon to fully handle daemon, closes: #394543.
   * Not installing mldonkey-server anymore.
   * Using -pid option of mlnet to create the pidfile, closes: #341615.
+  * Added mlguistarter.dpatch to print an error message when no argument is
+    given to mlguistarter, closes: #396754.
 
  -- Samuel Mimram <smimram at debian.org>  Tue,  7 Nov 2006 14:20:59 +0000
 

Modified: trunk/packages/mldonkey/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/mldonkey/trunk/debian/patches/00list?rev=3330&op=diff
==============================================================================
--- trunk/packages/mldonkey/trunk/debian/patches/00list (original)
+++ trunk/packages/mldonkey/trunk/debian/patches/00list Tue Nov  7 16:10:00 2006
@@ -1,2 +1,3 @@
 01_see
 newdns
+mlguistarter

Added: trunk/packages/mldonkey/trunk/debian/patches/mlguistarter.dpatch
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/mldonkey/trunk/debian/patches/mlguistarter.dpatch?rev=3330&op=file
==============================================================================
--- trunk/packages/mldonkey/trunk/debian/patches/mlguistarter.dpatch (added)
+++ trunk/packages/mldonkey/trunk/debian/patches/mlguistarter.dpatch Tue Nov  7 16:10:00 2006
@@ -1,0 +1,37 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## mlguistarter.dpatch by spiralvoice <spiralvoice at hotmail.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Print an error message when no argument is given to mlguistarter.
+
+ at DPATCH@
+diff -urNad mldonkey-2.8.1~/src/gtk2/gui/guiStarter.ml mldonkey-2.8.1/src/gtk2/gui/guiStarter.ml
+--- mldonkey-2.8.1~/src/gtk2/gui/guiStarter.ml	2005-10-31 18:34:02.000000000 +0000
++++ mldonkey-2.8.1/src/gtk2/gui/guiStarter.ml	2006-11-07 15:07:23.000000000 +0000
+@@ -22,6 +22,17 @@
+ let _s_ x = (_s x) ^ ":"
+ 
+ let main () =
++  let arg_1 =
++    try
++      Sys.argv.(1)
++    with _ -> ""
++  in
++  if not (Sys.file_exists arg_1) then
++    begin
++      if arg_1 <> "" then Printf.printf "File %s not found\n%!" arg_1;
++      Printf.printf "Syntax: mlguistarter FILE\n%!";
++      exit 0
++    end;
+   ignore (GMain.Main.init ());
+   let window = GWindow.window 
+     ~title:(_s "MLdonkey GUI starter")
+@@ -57,7 +68,7 @@
+   ignore (wb_5#connect#clicked ~callback:
+   (fun () -> 
+       window#destroy ();
+-      ignore (Sys.command (Printf.sprintf "%s &" Sys.argv.(1)));
++      ignore (Sys.command (Printf.sprintf "%s &" arg_1));
+       ));
+   ignore (wb_6#connect#clicked ~callback:
+   (fun () -> 

Propchange: trunk/packages/mldonkey/trunk/debian/patches/mlguistarter.dpatch
------------------------------------------------------------------------------
    svn:executable = *