[Pkg-uml-commit] r258 - in trunk/src/uml-utilities/debian: . patches

[Stefano Melchior]

Author: stex-guest
Date: 2006-11-25 11:08:29 +0100 (Sat, 25 Nov 2006)
New Revision: 258

Modified:
   trunk/src/uml-utilities/debian/changelog
   trunk/src/uml-utilities/debian/control
   trunk/src/uml-utilities/debian/patches/00list
   trunk/src/uml-utilities/debian/uml-utilities.init
Log:
Upgrade to 20060622 version: modifies changelog, control to add fuse-dev dependency; created humfsify and uml_mount man pages

Modified: trunk/src/uml-utilities/debian/changelog
===================================================================
--- trunk/src/uml-utilities/debian/changelog	2006-11-24 17:59:19 UTC (rev 257)
+++ trunk/src/uml-utilities/debian/changelog	2006-11-25 10:08:29 UTC (rev 258)
@@ -1,7 +1,11 @@
-uml-utilities (20060323-4) unstable; urgency=low
+uml-utilities (20060622-1) unstable; urgency=low
+  
   [Stefano Melchior]
+  * new upstream release (Closes: #393263)
+  * added the humfsify man page
   * updated policy version in debian/control
   * added correction in the tunctl man page (Closes: #395020)
+  * added LSB support with patch from David Härdeman (Closes: #385906)
   [Mattia Dongili]:
   * set a decent name for the _maintenance_ team.
   * add UML_SWITCH_CTL to defaults file for easier customization.
@@ -9,7 +13,7 @@
   * mention COW files advantages and how to see their actual 
     disk usage in uml_moo and uml_mkcow manpages. (Closes: #173302)
 
- -- Mattia Dongili <malattia at debian.org>  Fri, 02 Jun 2006 19:37:24 +0200
+ -- Stefano Melchior <stefano.melchior at openlabs.it>  Thu, 23 Nov 2006 08:52:51 +0200
 
 uml-utilities (20060323-3) unstable; urgency=low
 

Modified: trunk/src/uml-utilities/debian/control
===================================================================
--- trunk/src/uml-utilities/debian/control	2006-11-24 17:59:19 UTC (rev 257)
+++ trunk/src/uml-utilities/debian/control	2006-11-25 10:08:29 UTC (rev 258)
@@ -3,12 +3,12 @@
 Priority: extra
 Maintainer: User Mode Linux Maintainers <pkg-uml-pkgs at lists.alioth.debian.org>
 Uploaders: Stefano Melchior <stefano.melchior at openlabs.it>, Andreas Schuldei <andreas at schuldei.org>, Mattia Dongili <malattia at debian.org>
-Build-Depends: debhelper (>> 4.0.0), libreadline5-dev | libreadline-dev, docbook-to-man, dpatch
+Build-Depends: debhelper (>> 4.0.0), libreadline5-dev | libreadline-dev, docbook-to-man, dpatch, libfuse-dev
 Standards-Version: 3.7.2
 
 Package: uml-utilities
 Architecture: any
-Depends: adduser, udev | makedev (>= 2.3.1-62), ${shlibs:Depends}
+Depends: adduser, udev | makedev (>= 2.3.1-62), ${shlibs:Depends}, lsb-base (>= 3.0-10)
 Suggests: user-mode-linux
 Description: User-mode Linux (utility programs)
  User-mode Linux is a port of the Linux kernel to its own system call

Modified: trunk/src/uml-utilities/debian/patches/00list
===================================================================
--- trunk/src/uml-utilities/debian/patches/00list	2006-11-24 17:59:19 UTC (rev 257)
+++ trunk/src/uml-utilities/debian/patches/00list	2006-11-25 10:08:29 UTC (rev 258)
@@ -1,2 +1 @@
-01_fix_moo_conflicting_types_for_read_cow_header.dpatch
 02_fix_install_directories.dpatch

Modified: trunk/src/uml-utilities/debian/uml-utilities.init
===================================================================
--- trunk/src/uml-utilities/debian/uml-utilities.init	2006-11-24 17:59:19 UTC (rev 257)
+++ trunk/src/uml-utilities/debian/uml-utilities.init	2006-11-25 10:08:29 UTC (rev 258)
@@ -1,10 +1,21 @@
-#! /bin/sh
+#! /bin/sh -e
 #
-# uml-utilities Provide some simple UML networking configuration
-#               services
-#
-#               Matt Zimmerman <mdz at debian.org>
+### BEGIN INIT INFO
+# Short-Description: start and stop UML networking services
+# Description: uml-utilities provide some simple UML networking configuration services
+# X-implementor: Matt Zimmerman <mdz at debian.org>
+# Default-Start:  2 3 4 5
+# Default-Stop: 0 1 6
+# Provides: uml-utilities
+# Required-Start:
+# Required-Stop:
+### END INIT INFO
 
+# Start LSB function logging
+. /lib/lsb/init-functions
+DISTRO=$(lsb_release -is 2>/dev/null || echo Debian)
+
+
 PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
 DAEMON=/usr/bin/uml_switch
 NAME=uml_switch
@@ -13,8 +24,6 @@
 
 test -x $DAEMON || exit 0
 
-set -e
-
 UML_SWITCH_OPTIONS=""
 UML_SWITCH_USER="uml-net"
 UML_SWITCH_CTL="/var/run/uml-utilities/uml_switch.ctl"
@@ -27,36 +36,46 @@
 
 case "$1" in
   start)
-	echo -n "Starting $DESC: "
 	if [ "x$UML_SWITCH_START" = "xfalse" ] ; then
-		echo " Disabled."
+		[ "$VERBOSE" = "yes" ] && log_warning_msg "$DESC disabled"
 		exit 0
 	else
 		echo -n " $NAME"
 	fi
-        start-stop-daemon --start --quiet --pidfile $PIDFILE \
+        log_daemon_msg "Starting $DESC" "$NAME"
+	if start-stop-daemon --start --quiet --pidfile $PIDFILE \
             --make-pidfile --background --chuid $UML_SWITCH_USER \
-            --exec $DAEMON -- $OPTIONS
+			--exec $DAEMON -- $OPTIONS; then
+			log_end_msg 0
+		else
+			log_end_msg 1
+		fi
 
         WAIT=5
         while ! test -e $UML_SWITCH_CTL; do
             sleep 1
             WAIT=$(($WAIT - 1))
             if [ $WAIT -le 0 ]; then
-                echo "$DAEMON never created control socket $UML_SWITCH_CTL" >&2
+		log_warning_msg "$DAEMON never created control socket $UML_SWITCH_CTL"
+		log_end_msg 1
                 exit 1
             fi
         done
 
         chmod 777 $UML_SWITCH_CTL
 	echo "."
+	log_end_msg 0
 	;;
   stop)
-	echo -n "Stopping $DESC: $NAME"
-        start-stop-daemon --stop --quiet --pidfile $PIDFILE \
-            --oknodo --exec $DAEMON
-        rm -f $PIDFILE $UML_SWITCH_CTL $UML_SWITCH_DATA
-	echo "."
+	log_daemon_msg "Stopping $DESC" "$NAME"
+        if start-stop-daemon --stop --quiet --pidfile $PIDFILE \
+			--oknodo --exec $DAEMON; then 
+        	rm -f $PIDFILE $UML_SWITCH_CTL $UML_SWITCH_DATA
+		echo "."
+		log_end_msg 0
+	else
+	    log_end_msg 1
+	fi
 	;;
   restart|force-reload)
         $0 stop