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

[winnie at alioth.debian.org]

Author: winnie
Date: 2007-12-16 12:12:49 +0000 (Sun, 16 Dec 2007)
New Revision: 136

Added:
   trunk/debian/patches/09-fix-initscript.dpatch
Removed:
   trunk/debian/patches/09-quiet-grep.dpatch
Modified:
   trunk/debian/changelog
   trunk/debian/patches/00list
   trunk/debian/patches/02-host-module.dpatch
   trunk/debian/rules
Log:
Fix some smaller issues


Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2007-12-15 14:55:09 UTC (rev 135)
+++ trunk/debian/changelog	2007-12-16 12:12:49 UTC (rev 136)
@@ -13,8 +13,13 @@
       from src/VBox/Installer/linux/vboxnet.sh
     - symlinks/directories in packages are now created using debhelper
 
- -- Hilko Bengen <bengen at debian.org>  Fri, 14 Dec 2007 17:57:22 +0100
+  [ Patrick Winnertz ]
+  * Moved initscript again out of debian, we should use the upstream one
+    and created a patch for this one. (in order to fix lintian warning)
+  * Add description to 02-host-module.dpatch
 
+ -- Patrick Winnertz <winnie at debian.org>  Sun, 16 Dec 2007 12:48:24 +0100
+
 virtualbox-ose (1.5.2-dfsg2-4) unstable; urgency=low
 
   [ Patrick Winnertz ]

Modified: trunk/debian/patches/00list
===================================================================
--- trunk/debian/patches/00list	2007-12-15 14:55:09 UTC (rev 135)
+++ trunk/debian/patches/00list	2007-12-16 12:12:49 UTC (rev 136)
@@ -6,7 +6,6 @@
 06-vboxadd-udev.dpatch
 07-xsession.dpatch
 08-no-kernel.dpatch
-09-quiet-grep.dpatch
+09-fix-initscript.dpatch
 10-no-registration.dpatch
 11-module-build.dpatch
-

Modified: trunk/debian/patches/02-host-module.dpatch
===================================================================
--- trunk/debian/patches/02-host-module.dpatch	2007-12-15 14:55:09 UTC (rev 135)
+++ trunk/debian/patches/02-host-module.dpatch	2007-12-16 12:12:49 UTC (rev 136)
@@ -1,7 +1,7 @@
 #!/bin/sh /usr/share/dpatch/dpatch-run
 ## 02-host-module.dpatch by Torsten Werner <twerner at debian.org>
 ##
-## DP: No description.
+## DP: Added KERN_DIR to the HostDrivers Makefile.
 
 @DPATCH@
 

Added: trunk/debian/patches/09-fix-initscript.dpatch
===================================================================
--- trunk/debian/patches/09-fix-initscript.dpatch	                        (rev 0)
+++ trunk/debian/patches/09-fix-initscript.dpatch	2007-12-16 12:12:49 UTC (rev 136)
@@ -0,0 +1,31 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 09-quiet-grep.dpatch by  <michael at feivel.credativ.de>
+## modified by Patrick Winnert <winnie at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Make grep be quiet
+## DP: Add an short description to make lintian silent.
+
+ at DPATCH@
+diff -urNad virtualbox-ose-1.5.2-dfsg2~/src/VBox/Installer/linux/vboxnet.sh virtualbox-ose-1.5.2-dfsg2/src/VBox/Installer/linux/vboxnet.sh
+--- virtualbox-ose-1.5.2-dfsg2~/src/VBox/Installer/linux/vboxnet.sh	2007-12-16 12:43:28.000000000 +0100
++++ virtualbox-ose-1.5.2-dfsg2/src/VBox/Installer/linux/vboxnet.sh	2007-12-16 12:44:51.000000000 +0100
+@@ -23,7 +23,8 @@
+ # Required-Stop:
+ # Default-Start:  3 5
+ # Default-Stop:
+-# Description:    VirtualBox permanent host networking setup
++# Short-Description: Virtualbox permanent host networking setup
++# Description:  This initscript sets up the networking for Virtualbox
+ ### END INIT INFO
+ 
+ PATH=$PATH:/bin:/sbin:/usr/sbin
+@@ -236,7 +237,7 @@
+     done < "$CONFIG"
+     # Set /dev/net/tun to belong to the group vboxusers if it exists and does
+     # yet belong to a group.
+-    if ls -g "$TAPDEV" 2>/dev/null | grep root
++    if ls -g "$TAPDEV" 2>/dev/null | grep -q root
+     then
+       chgrp vboxusers "$TAPDEV"
+       chmod 0660 "$TAPDEV"


Property changes on: trunk/debian/patches/09-fix-initscript.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Deleted: trunk/debian/patches/09-quiet-grep.dpatch
===================================================================
--- trunk/debian/patches/09-quiet-grep.dpatch	2007-12-15 14:55:09 UTC (rev 135)
+++ trunk/debian/patches/09-quiet-grep.dpatch	2007-12-16 12:12:49 UTC (rev 136)
@@ -1,19 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 09-quiet-grep.dpatch by  <michael at feivel.credativ.de>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Make grep be quiet
-
- at DPATCH@
-
---- ./src/VBox/Installer/linux/vboxnet.sh.orig	2007-11-18 12:29:09.000000000 +0100
-+++ ./src/VBox/Installer/linux/vboxnet.sh	2007-11-18 12:29:41.000000000 +0100
-@@ -236,7 +236,7 @@
-     done < "$CONFIG"
-     # Set /dev/net/tun to belong to the group vboxusers if it exists and does
-     # yet belong to a group.
--    if ls -g "$TAPDEV" 2>/dev/null | grep root
-+    if ls -g "$TAPDEV" 2>/dev/null | grep -q root
-     then
-       chgrp vboxusers "$TAPDEV"
-       chmod 0660 "$TAPDEV"

Modified: trunk/debian/rules
===================================================================
--- trunk/debian/rules	2007-12-15 14:55:09 UTC (rev 135)
+++ trunk/debian/rules	2007-12-16 12:12:49 UTC (rev 136)
@@ -90,6 +90,7 @@
 	install -D -m 0644 debian/desktop/virtualbox-ose.desktop debian/$(sname)/usr/share/applications/virtualbox-ose.desktop
 	mv debian/$(sname)/usr/lib/virtualbox/VBox.png debian/$(sname)/usr/share/icons/virtualbox.png
 	install -D -m 0644 debian/pixmap/virtualbox-ose.xpm debian/$(sname)/usr/share/pixmaps/virtualbox-ose.xpm
+	install -D -m 644 src/VBox/Installer/linux/vboxnet.sh debian/$(sname).init
 	install -D -m 644 debian/interfaces debian/$(sname)/etc/vbox
 
 	echo "# VirtualBox installation directory" > $(CURDIR)/debian/$(sname)/etc/vbox/vbox.cfg