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

[meskes at alioth.debian.org]

Author: meskes
Date: 2008-11-23 11:41:17 +0000 (Sun, 23 Nov 2008)
New Revision: 382

Modified:
   virtualbox-ose/trunk/debian/patches/03-localconf-kmk.dpatch
   virtualbox-ose/trunk/debian/rules
Log:
Build guest utils on amd64



Modified: virtualbox-ose/trunk/debian/patches/03-localconf-kmk.dpatch
===================================================================
--- virtualbox-ose/trunk/debian/patches/03-localconf-kmk.dpatch	2008-11-22 18:37:23 UTC (rev 381)
+++ virtualbox-ose/trunk/debian/patches/03-localconf-kmk.dpatch	2008-11-23 11:41:17 UTC (rev 382)
@@ -7,14 +7,15 @@
 
 @DPATCH@
 
-diff -Naurp virtualbox-ose-1.6.0-dfsg.orig/LocalConfig.kmk virtualbox-ose-1.6.0-dfsg/LocalConfig.kmk
---- virtualbox-ose-1.6.0-dfsg.orig/LocalConfig.kmk	1970-01-01 00:00:00.000000000 +0000
-+++ virtualbox-ose-1.6.0-dfsg/LocalConfig.kmk	2008-05-09 09:25:16.000000000 +0000
-@@ -0,0 +1,12 @@
+diff -Naurp virtualbox-ose-2.0.4-dfsg.orig/LocalConfig.kmk virtualbox-ose-2.0.4-dfsg/LocalConfig.kmk
+--- virtualbox-ose-2.0.4-dfsg.orig/LocalConfig.kmk	2008-11-23 11:52:44.000000000 +0100
++++ virtualbox-ose-2.0.4-dfsg/LocalConfig.kmk	2008-11-23 11:53:14.000000000 +0100
+@@ -0,0 +1,13 @@
 +VBOX_WITH_ADDITION_DRIVERS =
 +VBOX_ADDITIONS_LINUX_ONLY =
 +VBOX_WITH_INSTALLER = 1
 +VBOX_WITH_LINUX_ADDITIONS = 1
++VBOX_WITH_X11_ADDITIONS = 1
 +VBOX_WITH_TESTCASES =
 +VBOX_WITH_TESTSUITE =
 +VBOX_WITH_USB =

Modified: virtualbox-ose/trunk/debian/rules
===================================================================
--- virtualbox-ose/trunk/debian/rules	2008-11-22 18:37:23 UTC (rev 381)
+++ virtualbox-ose/trunk/debian/rules	2008-11-23 11:41:17 UTC (rev 382)
@@ -19,11 +19,6 @@
 
 DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
 
-VBOX_WITH_X11_ADDITIONS :=
-ifeq ($(filter-out i386 lpia,$(DEB_HOST_ARCH)),)
-VBOX_WITH_X11_ADDITIONS := 1
-endif
-
 # Generate README.Debian as text/html ...
 debian/README.Debian.html: debian/virtualbox-ose.README.Debian.xml
 	xsltproc --nonet --stringparam section.autolabel 1 \
@@ -44,11 +39,6 @@
 	    --disable-kmods \
 	    --with-gcc=/usr/bin/gcc-4.2 \
 	    --with-g++=/usr/bin/g++-4.2
-ifeq ($(VBOX_WITH_X11_ADDITIONS),)
-	echo "VBOX_WITH_X11_ADDITIONS=" >>LocalConfig.kmk
-else
-	echo "VBOX_WITH_X11_ADDITIONS=1" >>LocalConfig.kmk
-endif
 
 build: build-stamp
 build-stamp: env.sh