[Pkg-virtualbox-commits] r171 - in trunk/debian: . patches
daniel at alioth.debian.org
daniel at alioth.debian.org
Sun Dec 30 06:35:04 UTC 2007
Author: daniel
Date: 2007-12-30 06:35:04 +0000 (Sun, 30 Dec 2007)
New Revision: 171
Modified:
trunk/debian/changelog
trunk/debian/patches/01-no-64bit-guest.dpatch
trunk/debian/patches/02-host-module.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-module-build.dpatch
trunk/debian/patches/09-no-registration.dpatch
Log:
Rediffed all patches properly.
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2007-12-30 06:26:44 UTC (rev 170)
+++ trunk/debian/changelog 2007-12-30 06:35:04 UTC (rev 171)
@@ -29,6 +29,7 @@
* Again removing reimported useless whitespaces at EOL and EOF in debian/*.
* Correcting the name of Phillip in copyright.
* Syncronising Uploaders of control with control.module.in.
+ * Rediffed all patches properly.
-- Michael Meskes <meskes at debian.org> Sat, 29 Dec 2007 14:52:41 +0100
Modified: trunk/debian/patches/01-no-64bit-guest.dpatch
===================================================================
--- trunk/debian/patches/01-no-64bit-guest.dpatch 2007-12-30 06:26:44 UTC (rev 170)
+++ trunk/debian/patches/01-no-64bit-guest.dpatch 2007-12-30 06:35:04 UTC (rev 171)
@@ -5,9 +5,22 @@
@DPATCH@
---- virtualbox-ose-1.5.2-dfsg2/src/VBox/Additions/linux/Makefile.kmk.orig 2007-10-18 13:07:28.000000000 +0200
-+++ virtualbox-ose-1.5.2-dfsg2/src/VBox/Additions/linux/Makefile.kmk 2007-12-23 13:49:48.000000000 +0100
-@@ -22,10 +22,13 @@
+diff -Naurp virtualbox-ose-1.5.4-dfsg.orig/configure virtualbox-ose-1.5.4-dfsg/configure
+--- virtualbox-ose-1.5.4-dfsg.orig/configure 2007-12-28 16:28:21.000000000 +0000
++++ virtualbox-ose-1.5.4-dfsg/configure 2007-12-30 06:28:14.000000000 +0000
+@@ -248,7 +248,7 @@ check_environment()
+ exit 1
+ ;;
+ esac
+- BUILD_CPU=`uname -m`
++ BUILD_CPU=`dpkg --print-architecture`
+ [ "$OS" = "solaris" ] && BUILD_CPU=`isainfo | cut -f 1 -d ' '`
+ case "$BUILD_CPU" in
+ i[3456789]86|x86|i86pc)
+diff -Naurp virtualbox-ose-1.5.4-dfsg.orig/src/VBox/Additions/linux/Makefile.kmk virtualbox-ose-1.5.4-dfsg/src/VBox/Additions/linux/Makefile.kmk
+--- virtualbox-ose-1.5.4-dfsg.orig/src/VBox/Additions/linux/Makefile.kmk 2007-10-22 21:24:00.000000000 +0000
++++ virtualbox-ose-1.5.4-dfsg/src/VBox/Additions/linux/Makefile.kmk 2007-12-30 06:28:14.000000000 +0000
+@@ -22,10 +22,13 @@ SUBDIRS =
ifeq ($(filter-out linux l4, $(BUILD_TARGET)),)
SUBDIRS += \
module \
@@ -22,9 +35,10 @@
xclient
endif
---- virtualbox-ose-1.5.2-dfsg2/src/VBox/Additions/linux/sharedfolders/Makefile.kmk.orig 2007-08-30 17:16:27.000000000 +0200
-+++ virtualbox-ose-1.5.2-dfsg2/src/VBox/Additions/linux/sharedfolders/Makefile.kmk 2007-12-23 13:50:36.000000000 +0100
-@@ -20,7 +20,10 @@
+diff -Naurp virtualbox-ose-1.5.4-dfsg.orig/src/VBox/Additions/linux/sharedfolders/Makefile.kmk virtualbox-ose-1.5.4-dfsg/src/VBox/Additions/linux/sharedfolders/Makefile.kmk
+--- virtualbox-ose-1.5.4-dfsg.orig/src/VBox/Additions/linux/sharedfolders/Makefile.kmk 2007-08-14 12:26:25.000000000 +0000
++++ virtualbox-ose-1.5.4-dfsg/src/VBox/Additions/linux/sharedfolders/Makefile.kmk 2007-12-30 06:28:14.000000000 +0000
+@@ -20,7 +20,10 @@ include $(PATH_KBUILD)/header.kmk
ifdef VBOX_WITH_LINUX_ADDITIONS_32BIT_R0
SYSMODS = vboxvfs
endif
@@ -36,14 +50,3 @@
INSTALLS = vboxvfs-bin vboxvfs-sh
#
---- virtualbox-ose-1.5.4-dfsg/configure.orig 2007-12-29 16:44:20.000000000 +0100
-+++ virtualbox-ose-1.5.4-dfsg/configure 2007-12-29 16:44:37.000000000 +0100
-@@ -248,7 +248,7 @@
- exit 1
- ;;
- esac
-- BUILD_CPU=`uname -m`
-+ BUILD_CPU=`dpkg --print-architecture`
- [ "$OS" = "solaris" ] && BUILD_CPU=`isainfo | cut -f 1 -d ' '`
- case "$BUILD_CPU" in
- i[3456789]86|x86|i86pc)
Modified: trunk/debian/patches/02-host-module.dpatch
===================================================================
--- trunk/debian/patches/02-host-module.dpatch 2007-12-30 06:26:44 UTC (rev 170)
+++ trunk/debian/patches/02-host-module.dpatch 2007-12-30 06:35:04 UTC (rev 171)
@@ -5,14 +5,14 @@
@DPATCH@
-diff -Naurp virtualbox-ose-1.5.0-dfsg2.orig/src/VBox/HostDrivers/Support/linux/Makefile virtualbox-ose-1.5.0-dfsg2/src/VBox/HostDrivers/Support/linux/Makefile
---- virtualbox-ose-1.5.0-dfsg2.orig/src/VBox/HostDrivers/Support/linux/Makefile 2007-08-30 15:16:26.000000000 +0000
-+++ virtualbox-ose-1.5.0-dfsg2/src/VBox/HostDrivers/Support/linux/Makefile 2007-10-09 12:25:02.000000000 +0000
+diff -Naurp virtualbox-ose-1.5.4-dfsg.orig/src/VBox/HostDrivers/Support/linux/Makefile virtualbox-ose-1.5.4-dfsg/src/VBox/HostDrivers/Support/linux/Makefile
+--- virtualbox-ose-1.5.4-dfsg.orig/src/VBox/HostDrivers/Support/linux/Makefile 2007-10-12 21:19:22.000000000 +0000
++++ virtualbox-ose-1.5.4-dfsg/src/VBox/HostDrivers/Support/linux/Makefile 2007-12-30 06:29:05.000000000 +0000
@@ -59,6 +59,7 @@ endif
ifneq ($(MAKECMDGOALS),clean)
# kernel base directory
+KERN_DIR := $(KDIR)
ifndef KERN_DIR
+ # build for the current kernel, version check
KERN_DIR := /lib/modules/$(shell uname -r)/build
- ifneq ($(shell if test -d $(KERN_DIR); then echo yes; fi),yes)
Modified: trunk/debian/patches/03-config-kmk.dpatch
===================================================================
--- trunk/debian/patches/03-config-kmk.dpatch 2007-12-30 06:26:44 UTC (rev 170)
+++ trunk/debian/patches/03-config-kmk.dpatch 2007-12-30 06:35:04 UTC (rev 171)
@@ -6,9 +6,10 @@
@DPATCH@
---- virtualbox-ose-1.5.4-dfsg/Config.kmk.orig 2007-12-29 16:46:20.000000000 +0100
-+++ virtualbox-ose-1.5.4-dfsg/Config.kmk 2007-12-29 16:47:59.000000000 +0100
-@@ -852,7 +852,7 @@
+diff -Naurp virtualbox-ose-1.5.4-dfsg.orig/Config.kmk virtualbox-ose-1.5.4-dfsg/Config.kmk
+--- virtualbox-ose-1.5.4-dfsg.orig/Config.kmk 2007-12-29 06:56:28.000000000 +0000
++++ virtualbox-ose-1.5.4-dfsg/Config.kmk 2007-12-30 06:29:55.000000000 +0000
+@@ -852,7 +852,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.
ifeq ($(filter-out win.x86 linux.x86 solaris.x86, $(BUILD_PLATFORM).$(BUILD_PLATFORM_ARCH)),)
@@ -17,7 +18,7 @@
endif
# XPCOM setup for all but win32.
-@@ -1214,7 +1214,7 @@
+@@ -1214,7 +1214,7 @@ ifneq ($(filter linux,$(BUILD_TARGET)),)
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 2007-12-30 06:26:44 UTC (rev 170)
+++ trunk/debian/patches/04-localconf-kmk.dpatch 2007-12-30 06:35:04 UTC (rev 171)
@@ -7,9 +7,9 @@
@DPATCH@
-diff -Naurp virtualbox-ose-1.5.0-dfsg2.orig/LocalConfig.kmk virtualbox-ose-1.5.0-dfsg2/LocalConfig.kmk
---- virtualbox-ose-1.5.0-dfsg2.orig/LocalConfig.kmk 1970-01-01 00:00:00.000000000 +0000
-+++ virtualbox-ose-1.5.0-dfsg2/LocalConfig.kmk 2007-10-09 12:26:59.000000000 +0000
+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
@@ -0,0 +1,12 @@
+VBOX_WITH_LINUX_ONLY =
+VBOX_ADDITIONS_LINUX_ONLY =
Modified: trunk/debian/patches/05-vboxdrv-references.dpatch
===================================================================
--- trunk/debian/patches/05-vboxdrv-references.dpatch 2007-12-30 06:26:44 UTC (rev 170)
+++ trunk/debian/patches/05-vboxdrv-references.dpatch 2007-12-30 06:35:04 UTC (rev 171)
@@ -6,9 +6,9 @@
@DPATCH@
-diff -Naurp virtualbox-ose-1.5.2-dfsg.orig/src/VBox/VMM/VM.cpp virtualbox-ose-1.5.2-dfsg/src/VBox/VMM/VM.cpp
---- virtualbox-ose-1.5.2-dfsg.orig/src/VBox/VMM/VM.cpp 2007-10-18 11:07:28.000000000 +0000
-+++ virtualbox-ose-1.5.2-dfsg/src/VBox/VMM/VM.cpp 2007-10-19 19:33:52.000000000 +0000
+diff -Naurp virtualbox-ose-1.5.4-dfsg.orig/src/VBox/VMM/VM.cpp virtualbox-ose-1.5.4-dfsg/src/VBox/VMM/VM.cpp
+--- virtualbox-ose-1.5.4-dfsg.orig/src/VBox/VMM/VM.cpp 2007-12-04 13:14:26.000000000 +0000
++++ virtualbox-ose-1.5.4-dfsg/src/VBox/VMM/VM.cpp 2007-12-30 06:31:00.000000000 +0000
@@ -314,8 +314,8 @@ VMR3DECL(int) VMR3Create(PFNVMATERROR
#ifdef RT_OS_LINUX
pszError = N_("VirtualBox kernel driver not loaded. The vboxdrv kernel module "
Modified: trunk/debian/patches/06-vboxadd-udev.dpatch
===================================================================
--- trunk/debian/patches/06-vboxadd-udev.dpatch 2007-12-30 06:26:44 UTC (rev 170)
+++ trunk/debian/patches/06-vboxadd-udev.dpatch 2007-12-30 06:35:04 UTC (rev 171)
@@ -6,18 +6,18 @@
@DPATCH@
-diff -Naurp virtualbox-ose-1.5.2-dfsg2.orig/src/VBox/Additions/linux/module/vboxmod.c virtualbox-ose-1.5.2-dfsg2/src/VBox/Additions/linux/module/vboxmod.c
---- virtualbox-ose-1.5.2-dfsg2.orig/src/VBox/Additions/linux/module/vboxmod.c 2007-10-18 11:07:28.000000000 +0000
-+++ virtualbox-ose-1.5.2-dfsg2/src/VBox/Additions/linux/module/vboxmod.c 2007-12-18 14:48:37.000000000 +0000
+diff -Naurp virtualbox-ose-1.5.4-dfsg.orig/src/VBox/Additions/linux/module/vboxmod.c virtualbox-ose-1.5.4-dfsg/src/VBox/Additions/linux/module/vboxmod.c
+--- virtualbox-ose-1.5.4-dfsg.orig/src/VBox/Additions/linux/module/vboxmod.c 2007-12-12 15:13:12.000000000 +0000
++++ virtualbox-ose-1.5.4-dfsg/src/VBox/Additions/linux/module/vboxmod.c 2007-12-30 06:32:01.000000000 +0000
@@ -23,6 +23,7 @@
#include "vboxmod.h"
#include "waitcompat.h"
#include <VBox/log.h>
+#include <linux/miscdevice.h>
- #define VERSION "0.5"
-
-@@ -411,6 +412,13 @@ static struct file_operations vbox_fops
+ #define xstr(s) str(s)
+ #define str(s) #s
+@@ -412,6 +413,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
-@@ -685,17 +693,22 @@ static __init int init(void)
+@@ -684,17 +692,22 @@ static __init int init(void)
}
/* register a character device */
@@ -63,7 +63,7 @@
/* allocate and initialize device extension */
vboxDev = kmalloc(sizeof(*vboxDev), GFP_KERNEL);
-@@ -829,7 +842,10 @@ static __init int init(void)
+@@ -831,7 +844,10 @@ static __init int init(void)
fail:
PCI_DEV_PUT(pcidev);
free_resources();
@@ -75,7 +75,7 @@
return err;
}
-@@ -841,7 +857,10 @@ static __exit void fini(void)
+@@ -843,7 +859,10 @@ static __exit void fini(void)
{
printk(KERN_DEBUG "vboxadd: unloading...\n");
Modified: trunk/debian/patches/07-xsession.dpatch
===================================================================
--- trunk/debian/patches/07-xsession.dpatch 2007-12-30 06:26:44 UTC (rev 170)
+++ trunk/debian/patches/07-xsession.dpatch 2007-12-30 06:35:04 UTC (rev 171)
@@ -5,9 +5,9 @@
@DPATCH@
-diff -Naurp virtualbox-ose-1.5.2-dfsg2.orig/src/VBox/Additions/linux/installer/98vboxadd-xclient virtualbox-ose-1.5.2-dfsg2/src/VBox/Additions/linux/installer/98vboxadd-xclient
---- virtualbox-ose-1.5.2-dfsg2.orig/src/VBox/Additions/linux/installer/98vboxadd-xclient 1970-01-01 00:00:00.000000000 +0000
-+++ virtualbox-ose-1.5.2-dfsg2/src/VBox/Additions/linux/installer/98vboxadd-xclient 2007-12-18 14:49:45.000000000 +0000
+diff -Naurp virtualbox-ose-1.5.4-dfsg.orig/src/VBox/Additions/linux/installer/98vboxadd-xclient virtualbox-ose-1.5.4-dfsg/src/VBox/Additions/linux/installer/98vboxadd-xclient
+--- virtualbox-ose-1.5.4-dfsg.orig/src/VBox/Additions/linux/installer/98vboxadd-xclient 1970-01-01 00:00:00.000000000 +0000
++++ virtualbox-ose-1.5.4-dfsg/src/VBox/Additions/linux/installer/98vboxadd-xclient 2007-12-30 06:32:40.000000000 +0000
@@ -0,0 +1,6 @@
+# (C) 2007
+# Michael Meskes <meskes at debian.org>
Modified: trunk/debian/patches/08-module-build.dpatch
===================================================================
--- trunk/debian/patches/08-module-build.dpatch 2007-12-30 06:26:44 UTC (rev 170)
+++ trunk/debian/patches/08-module-build.dpatch 2007-12-30 06:35:04 UTC (rev 171)
@@ -5,9 +5,9 @@
@DPATCH@
-diff -Naurp virtualbox-ose-1.5.2-dfsg2.orig/src/VBox/Additions/linux/module/Makefile.module virtualbox-ose-1.5.2-dfsg2/src/VBox/Additions/linux/module/Makefile.module
---- virtualbox-ose-1.5.2-dfsg2.orig/src/VBox/Additions/linux/module/Makefile.module 2007-10-18 11:07:28.000000000 +0000
-+++ virtualbox-ose-1.5.2-dfsg2/src/VBox/Additions/linux/module/Makefile.module 2007-12-18 14:54:07.000000000 +0000
+diff -Naurp virtualbox-ose-1.5.4-dfsg.orig/src/VBox/Additions/linux/module/Makefile.module virtualbox-ose-1.5.4-dfsg/src/VBox/Additions/linux/module/Makefile.module
+--- virtualbox-ose-1.5.4-dfsg.orig/src/VBox/Additions/linux/module/Makefile.module 2007-09-24 20:13:56.000000000 +0000
++++ virtualbox-ose-1.5.4-dfsg/src/VBox/Additions/linux/module/Makefile.module 2007-12-30 06:33:32.000000000 +0000
@@ -14,7 +14,7 @@
# be useful, but WITHOUT ANY WARRANTY of any kind.
@@ -26,9 +26,9 @@
INCL += $(addprefix -I$(KBUILD_EXTMOD),/ /include /r0drv/linux)
export INCL
endif
-diff -Naurp virtualbox-ose-1.5.2-dfsg2.orig/src/VBox/Additions/linux/sharedfolders/Makefile.module virtualbox-ose-1.5.2-dfsg2/src/VBox/Additions/linux/sharedfolders/Makefile.module
---- virtualbox-ose-1.5.2-dfsg2.orig/src/VBox/Additions/linux/sharedfolders/Makefile.module 2007-10-18 11:07:28.000000000 +0000
-+++ virtualbox-ose-1.5.2-dfsg2/src/VBox/Additions/linux/sharedfolders/Makefile.module 2007-12-18 14:54:07.000000000 +0000
+diff -Naurp virtualbox-ose-1.5.4-dfsg.orig/src/VBox/Additions/linux/sharedfolders/Makefile.module virtualbox-ose-1.5.4-dfsg/src/VBox/Additions/linux/sharedfolders/Makefile.module
+--- virtualbox-ose-1.5.4-dfsg.orig/src/VBox/Additions/linux/sharedfolders/Makefile.module 2007-09-24 20:13:56.000000000 +0000
++++ virtualbox-ose-1.5.4-dfsg/src/VBox/Additions/linux/sharedfolders/Makefile.module 2007-12-30 06:33:32.000000000 +0000
@@ -14,7 +14,7 @@
# be useful, but WITHOUT ANY WARRANTY of any kind.
@@ -47,9 +47,9 @@
INCL += $(addprefix -I$(KBUILD_EXTMOD),/ /include /r0drv/linux)
export INCL
endif
-diff -Naurp virtualbox-ose-1.5.2-dfsg2.orig/src/VBox/HostDrivers/Support/linux/Makefile virtualbox-ose-1.5.2-dfsg2/src/VBox/HostDrivers/Support/linux/Makefile
---- virtualbox-ose-1.5.2-dfsg2.orig/src/VBox/HostDrivers/Support/linux/Makefile 2007-10-18 11:07:28.000000000 +0000
-+++ virtualbox-ose-1.5.2-dfsg2/src/VBox/HostDrivers/Support/linux/Makefile 2007-12-18 14:54:07.000000000 +0000
+diff -Naurp virtualbox-ose-1.5.4-dfsg.orig/src/VBox/HostDrivers/Support/linux/Makefile virtualbox-ose-1.5.4-dfsg/src/VBox/HostDrivers/Support/linux/Makefile
+--- virtualbox-ose-1.5.4-dfsg.orig/src/VBox/HostDrivers/Support/linux/Makefile 2007-10-12 21:19:22.000000000 +0000
++++ virtualbox-ose-1.5.4-dfsg/src/VBox/HostDrivers/Support/linux/Makefile 2007-12-30 06:33:32.000000000 +0000
@@ -40,7 +40,7 @@ ifeq ($(BUILD_TARGET_ARCH),)
endif
Modified: trunk/debian/patches/09-no-registration.dpatch
===================================================================
--- trunk/debian/patches/09-no-registration.dpatch 2007-12-30 06:26:44 UTC (rev 170)
+++ trunk/debian/patches/09-no-registration.dpatch 2007-12-30 06:35:04 UTC (rev 171)
@@ -6,39 +6,10 @@
@DPATCH@
-Index:virtualbox-ose-1.5.4-dfsg/src/VBox/Frontends/VirtualBox/src/VBoxConsoleWnd.cpp
-===================================================================
----virtualbox-ose-1.5.4-dfsg/src/VBox/Frontends/VirtualBox/src/VBoxConsoleWnd.cpp (revision 27037)
-+++virtualbox-ose-1.5.4-dfsg/src/VBox/Frontends/VirtualBox/src/VBoxConsoleWnd.cpp (working copy)
-@@ -929,7 +929,9 @@
- mIsOpenViewFinished = true;
- LogFlowFuncLeave();
-
-+#ifdef VBOX_WITH_REGISTRATION_REQUEST
- vboxGlobal().showRegistrationDialog (false /* aForce */);
-+#endif
- }
-
- /**
-Index:virtualbox-ose-1.5.4-dfsg/src/VBox/Frontends/VirtualBox/src/main.cpp
-===================================================================
----virtualbox-ose-1.5.4-dfsg/src/VBox/Frontends/VirtualBox/src/main.cpp (revision 27037)
-+++virtualbox-ose-1.5.4-dfsg/src/VBox/Frontends/VirtualBox/src/main.cpp (working copy)
-@@ -242,7 +242,9 @@
- {
- a.setMainWidget (&vboxGlobal().selectorWnd());
- vboxGlobal().selectorWnd().show();
-+#ifdef VBOX_WITH_REGISTRATION_REQUEST
- vboxGlobal().showRegistrationDialog (false /* aForce */);
-+#endif
- vboxGlobal().startEnumeratingMedia();
- rc = a.exec();
- }
-Index:virtualbox-ose-1.5.4-dfsg/src/VBox/Frontends/VirtualBox/Makefile.kmk
-===================================================================
----virtualbox-ose-1.5.4-dfsg/src/VBox/Frontends/VirtualBox/Makefile.kmk (revision 27037)
-+++virtualbox-ose-1.5.4-dfsg/src/VBox/Frontends/VirtualBox/Makefile.kmk (working copy)
-@@ -31,6 +31,9 @@
+diff -Naurp virtualbox-ose-1.5.4-dfsg.orig/src/VBox/Frontends/VirtualBox/Makefile.kmk virtualbox-ose-1.5.4-dfsg/src/VBox/Frontends/VirtualBox/Makefile.kmk
+--- virtualbox-ose-1.5.4-dfsg.orig/src/VBox/Frontends/VirtualBox/Makefile.kmk 2007-12-17 14:38:59.000000000 +0000
++++ virtualbox-ose-1.5.4-dfsg/src/VBox/Frontends/VirtualBox/Makefile.kmk 2007-12-30 06:33:53.000000000 +0000
+@@ -31,6 +31,9 @@ FORMS :=
TRANSLATIONS :=
IMAGES :=
@@ -48,7 +19,7 @@
DEPTH = ../../../..
include $(PATH_KBUILD)/header.kmk
-@@ -38,10 +41,6 @@
+@@ -38,10 +41,6 @@ include $(PATH_KBUILD)/header.kmk
#
# exclude inappropriate UI content
#
@@ -59,7 +30,7 @@
ifndef VBOX_WITH_REGISTRATION
VirtualBox_QT_UISRCS := $(filter-out ui/VBoxRegistrationDlg.ui,$(VirtualBox_QT_UISRCS))
endif
-@@ -217,6 +216,9 @@
+@@ -217,6 +216,9 @@ endif
ifdef VBOX_WITH_REGISTRATION
VirtualBox_DEFS += VBOX_WITH_REGISTRATION
endif
@@ -69,3 +40,29 @@
ifdef VBOX_WITH_ALSA
VirtualBox_DEFS += VBOX_WITH_ALSA
endif
+diff -Naurp virtualbox-ose-1.5.4-dfsg.orig/src/VBox/Frontends/VirtualBox/src/VBoxConsoleWnd.cpp virtualbox-ose-1.5.4-dfsg/src/VBox/Frontends/VirtualBox/src/VBoxConsoleWnd.cpp
+--- virtualbox-ose-1.5.4-dfsg.orig/src/VBox/Frontends/VirtualBox/src/VBoxConsoleWnd.cpp 2007-10-18 07:23:36.000000000 +0000
++++ virtualbox-ose-1.5.4-dfsg/src/VBox/Frontends/VirtualBox/src/VBoxConsoleWnd.cpp 2007-12-30 06:33:53.000000000 +0000
+@@ -929,7 +929,9 @@ void VBoxConsoleWnd::finalizeOpenView()
+ mIsOpenViewFinished = true;
+ LogFlowFuncLeave();
+
++#ifdef VBOX_WITH_REGISTRATION_REQUEST
+ vboxGlobal().showRegistrationDialog (false /* aForce */);
++#endif
+ }
+
+ /**
+diff -Naurp virtualbox-ose-1.5.4-dfsg.orig/src/VBox/Frontends/VirtualBox/src/main.cpp virtualbox-ose-1.5.4-dfsg/src/VBox/Frontends/VirtualBox/src/main.cpp
+--- virtualbox-ose-1.5.4-dfsg.orig/src/VBox/Frontends/VirtualBox/src/main.cpp 2007-12-28 08:15:25.000000000 +0000
++++ virtualbox-ose-1.5.4-dfsg/src/VBox/Frontends/VirtualBox/src/main.cpp 2007-12-30 06:33:53.000000000 +0000
+@@ -242,7 +242,9 @@ int main (int argc, char **argv)
+ {
+ a.setMainWidget (&vboxGlobal().selectorWnd());
+ vboxGlobal().selectorWnd().show();
++#ifdef VBOX_WITH_REGISTRATION_REQUEST
+ vboxGlobal().showRegistrationDialog (false /* aForce */);
++#endif
+ vboxGlobal().startEnumeratingMedia();
+ rc = a.exec();
+ }
More information about the Pkg-virtualbox-commits
mailing list