[Pkg-virtualbox-commits] r411 - in virtualbox-ose/trunk/debian: . virtualbox-ose-source.files

[meskes at alioth.debian.org]

Author: meskes
Date: 2008-12-28 17:15:00 +0000 (Sun, 28 Dec 2008)
New Revision: 411

Added:
   virtualbox-ose/trunk/debian/virtualbox-ose-source.files/Makefile
Modified:
   virtualbox-ose/trunk/debian/changelog
   virtualbox-ose/trunk/debian/virtualbox-ose-source.files/rules
   virtualbox-ose/trunk/debian/virtualbox-ose-source.install
   virtualbox-ose/trunk/debian/virtualbox-ose-source.links
Log:
Changed -source file to build and install both modules.



Modified: virtualbox-ose/trunk/debian/changelog
===================================================================
--- virtualbox-ose/trunk/debian/changelog	2008-12-28 16:27:44 UTC (rev 410)
+++ virtualbox-ose/trunk/debian/changelog	2008-12-28 17:15:00 UTC (rev 411)
@@ -1,6 +1,7 @@
 virtualbox-ose (2.1.0-dfsg-1) experimental; urgency=low
 
-  * New upstream version.
+  * New upstream version
+    This one doesn't use /dev/net/tun anymore. Closes: #509524
   * Removed obsoleted vditool and VBoxAddIF.sh.
 
  -- Michael Meskes <meskes at debian.org>  Thu, 18 Dec 2008 12:49:34 +0100

Copied: virtualbox-ose/trunk/debian/virtualbox-ose-source.files/Makefile (from rev 409, virtualbox-ose/trunk/debian/virtualbox-ose-guest-source.files/Makefile)
===================================================================
--- virtualbox-ose/trunk/debian/virtualbox-ose-source.files/Makefile	                        (rev 0)
+++ virtualbox-ose/trunk/debian/virtualbox-ose-source.files/Makefile	2008-12-28 17:15:00 UTC (rev 411)
@@ -0,0 +1,3 @@
+.NOTPARALLEL:
+
+obj-m = vboxdrv/ vboxnetflt/


Property changes on: virtualbox-ose/trunk/debian/virtualbox-ose-source.files/Makefile
___________________________________________________________________
Name: svn:mergeinfo
   + 

Modified: virtualbox-ose/trunk/debian/virtualbox-ose-source.files/rules
===================================================================
--- virtualbox-ose/trunk/debian/virtualbox-ose-source.files/rules	2008-12-28 16:27:44 UTC (rev 410)
+++ virtualbox-ose/trunk/debian/virtualbox-ose-source.files/rules	2008-12-28 17:15:00 UTC (rev 411)
@@ -54,7 +54,8 @@
 	# Build the module
 	$(MAKE) -C $(KSRC) M=$(CURDIR)
 	# Install the module
-	dh_install vboxdrv.ko /lib/modules/$(KVERS)/misc/
+	dh_install vboxdrv/vboxdrv.ko /lib/modules/$(KVERS)/misc/
+	dh_install vboxnetflt/vboxnetflt.ko /lib/modules/$(KVERS)/misc/
 	dh_installdocs
 	dh_installchangelogs
 	dh_compress

Modified: virtualbox-ose/trunk/debian/virtualbox-ose-source.install
===================================================================
--- virtualbox-ose/trunk/debian/virtualbox-ose-source.install	2008-12-28 16:27:44 UTC (rev 410)
+++ virtualbox-ose/trunk/debian/virtualbox-ose-source.install	2008-12-28 17:15:00 UTC (rev 411)
@@ -1,4 +1,31 @@
-out/bin/src/* /usr/src/modules/virtualbox-ose
+out/bin/src/vboxdrv/*.* /usr/src/modules/virtualbox-ose/vboxdrv
+out/bin/src/vboxdrv/build_in_tmp /usr/src/modules/virtualbox-ose/vboxdrv
+out/bin/src/vboxdrv/linux /usr/src/modules/virtualbox-ose/vboxdrv
+out/bin/src/vboxdrv/Makefile /usr/src/modules/virtualbox-ose/vboxdrv
 
+out/bin/src/vboxnetflt/*.* /usr/src/modules/virtualbox-ose/vboxnetflt
+out/bin/src/vboxnetflt/build_in_tmp /usr/src/modules/virtualbox-ose/vboxnetflt
+out/bin/src/vboxnetflt/linux /usr/src/modules/virtualbox-ose/vboxnetflt
+out/bin/src/vboxnetflt/Makefile /usr/src/modules/virtualbox-ose/vboxnetflt
+
+out/bin/src/vboxdrv/SUPDrvIDC.h /usr/src/modules/virtualbox-ose/include/
+out/bin/src/vboxdrv/version-generated.h /usr/src/modules/virtualbox-ose/include/
+out/bin/src/vboxdrv/include/iprt/* /usr/src/modules/virtualbox-ose/include/iprt
+out/bin/src/vboxdrv/include/VBox/* /usr/src/modules/virtualbox-ose/include/VBox
+out/bin/src/vboxdrv/include/internal/* /usr/src/modules/virtualbox-ose/include/internal
+
+out/bin/src/vboxnetflt/include/iprt/* /usr/src/modules/virtualbox-ose/include/iprt
+out/bin/src/vboxnetflt/include/VBox/* /usr/src/modules/virtualbox-ose/include/VBox
+out/bin/src/vboxnetflt/include/internal/* /usr/src/modules/virtualbox-ose/include/internal
+
+out/bin/src/vboxdrv/r0drv /usr/src/modules/virtualbox-ose
+out/bin/src/vboxdrv/alloc /usr/src/modules/virtualbox-ose
+out/bin/src/vboxnetflt/common /usr/src/modules/virtualbox-ose
+out/bin/src/vboxnetflt/generic /usr/src/modules/virtualbox-ose
+out/bin/src/vboxdrv/math /usr/src/modules/virtualbox-ose
+out/bin/src/vboxdrv/VBox /usr/src/modules/virtualbox-ose
+
+out/bin/src/vboxnetflt/SUPR0IdcClientInternal.h /usr/src/modules/virtualbox-ose/
+
 debian/control debian/changelog debian/copyright debian/compat /usr/src/modules/virtualbox-ose/debian
 debian/virtualbox-ose-source.files/* /usr/src/modules/virtualbox-ose/debian

Modified: virtualbox-ose/trunk/debian/virtualbox-ose-source.links
===================================================================
--- virtualbox-ose/trunk/debian/virtualbox-ose-source.links	2008-12-28 16:27:44 UTC (rev 410)
+++ virtualbox-ose/trunk/debian/virtualbox-ose-source.links	2008-12-28 17:15:00 UTC (rev 411)
@@ -1 +1,15 @@
 /usr/share/modass/packages/default.sh   /usr/share/modass/overrides/virtualbox-ose-source
+/usr/src/modules/virtualbox-ose/r0drv /usr/src/modules/virtualbox-ose/vboxdrv/r0drv
+/usr/src/modules/virtualbox-ose/r0drv /usr/src/modules/virtualbox-ose/vboxnetflt/r0drv
+/usr/src/modules/virtualbox-ose/include /usr/src/modules/virtualbox-ose/vboxdrv/include
+/usr/src/modules/virtualbox-ose/include /usr/src/modules/virtualbox-ose/vboxnetflt/include
+/usr/src/modules/virtualbox-ose/alloc /usr/src/modules/virtualbox-ose/vboxdrv/alloc
+/usr/src/modules/virtualbox-ose/alloc /usr/src/modules/virtualbox-ose/vboxnetflt/alloc
+/usr/src/modules/virtualbox-ose/common /usr/src/modules/virtualbox-ose/vboxdrv/common
+/usr/src/modules/virtualbox-ose/common /usr/src/modules/virtualbox-ose/vboxnetflt/common
+/usr/src/modules/virtualbox-ose/generic /usr/src/modules/virtualbox-ose/vboxdrv/generic
+/usr/src/modules/virtualbox-ose/generic /usr/src/modules/virtualbox-ose/vboxnetflt/generic
+/usr/src/modules/virtualbox-ose/math /usr/src/modules/virtualbox-ose/vboxdrv/math
+/usr/src/modules/virtualbox-ose/math /usr/src/modules/virtualbox-ose/vboxnetflt/math
+/usr/src/modules/virtualbox-ose/VBox /usr/src/modules/virtualbox-ose/vboxdrv/VBox
+/usr/src/modules/virtualbox-ose/VBox /usr/src/modules/virtualbox-ose/vboxnetflt/VBox