[Pkg-virtualbox-commits] r421 - in virtualbox-ose/trunk/debian: . patches

[meskes at alioth.debian.org]

Author: meskes
Date: 2009-01-07 12:28:45 +0000 (Wed, 07 Jan 2009)
New Revision: 421

Modified:
   virtualbox-ose/trunk/debian/changelog
   virtualbox-ose/trunk/debian/patches/08-init-lsb.dpatch
   virtualbox-ose/trunk/debian/patches/09-initscript.dpatch
Log:
Re-creating patches to make the clearer and re-added lost line.


Modified: virtualbox-ose/trunk/debian/changelog
===================================================================
--- virtualbox-ose/trunk/debian/changelog	2009-01-05 13:51:31 UTC (rev 420)
+++ virtualbox-ose/trunk/debian/changelog	2009-01-07 12:28:45 UTC (rev 421)
@@ -2,6 +2,8 @@
 
   * Added versioned build dependency for kbuild. Closes: #510736
   * Added versioned build dependency for qt4. Closes: #510785
+  * Re-created two patches against initscript to make them clearer and to
+    re-add a line lost in the transition. Closes: #474089
 
  -- Michael Meskes <meskes at debian.org>  Sun, 04 Jan 2009 16:58:38 +0100
 

Modified: virtualbox-ose/trunk/debian/patches/08-init-lsb.dpatch
===================================================================
--- virtualbox-ose/trunk/debian/patches/08-init-lsb.dpatch	2009-01-05 13:51:31 UTC (rev 420)
+++ virtualbox-ose/trunk/debian/patches/08-init-lsb.dpatch	2009-01-07 12:28:45 UTC (rev 421)
@@ -8,6 +8,8 @@
 diff -Naurp virtualbox-ose-2.1.0-dfsg.orig/src/VBox/Installer/linux/vboxdrv.sh.in virtualbox-ose-2.1.0-dfsg/src/VBox/Installer/linux/vboxdrv.sh.in
 --- virtualbox-ose-2.1.0-dfsg.orig/src/VBox/Installer/linux/vboxdrv.sh.in	2008-05-09 09:28:11.000000000 +0000
 +++ virtualbox-ose-2.1.0-dfsg/src/VBox/Installer/linux/vboxdrv.sh.in	2008-05-09 09:28:41.000000000 +0000
+--- vboxdrv.sh.in.orig	2009-01-07 13:20:59.000000000 +0100
++++ vboxdrv.sh.in	2009-01-07 13:24:45.000000000 +0100
 @@ -19,8 +19,8 @@
  #
  ### BEGIN INIT INFO
@@ -19,7 +21,17 @@
  # Default-Start:  2 3 4 5
  # Default-Stop:   0 1 6
  # Short-Description: VirtualBox Linux kernel module
-@@ -61,13 +61,12 @@
+@@ -32,7 +32,7 @@
+ LOG="/var/log/vbox-install.log"
+ NOLSB=%NOLSB%
+ 
+-[ -f /lib/lsb/init-functions ] || NOLSB=yes
++[ -f /lib/lsb/init-functions ] && NOLSB=
+ [ -f /etc/vbox/vbox.cfg ] && . /etc/vbox/vbox.cfg
+ 
+ if [ -n "$INSTALL_DIR" ]; then
+@@ -60,14 +60,13 @@
+ if [ -z "$NOLSB" ]; then
      . /lib/lsb/init-functions
      fail_msg() {
 -        echo ""

Modified: virtualbox-ose/trunk/debian/patches/09-initscript.dpatch
===================================================================
--- virtualbox-ose/trunk/debian/patches/09-initscript.dpatch	2009-01-05 13:51:31 UTC (rev 420)
+++ virtualbox-ose/trunk/debian/patches/09-initscript.dpatch	2009-01-07 12:28:45 UTC (rev 421)
@@ -8,17 +8,16 @@
 diff -Naurp virtualbox-ose-2.1.0-dfsg.orig/src/VBox/Installer/linux/vboxdrv.sh.in virtualbox-ose-2.1.0-dfsg/src/VBox/Installer/linux/vboxdrv.sh.in
 --- virtualbox-ose-2.1.0-dfsg.orig/src/VBox/Installer/linux/vboxdrv.sh.in	2008-12-18 16:30:08.000000000 +0100
 +++ virtualbox-ose-2.1.0-dfsg/src/VBox/Installer/linux/vboxdrv.sh.in		2008-12-18 16:36:51.000000000 +0100
-@@ -32,7 +32,8 @@
+@@ -32,6 +32,8 @@
  LOG="/var/log/vbox-install.log"
  NOLSB=%NOLSB%
  
--[ -f /lib/lsb/init-functions ] || NOLSB=yes
 +# Include virtualbox-ose defaults if available
 +[ -f /etc/default/virtualbox-ose ] && . /etc/default/virtualbox-ose
+ [ -f /lib/lsb/init-functions ] && NOLSB=
  [ -f /etc/vbox/vbox.cfg ] && . /etc/vbox/vbox.cfg
  
- if [ -n "$INSTALL_DIR" ]; then
-@@ -150,8 +151,10 @@
+@@ -153,8 +155,10 @@
          if ! rm -f $DEVICE; then
              failure "Cannot remove $DEVICE"
          fi
@@ -31,7 +30,7 @@
          fi
          sleep .2
      fi
-@@ -181,8 +184,10 @@
+@@ -184,8 +188,10 @@
          rmmod vboxdrv 2>/dev/null
          failure "Cannot change owner $GROUPNAME for device $DEVICE"
      fi