[Pkg-virtualbox-commits] r269 - in trunk/debian: . patches
daniel at alioth.debian.org
daniel at alioth.debian.org
Fri May 9 09:32:59 UTC 2008
Author: daniel
Date: 2008-05-09 09:32:58 +0000 (Fri, 09 May 2008)
New Revision: 269
Modified:
trunk/debian/changelog
trunk/debian/patches/01-no-64bit-guest.dpatch
trunk/debian/patches/03-config-kmk.dpatch
trunk/debian/patches/04-localconf-kmk.dpatch
trunk/debian/patches/05-vboxdrv-references.dpatch
trunk/debian/patches/06-vboxadd-udev.dpatch
trunk/debian/patches/07-xsession.dpatch
trunk/debian/patches/08-init-fail.dpatch
trunk/debian/patches/09-init-lsb.dpatch
trunk/debian/patches/10-initscript.dpatch
trunk/debian/patches/11-workaround-gcc-ice.dpatch
trunk/debian/patches/12-gcc-4.3.dpatch
trunk/debian/patches/13-make-module.dpatch
Log:
Rediffing all patches.
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2008-05-09 08:26:41 UTC (rev 268)
+++ trunk/debian/changelog 2008-05-09 09:32:58 UTC (rev 269)
@@ -23,6 +23,7 @@
virtualbox-ose-*source.README.Debian.
* Removing some reimported useless whitespaces.
* Removing ffmpeg recursively in dfsg-free target in rules.
+ * Rediffing all patches.
-- Michael Meskes <meskes at debian.org> Fri, 02 May 2008 10:14:01 +0200
Modified: trunk/debian/patches/01-no-64bit-guest.dpatch
===================================================================
--- trunk/debian/patches/01-no-64bit-guest.dpatch 2008-05-09 08:26:41 UTC (rev 268)
+++ trunk/debian/patches/01-no-64bit-guest.dpatch 2008-05-09 09:32:58 UTC (rev 269)
@@ -5,9 +5,10 @@
@DPATCH@
---- virtualbox-ose-1.6.0-dfsg.orig/configure 2007-12-28 16:28:21.000000000 +0000
-+++ virtualbox-ose-1.6.0-dfsg/configure 2007-12-30 06:28:14.000000000 +0000
-@@ -248,7 +248,7 @@ check_environment()
+diff -Naurp virtualbox-ose-1.6.0-dfsg.orig/configure virtualbox-ose-1.6.0-dfsg/configure
+--- virtualbox-ose-1.6.0-dfsg.orig/configure 2008-04-30 14:06:04.000000000 +0000
++++ virtualbox-ose-1.6.0-dfsg/configure 2008-05-09 09:23:52.000000000 +0000
+@@ -263,7 +263,7 @@ check_environment()
exit 1
;;
esac
@@ -16,9 +17,10 @@
[ "$OS" = "solaris" ] && BUILD_CPU=`isainfo | cut -f 1 -d ' '`
case "$BUILD_CPU" in
i[3456789]86|x86|i86pc)
---- virtualbox-ose-1.6.0-dfsg/src/VBox/Additions/linux/sharedfolders/Makefile.kmk.orig 2008-05-01 18:19:25.000000000 +0200
-+++ virtualbox-ose-1.6.0-dfsg/src/VBox/Additions/linux/sharedfolders/Makefile.kmk 2008-05-01 18:19:57.000000000 +0200
-@@ -23,7 +23,9 @@
+diff -Naurp virtualbox-ose-1.6.0-dfsg.orig/src/VBox/Additions/linux/sharedfolders/Makefile.kmk virtualbox-ose-1.6.0-dfsg/src/VBox/Additions/linux/sharedfolders/Makefile.kmk
+--- virtualbox-ose-1.6.0-dfsg.orig/src/VBox/Additions/linux/sharedfolders/Makefile.kmk 2008-04-30 14:05:58.000000000 +0000
++++ virtualbox-ose-1.6.0-dfsg/src/VBox/Additions/linux/sharedfolders/Makefile.kmk 2008-05-09 09:23:52.000000000 +0000
+@@ -23,7 +23,9 @@ DEPTH ?= ../../../../..
SUB_DEPTH = ../..
include $(PATH_KBUILD)/subheader.kmk
Modified: trunk/debian/patches/03-config-kmk.dpatch
===================================================================
--- trunk/debian/patches/03-config-kmk.dpatch 2008-05-09 08:26:41 UTC (rev 268)
+++ trunk/debian/patches/03-config-kmk.dpatch 2008-05-09 09:32:58 UTC (rev 269)
@@ -6,9 +6,10 @@
@DPATCH@
---- virtualbox-ose-1.6.0-dfsg/Config.kmk.orig 2008-05-01 18:24:58.000000000 +0200
-+++ virtualbox-ose-1.6.0-dfsg/Config.kmk 2008-05-01 18:25:43.000000000 +0200
-@@ -970,7 +970,7 @@
+diff -Naurp virtualbox-ose-1.6.0-dfsg.orig/Config.kmk virtualbox-ose-1.6.0-dfsg/Config.kmk
+--- virtualbox-ose-1.6.0-dfsg.orig/Config.kmk 2008-04-30 20:06:49.000000000 +0000
++++ virtualbox-ose-1.6.0-dfsg/Config.kmk 2008-05-09 09:24:39.000000000 +0000
+@@ -970,7 +970,7 @@ VBOX_PATH_DIFX ?= $(PATH_DEVTOOLS)/win.$
# We need to export YASM for OSE, but since it was converted to .zip we need to
# allow for the location used by the zip to be properly cleaned up first.
if1of ($(BUILD_PLATFORM).$(BUILD_PLATFORM_ARCH), win.x86 linux.x86 solaris.x86)
@@ -17,7 +18,7 @@
endif
# XPCOM setup for all but win32.
-@@ -1456,7 +1456,7 @@
+@@ -1456,7 +1456,7 @@ if1of ($(BUILD_TARGET), linux)
kernelsrc := $(shell $(SED_EXT) -ne 's+^KERNELSRC.*= *\(.*\)+\1+p' $(VBOX_LINUX_SRC)/Makefile)
ifneq ($(kernelsrc),)
kernelpath := $(realpath $(VBOX_LINUX_SRC)/$(kernelsrc))
Modified: trunk/debian/patches/04-localconf-kmk.dpatch
===================================================================
--- trunk/debian/patches/04-localconf-kmk.dpatch 2008-05-09 08:26:41 UTC (rev 268)
+++ trunk/debian/patches/04-localconf-kmk.dpatch 2008-05-09 09:32:58 UTC (rev 269)
@@ -7,9 +7,9 @@
@DPATCH@
-diff -Naurp virtualbox-ose-1.5.4-dfsg.orig/LocalConfig.kmk virtualbox-ose-1.5.4-dfsg/LocalConfig.kmk
---- virtualbox-ose-1.5.4-dfsg.orig/LocalConfig.kmk 1970-01-01 00:00:00.000000000 +0000
-+++ virtualbox-ose-1.5.4-dfsg/LocalConfig.kmk 2007-12-30 06:30:31.000000000 +0000
+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 @@
+VBOX_WITH_ADDITION_DRIVERS =
+VBOX_ADDITIONS_LINUX_ONLY =
Modified: trunk/debian/patches/05-vboxdrv-references.dpatch
===================================================================
--- trunk/debian/patches/05-vboxdrv-references.dpatch 2008-05-09 08:26:41 UTC (rev 268)
+++ trunk/debian/patches/05-vboxdrv-references.dpatch 2008-05-09 09:32:58 UTC (rev 269)
@@ -6,9 +6,10 @@
@DPATCH@
---- virtualbox-ose-1.6.0-dfsg/src/VBox/VMM/VM.cpp.orig 2008-05-01 18:27:14.000000000 +0200
-+++ virtualbox-ose-1.6.0-dfsg/src/VBox/VMM/VM.cpp 2008-05-01 18:28:25.000000000 +0200
-@@ -257,10 +257,8 @@
+diff -Naurp virtualbox-ose-1.6.0-dfsg.orig/src/VBox/VMM/VM.cpp virtualbox-ose-1.6.0-dfsg/src/VBox/VMM/VM.cpp
+--- virtualbox-ose-1.6.0-dfsg.orig/src/VBox/VMM/VM.cpp 2008-04-30 14:05:26.000000000 +0000
++++ virtualbox-ose-1.6.0-dfsg/src/VBox/VMM/VM.cpp 2008-05-09 09:25:54.000000000 +0000
+@@ -257,10 +257,8 @@ VMR3DECL(int) VMR3Create(PFNVMATERROR
{
case VERR_VM_DRIVER_LOAD_ERROR:
#ifdef RT_OS_LINUX
@@ -21,7 +22,7 @@
#else
pszError = N_("VirtualBox kernel driver not loaded");
#endif
-@@ -280,10 +278,8 @@
+@@ -280,10 +278,8 @@ VMR3DECL(int) VMR3Create(PFNVMATERROR
break;
case VERR_VM_DRIVER_NOT_INSTALLED:
#ifdef RT_OS_LINUX
Modified: trunk/debian/patches/06-vboxadd-udev.dpatch
===================================================================
--- trunk/debian/patches/06-vboxadd-udev.dpatch 2008-05-09 08:26:41 UTC (rev 268)
+++ trunk/debian/patches/06-vboxadd-udev.dpatch 2008-05-09 09:32:58 UTC (rev 269)
@@ -6,10 +6,10 @@
@DPATCH@
-diff -Naurp virtualbox-ose-1.6.0-dfsg/src/VBox/Additions/linux/module/vboxmod.c.orig virtualbox-ose-1.6.0-dfsg/src/VBox/Additions/linux/module/vboxmod.c
---- virtualbox-ose-1.6.0-dfsg/src/VBox/Additions/linux/module/vboxmod.c.orig 2008-05-01 18:30:44.000000000 +0200
-+++ virtualbox-ose-1.6.0-dfsg/src/VBox/Additions/linux/module/vboxmod.c 2008-05-01 18:35:30.000000000 +0200
-@@ -71,6 +71,7 @@
+diff -Naurp virtualbox-ose-1.6.0-dfsg.orig/src/VBox/Additions/linux/module/vboxmod.c virtualbox-ose-1.6.0-dfsg/src/VBox/Additions/linux/module/vboxmod.c
+--- virtualbox-ose-1.6.0-dfsg.orig/src/VBox/Additions/linux/module/vboxmod.c 2008-04-30 14:05:58.000000000 +0000
++++ virtualbox-ose-1.6.0-dfsg/src/VBox/Additions/linux/module/vboxmod.c 2008-05-09 09:26:26.000000000 +0000
+@@ -71,6 +71,7 @@ do { \
#include <VBox/VBoxDev.h>
#include <iprt/asm.h>
#include <iprt/assert.h>
@@ -17,7 +17,7 @@
#define xstr(s) str(s)
#define str(s) #s
-@@ -582,6 +583,13 @@
+@@ -582,6 +583,13 @@ static struct file_operations vbox_fops
.llseek = no_llseek
};
@@ -31,7 +31,7 @@
#ifndef IRQ_RETVAL
/* interrupt handlers in 2.4 kernels don't return anything */
# define irqreturn_t void
-@@ -851,17 +859,22 @@
+@@ -851,17 +859,22 @@ static __init int init(void)
LogRel(("Starting VirtualBox version %s Guest Additions\n",
VBOX_VERSION_STRING));
/* register a character device */
@@ -63,7 +63,7 @@
/* allocate and initialize device extension */
vboxDev = kmalloc(sizeof(*vboxDev), GFP_KERNEL);
-@@ -1029,7 +1042,10 @@
+@@ -1029,7 +1042,10 @@ static __init int init(void)
fail:
PCI_DEV_PUT(pcidev);
free_resources();
@@ -75,7 +75,7 @@
return err;
}
-@@ -1039,7 +1055,10 @@
+@@ -1039,7 +1055,10 @@ fail:
*/
static __exit void fini(void)
{
Modified: trunk/debian/patches/07-xsession.dpatch
===================================================================
--- trunk/debian/patches/07-xsession.dpatch 2008-05-09 08:26:41 UTC (rev 268)
+++ trunk/debian/patches/07-xsession.dpatch 2008-05-09 09:32:58 UTC (rev 269)
@@ -6,8 +6,8 @@
@DPATCH@
diff -Naurp virtualbox-ose-1.6.0-dfsg.orig/src/VBox/Additions/x11/installer/98vboxadd-xclient virtualbox-ose-1.6.0-dfsg/src/VBox/Additions/x11/installer/98vboxadd-xclient
---- virtualbox-ose-1.6.0-dfsg.orig/src/VBox/Additions/x11/installer/98vboxadd-xclient 2008-05-05 13:34:31.000000000 +0200
-+++ virtualbox-ose-1.6.0-dfsg/src/VBox/Additions/x11/installer/98vboxadd-xclient 2008-05-05 13:34:49.000000000 +0200
+--- virtualbox-ose-1.6.0-dfsg.orig/src/VBox/Additions/x11/installer/98vboxadd-xclient 2008-04-30 14:05:59.000000000 +0000
++++ virtualbox-ose-1.6.0-dfsg/src/VBox/Additions/x11/installer/98vboxadd-xclient 2008-05-09 09:26:59.000000000 +0000
@@ -17,5 +17,5 @@
# additional information or have any questions.
#
Modified: trunk/debian/patches/08-init-fail.dpatch
===================================================================
--- trunk/debian/patches/08-init-fail.dpatch 2008-05-09 08:26:41 UTC (rev 268)
+++ trunk/debian/patches/08-init-fail.dpatch 2008-05-09 09:32:58 UTC (rev 269)
@@ -5,10 +5,11 @@
## DP: Fix some failures in init script.
@DPATCH@
-diff -urNad virtualbox-ose-1.6.0-dfsg/src/VBox/Installer/linux/vboxnet.sh.in.orig virtualbox-ose-1.6.0-dfsg/src/VBox/Installer/linux/vboxnet.sh.in
---- virtualbox-ose-1.6.0-dfsg/src/VBox/Installer/linux/vboxnet.sh.in.orig 2008-05-01 18:37:12.000000000 +0200
-+++ virtualbox-ose-1.6.0-dfsg/src/VBox/Installer/linux/vboxnet.sh.in 2008-05-01 18:38:51.000000000 +0200
-@@ -49,6 +49,7 @@
+
+diff -Naurp virtualbox-ose-1.6.0-dfsg.orig/src/VBox/Installer/linux/vboxnet.sh.in virtualbox-ose-1.6.0-dfsg/src/VBox/Installer/linux/vboxnet.sh.in
+--- virtualbox-ose-1.6.0-dfsg.orig/src/VBox/Installer/linux/vboxnet.sh.in 2008-04-30 14:05:52.000000000 +0000
++++ virtualbox-ose-1.6.0-dfsg/src/VBox/Installer/linux/vboxnet.sh.in 2008-05-09 09:28:11.000000000 +0000
+@@ -49,6 +49,7 @@ fi
if [ -z "$NOLSB" ]; then
. /lib/lsb/init-functions
fail_msg() {
Modified: trunk/debian/patches/09-init-lsb.dpatch
===================================================================
--- trunk/debian/patches/09-init-lsb.dpatch 2008-05-09 08:26:41 UTC (rev 268)
+++ trunk/debian/patches/09-init-lsb.dpatch 2008-05-09 09:32:58 UTC (rev 269)
@@ -5,10 +5,11 @@
## DP: Make initscript lsb cmpliant.
@DPATCH@
-diff -urNad virtualbox-ose~/src/VBox/Installer/linux/vboxnet.sh.in virtualbox-ose/src/VBox/Installer/linux/vboxnet.sh.in
---- virtualbox-ose~/src/VBox/Installer/linux/vboxnet.sh.in 2008-02-20 14:47:20.000000000 +0100
-+++ virtualbox-ose/src/VBox/Installer/linux/vboxnet.sh.in 2008-02-21 00:57:47.000000000 +0100
-@@ -19,10 +19,10 @@
+
+diff -Naurp virtualbox-ose-1.6.0-dfsg.orig/src/VBox/Installer/linux/vboxnet.sh.in virtualbox-ose-1.6.0-dfsg/src/VBox/Installer/linux/vboxnet.sh.in
+--- virtualbox-ose-1.6.0-dfsg.orig/src/VBox/Installer/linux/vboxnet.sh.in 2008-05-09 09:28:11.000000000 +0000
++++ virtualbox-ose-1.6.0-dfsg/src/VBox/Installer/linux/vboxnet.sh.in 2008-05-09 09:28:41.000000000 +0000
+@@ -20,10 +20,10 @@
#
### BEGIN INIT INFO
# Provides: vboxnet
@@ -23,8 +24,7 @@
# Description: VirtualBox permanent host networking setup
### END INIT INFO
-@@ -49,15 +49,14 @@
- if [ -z "$NOLSB" ]; then
+@@ -50,14 +50,13 @@ if [ -z "$NOLSB" ]; then
. /lib/lsb/init-functions
fail_msg() {
[ -f "$VARFILE" ] && rm $VARFILE
Modified: trunk/debian/patches/10-initscript.dpatch
===================================================================
--- trunk/debian/patches/10-initscript.dpatch 2008-05-09 08:26:41 UTC (rev 268)
+++ trunk/debian/patches/10-initscript.dpatch 2008-05-09 09:32:58 UTC (rev 269)
@@ -5,10 +5,11 @@
## DP: Some changes to initscript.
@DPATCH@
-diff -urNad virtualbox-ose-1.6.0-dfsg/src/VBox/Installer/linux/vboxnet.sh.in.orig virtualbox-ose-1.6.0-dfsg/src/VBox/Installer/linux/vboxnet.sh.in
---- virtualbox-ose-1.6.0-dfsg/src/VBox/Installer/linux/vboxnet.sh.in.orig 2008-05-01 18:45:05.000000000 +0200
-+++ virtualbox-ose-1.6.0-dfsg/src/VBox/Installer/linux/vboxnet.sh.in 2008-05-01 18:52:17.000000000 +0200
-@@ -34,6 +34,11 @@
+
+diff -Naurp virtualbox-ose-1.6.0-dfsg.orig/src/VBox/Installer/linux/vboxnet.sh.in virtualbox-ose-1.6.0-dfsg/src/VBox/Installer/linux/vboxnet.sh.in
+--- virtualbox-ose-1.6.0-dfsg.orig/src/VBox/Installer/linux/vboxnet.sh.in 2008-05-09 09:28:41.000000000 +0000
++++ virtualbox-ose-1.6.0-dfsg/src/VBox/Installer/linux/vboxnet.sh.in 2008-05-09 09:29:40.000000000 +0000
+@@ -34,6 +34,11 @@ VARFILE="/var/run/VirtualBox/vboxnet"
TAPDEV="/dev/net/tun"
NOLSB=%NOLSB%
@@ -20,7 +21,7 @@
[ -f /lib/lsb/init-functions ] || NOLSB=yes
if [ -n "$NOLSB" ]; then
-@@ -162,13 +168,6 @@
+@@ -162,13 +167,6 @@ start_network()
if ! VBoxTunctl -h 2>&1 | grep VBoxTunctl > /dev/null; then
failure "VBoxTunctl not found"
fi
@@ -34,7 +35,7 @@
# Read the configuration file entries line by line and create the
# interfaces
while read line; do
-@@ -179,6 +178,19 @@
+@@ -179,6 +177,19 @@ start_network()
# or two non-comment entries, possibly followed by a comment).
if ((! expr match "$2" "#" > /dev/null) &&
(test -z "$4" || expr match "$4" "#" > /dev/null)); then
@@ -54,7 +55,7 @@
# As the very first thing, try delete the interface. Might already
# exist with different configuration. Ignore errors.
VBoxTunctl -d $1 > /dev/null 2>&1
-@@ -234,6 +246,7 @@
+@@ -234,6 +245,7 @@ start_network()
chgrp vboxusers "$TAPDEV"
chmod 0660 "$TAPDEV"
fi
@@ -62,7 +63,7 @@
return 0
}
-@@ -327,10 +340,17 @@
+@@ -327,10 +339,17 @@ force_stop_network()
case "$1" in
start)
Modified: trunk/debian/patches/11-workaround-gcc-ice.dpatch
===================================================================
--- trunk/debian/patches/11-workaround-gcc-ice.dpatch 2008-05-09 08:26:41 UTC (rev 268)
+++ trunk/debian/patches/11-workaround-gcc-ice.dpatch 2008-05-09 09:32:58 UTC (rev 269)
@@ -6,9 +6,10 @@
@DPATCH@
---- virtualbox-ose-1.5.6-dfsg/src/recompiler/Makefile.kmk.orig 2008-04-08 09:35:57.000000000 +0200
-+++ virtualbox-ose-1.5.6-dfsg/src/recompiler/Makefile.kmk 2008-04-08 09:36:23.000000000 +0200
-@@ -231,9 +231,9 @@
+diff -Naurp virtualbox-ose-1.6.0-dfsg.orig/src/recompiler/Makefile.kmk virtualbox-ose-1.6.0-dfsg/src/recompiler/Makefile.kmk
+--- virtualbox-ose-1.6.0-dfsg.orig/src/recompiler/Makefile.kmk 2008-04-30 14:05:15.000000000 +0000
++++ virtualbox-ose-1.6.0-dfsg/src/recompiler/Makefile.kmk 2008-05-09 09:30:23.000000000 +0000
+@@ -225,9 +225,9 @@ endif # !REM_USE_NOCRT
# Extra flags for these source modules.
target-i386/op.c_CFLAGS = -O2 -fno-strict-aliasing -fomit-frame-pointer -falign-functions=0 -fno-reorder-blocks -fno-optimize-sibling-calls
@@ -18,5 +19,5 @@
-target-i386/helper.c_CFLAGS.x86 = -O2 -fomit-frame-pointer -fno-strict-aliasing -fno-gcse
+target-i386/helper.c_CFLAGS.x86 = -O3 -fomit-frame-pointer -fno-strict-aliasing -fno-gcse
cpu-exec.c_CFLAGS.x86 = -O2 -fomit-frame-pointer -fno-strict-aliasing -fno-gcse
+ cpu-exec.c_CFLAGS.solaris.amd64 = -O2 -fomit-frame-pointer -fno-strict-aliasing
-
Modified: trunk/debian/patches/12-gcc-4.3.dpatch
===================================================================
--- trunk/debian/patches/12-gcc-4.3.dpatch 2008-05-09 08:26:41 UTC (rev 268)
+++ trunk/debian/patches/12-gcc-4.3.dpatch 2008-05-09 09:32:58 UTC (rev 269)
@@ -6,19 +6,10 @@
@DPATCH@
---- virtualbox-ose-1.6.0-dfsg/src/VBox/Main/VMMDevInterface.cpp.orig
-+++ virtualbox-ose-1.6.0-dfsg/src/VBox/Main/VMMDevInterface.cpp
-@@ -27,6 +27,7 @@
- #include <VBox/VBoxGuest.h>
- #include <VBox/shflsvc.h>
- #include <iprt/asm.h>
-+#include <stdio.h>
-
- #ifdef VBOX_HGCM
- #include "hgcm/HGCM.h"
---- virtualbox-ose-1.5.6-dfsg/src/VBox/Frontends/VirtualBox/src/VBoxGlobal.cpp.orig
-+++ virtualbox-ose-1.5.6-dfsg/src/VBox/Frontends/VirtualBox/src/VBoxGlobal.cpp
-@@ -28,6 +28,8 @@
+diff -Naurp virtualbox-ose-1.6.0-dfsg.orig/src/VBox/Frontends/VirtualBox/src/VBoxGlobal.cpp virtualbox-ose-1.6.0-dfsg/src/VBox/Frontends/VirtualBox/src/VBoxGlobal.cpp
+--- virtualbox-ose-1.6.0-dfsg.orig/src/VBox/Frontends/VirtualBox/src/VBoxGlobal.cpp 2008-04-30 14:05:33.000000000 +0000
++++ virtualbox-ose-1.6.0-dfsg/src/VBox/Frontends/VirtualBox/src/VBoxGlobal.cpp 2008-05-09 09:31:08.000000000 +0000
+@@ -33,6 +33,8 @@
#include "VBoxRegistrationDlg.h"
#endif
@@ -27,8 +18,20 @@
#include <qapplication.h>
#include <qmessagebox.h>
#include <qpixmap.h>
---- virtualbox-ose-1.5.6-dfsg/src/recompiler/Sun/op-validate.sed.orig
-+++ virtualbox-ose-1.5.6-dfsg/src/recompiler/Sun/op-validate.sed
+diff -Naurp virtualbox-ose-1.6.0-dfsg.orig/src/VBox/Main/VMMDevInterface.cpp virtualbox-ose-1.6.0-dfsg/src/VBox/Main/VMMDevInterface.cpp
+--- virtualbox-ose-1.6.0-dfsg.orig/src/VBox/Main/VMMDevInterface.cpp 2008-04-30 14:05:49.000000000 +0000
++++ virtualbox-ose-1.6.0-dfsg/src/VBox/Main/VMMDevInterface.cpp 2008-05-09 09:31:08.000000000 +0000
+@@ -31,6 +31,7 @@
+ #include <VBox/VBoxGuest.h>
+ #include <VBox/shflsvc.h>
+ #include <iprt/asm.h>
++#include <stdio.h>
+
+ #ifdef VBOX_HGCM
+ #include "hgcm/HGCM.h"
+diff -Naurp virtualbox-ose-1.6.0-dfsg.orig/src/recompiler/Sun/op-validate.sed virtualbox-ose-1.6.0-dfsg/src/recompiler/Sun/op-validate.sed
+--- virtualbox-ose-1.6.0-dfsg.orig/src/recompiler/Sun/op-validate.sed 2008-04-30 14:05:14.000000000 +0000
++++ virtualbox-ose-1.6.0-dfsg/src/recompiler/Sun/op-validate.sed 2008-05-09 09:31:08.000000000 +0000
@@ -63,6 +63,8 @@ s/^[[:blank:]]*ret[[:blank:]]*\n*[[:blan
/\.Lfe[0-9][0-9]*:/d
/\.LFE[0-9][0-9]*:/d
Modified: trunk/debian/patches/13-make-module.dpatch
===================================================================
--- trunk/debian/patches/13-make-module.dpatch 2008-05-09 08:26:41 UTC (rev 268)
+++ trunk/debian/patches/13-make-module.dpatch 2008-05-09 09:32:58 UTC (rev 269)
@@ -6,9 +6,10 @@
@DPATCH@
---- virtualbox-ose-1.5.6-dfsg/src/VBox/HostDrivers/Support/linux/Makefile.orig 2008-02-19 12:49:05.000000000 +0100
-+++ virtualbox-ose-1.5.6-dfsg/src/VBox/HostDrivers/Support/linux/Makefile 2008-04-25 11:49:43.000000000 +0200
-@@ -28,12 +28,24 @@
+diff -Naurp virtualbox-ose-1.6.0-dfsg.orig/src/VBox/HostDrivers/Support/linux/Makefile virtualbox-ose-1.6.0-dfsg/src/VBox/HostDrivers/Support/linux/Makefile
+--- virtualbox-ose-1.6.0-dfsg.orig/src/VBox/HostDrivers/Support/linux/Makefile 2008-04-30 14:05:50.000000000 +0000
++++ virtualbox-ose-1.6.0-dfsg/src/VBox/HostDrivers/Support/linux/Makefile 2008-05-09 09:31:52.000000000 +0000
+@@ -43,12 +43,24 @@ ifeq ($(BUILD_TARGET_ARCH),)
BUILD_TARGET_ARCH := amd64
else
ifeq ($(ARCH),i386)
More information about the Pkg-virtualbox-commits
mailing list