[Pkg-ocaml-maint-commits] [SCM] marionnet packaging branch, master, updated. upstream/0.90.6+bzr427-50-g32cea31

2013-07-05 Thread Lucas Nussbaum
The following commit has been merged in the master branch:
commit 1cafa888f82ee0b9d84c81ac1e994faa8a82f0bc
Author: Lucas Nussbaum 
Date:   Fri Jul 5 21:10:43 2013 +0200

Add depend on lsb-base.

diff --git a/debian/control b/debian/control
index 5caca9c..d2daada 100644
--- a/debian/control
+++ b/debian/control
@@ -23,7 +23,8 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ${ocaml:Depends},
  liblablgtk2-ocaml-dev (>= 2.12.0-2),
  libocamlbricks-ocaml-dev (>= 0.90+bzr367~),
  liblablgtksourceview2-ocaml-dev (>= 2.14.2),
- vde2
+ vde2,
+ lsb-base (>= 3.2-14)
 Description: Virtual network laboratory
  Marionnet is a virtual network laboratory: it allows users to define,
  configure and run complex computer networks without any need for physical

-- 
marionnet packaging

___
Pkg-ocaml-maint-commits mailing list
Pkg-ocaml-maint-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits


[Pkg-ocaml-maint-commits] [SCM] marionnet packaging branch, master, updated. upstream/0.90.6+bzr427-50-g32cea31

2013-07-05 Thread Lucas Nussbaum
The following commit has been merged in the master branch:
commit 32cea31c177d28b3b0f3818dbd5274817ae57a65
Author: Lucas Nussbaum 
Date:   Fri Jul 5 21:12:55 2013 +0200

Fix lintian warnings about init script.

diff --git a/debian/marionnet.init b/debian/marionnet.init
index 5ab488b..b2c9922 100644
--- a/debian/marionnet.init
+++ b/debian/marionnet.init
@@ -2,7 +2,7 @@
 ### BEGIN INIT INFO
 # Provides: marionnet
 # Required-Start: $local_fs $remote_fs $network
-# Required-Stop:
+# Required-Stop: $remote_fs $network
 # Default-Start: 2 3 4 5
 # Default-Stop: 0 1 6
 # Short-Description: Support daemon for marionnet
@@ -21,16 +21,14 @@ PIDFILE=/var/run/$NAME.pid
 SCRIPTNAME=/etc/init.d/$NAME
 
 # Exit if the package is not installed
-[ -x $DAEMON ] || exit 0
+[ -x "$DAEMON" ] || exit 0
 
 # Read configuration variable file if it is present
 [ -r /etc/default/$NAME ] && . /etc/default/$NAME
 
-# Load the VERBOSE setting and other rcS variables
-. /lib/init/vars.sh
-
 # Define LSB log_* functions.
-# Depend on lsb-base (>= 3.0-6) to ensure that this file is present.
+# Depend on lsb-base (>= 3.2-14) to ensure that this file is present
+# and status_of_proc is working.
 . /lib/lsb/init-functions
 
 VERBOSE=yes # VERBOSE=no does not really make sense for this package
@@ -49,18 +47,6 @@ do_start()
start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON 
--background --make-pidfile -- \
$DAEMON_ARGS \
|| return 2
-   # The above code will not work for interpreted scripts, use the next
-   # six lines below instead (Ref: #643337, start-stop-daemon(8) )
-   #start-stop-daemon --start --quiet --pidfile $PIDFILE --startas $DAEMON 
\
-   #   --name $NAME --test > /dev/null \
-   #   || return 1
-   #start-stop-daemon --start --quiet --pidfile $PIDFILE --startas $DAEMON 
\
-   #   --name $NAME -- $DAEMON_ARGS \
-   #   || return 2
-
-   # Add code here, if necessary, that waits for the process to be ready
-   # to handle requests from services started subsequently which depend
-   # on this one.  As a last resort, sleep for some time.
 }
 
 #

-- 
marionnet packaging

___
Pkg-ocaml-maint-commits mailing list
Pkg-ocaml-maint-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits