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

[meskes at alioth.debian.org]

Author: meskes
Date: 2008-12-19 13:49:18 +0000 (Fri, 19 Dec 2008)
New Revision: 407

Added:
   virtualbox-ose/trunk/debian/patches/15_vboxnetflt.dpatch
Modified:
   virtualbox-ose/trunk/debian/changelog
   virtualbox-ose/trunk/debian/patches/00list
   virtualbox-ose/trunk/debian/rules
   virtualbox-ose/trunk/debian/virtualbox-ose.install
   virtualbox-ose/trunk/debian/virtualbox-ose.links
Log:
Getting the package to build, not tested yet.



Modified: virtualbox-ose/trunk/debian/changelog
===================================================================
--- virtualbox-ose/trunk/debian/changelog	2008-12-18 15:52:05 UTC (rev 406)
+++ virtualbox-ose/trunk/debian/changelog	2008-12-19 13:49:18 UTC (rev 407)
@@ -1,6 +1,7 @@
 virtualbox-ose (2.1.0-dfsg-1) experimental; urgency=low
 
   * New upstream version.
+  * Removed obsoleted vditool and VBoxAddIF.sh.
 
  -- Michael Meskes <meskes at debian.org>  Thu, 18 Dec 2008 12:49:34 +0100
 

Modified: virtualbox-ose/trunk/debian/patches/00list
===================================================================
--- virtualbox-ose/trunk/debian/patches/00list	2008-12-18 15:52:05 UTC (rev 406)
+++ virtualbox-ose/trunk/debian/patches/00list	2008-12-19 13:49:18 UTC (rev 407)
@@ -10,3 +10,4 @@
 12-make-module.dpatch
 13-module-mismatch.dpatch
 14-disable-registration-request.dpatch
+15_vboxnetflt.dpatch

Added: virtualbox-ose/trunk/debian/patches/15_vboxnetflt.dpatch
===================================================================
--- virtualbox-ose/trunk/debian/patches/15_vboxnetflt.dpatch	                        (rev 0)
+++ virtualbox-ose/trunk/debian/patches/15_vboxnetflt.dpatch	2008-12-19 13:49:18 UTC (rev 407)
@@ -0,0 +1,27 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 15_vboxnetflt.dpatch by Michael Meskes <meskes at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Do not build vboxnetflt module.
+
+ at DPATCH@
+
+--- virtualbox-ose-2.1.0-dfsg/src/VBox/HostDrivers/Makefile.kmk.orig	2008-12-19 08:51:31.000000000 +0100
++++ virtualbox-ose-2.1.0-dfsg/src/VBox/HostDrivers/Makefile.kmk	2008-12-19 08:51:48.000000000 +0100
+@@ -32,11 +32,11 @@
+  ifdef VBOX_WITH_USB
+   include $(PATH_SUB_CURRENT)/VBoxUSB/Makefile.kmk
+  endif
+- if1of ($(KBUILD_TARGET), darwin solaris win linux)
+-  ifdef VBOX_WITH_NETFLT
+-   include $(PATH_SUB_CURRENT)/VBoxNetFlt/Makefile.kmk
+-  endif
+- endif
++# if1of ($(KBUILD_TARGET), darwin solaris win linux)
++#  ifdef VBOX_WITH_NETFLT
++#   include $(PATH_SUB_CURRENT)/VBoxNetFlt/Makefile.kmk
++#  endif
++# endif
+ 
+  ifeq ($(KBUILD_TARGET),linux)
+   #

Modified: virtualbox-ose/trunk/debian/rules
===================================================================
--- virtualbox-ose/trunk/debian/rules	2008-12-18 15:52:05 UTC (rev 406)
+++ virtualbox-ose/trunk/debian/rules	2008-12-19 13:49:18 UTC (rev 407)
@@ -48,12 +48,9 @@
 	. ./env.sh; $(MAKE) \
 		BUILD_TYPE=release \
 		PATH_OUT=$(abspath out)
-	# make sure VBoxAddIF.sh is built, too
-	$(MAKE) -C src/VBox/Installer/linux $(abspath out/bin/VBoxAddIF.sh) \
+	# and vboxdrv.sh
+	$(MAKE) -C src/VBox/Installer/linux $(abspath out/obj/Installer/linux/vboxdrv.sh) \
 		PATH_OUT=$(abspath out)
-	# and vboxnet.sh
-	$(MAKE) -C src/VBox/Installer/linux $(abspath out/obj/src/VBox/Installer/linux/vboxnet.sh) \
-		PATH_OUT=$(abspath out)
 	touch $@
 
 clean: unpatch
@@ -99,7 +96,7 @@
 	dh_clean -k
 	dh_installdirs
 	# This will get installed into the package by dh_installinit
-	install -m 644 out/obj/src/VBox/Installer/linux/vboxnet.sh debian/$(sname).init
+	install -m 644 out/obj/Installer/linux/vboxdrv.sh debian/$(sname).init
 	# Install helper scripts for vbox* interfaces
 	dh_installifupdown -p$(sname)
 

Modified: virtualbox-ose/trunk/debian/virtualbox-ose.install
===================================================================
--- virtualbox-ose/trunk/debian/virtualbox-ose.install	2008-12-18 15:52:05 UTC (rev 406)
+++ virtualbox-ose/trunk/debian/virtualbox-ose.install	2008-12-19 13:49:18 UTC (rev 407)
@@ -19,13 +19,11 @@
 out/bin/VBoxSVC /usr/lib/virtualbox
 out/bin/VBoxTunctl /usr/lib/virtualbox
 out/bin/VBoxXPCOM* /usr/lib/virtualbox
-out/bin/vditool /usr/lib/virtualbox
 out/bin/VirtualBox* /usr/lib/virtualbox
 out/bin/VMM* /usr/lib/virtualbox
 
 out/bin/nls /usr/share/virtualbox
 out/bin/sdk /usr/share/virtualbox
 out/bin/VBox.png /usr/share/virtualbox
-out/bin/VBoxAddIF.sh /usr/share/virtualbox
 
 out/obj/xpidl /usr/lib/virtualbox

Modified: virtualbox-ose/trunk/debian/virtualbox-ose.links
===================================================================
--- virtualbox-ose/trunk/debian/virtualbox-ose.links	2008-12-18 15:52:05 UTC (rev 406)
+++ virtualbox-ose/trunk/debian/virtualbox-ose.links	2008-12-19 13:49:18 UTC (rev 407)
@@ -1,6 +1,5 @@
 /usr/lib/virtualbox/xpidl /usr/share/virtualbox/sdk/bin/xpidl
 
-/usr/share/virtualbox/VBox.sh /usr/bin/vditool
 /usr/share/virtualbox/VBox.sh /usr/bin/vboxheadless
 /usr/share/virtualbox/VBox.sh /usr/bin/vboxmanage
 /usr/share/virtualbox/VBox.sh /usr/bin/vboxsdl