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

[meskes at alioth.debian.org]

Author: meskes
Date: 2008-11-23 15:26:44 +0000 (Sun, 23 Nov 2008)
New Revision: 383

Added:
   virtualbox-ose/trunk/debian/patches/14-disable-registration-request.dpatch
Modified:
   virtualbox-ose/trunk/debian/patches/00list
   virtualbox-ose/trunk/debian/virtualbox-ose.install
Log:
Do not call for registration, patch taken from Ubuntu.



Modified: virtualbox-ose/trunk/debian/patches/00list
===================================================================
--- virtualbox-ose/trunk/debian/patches/00list	2008-11-23 11:41:17 UTC (rev 382)
+++ virtualbox-ose/trunk/debian/patches/00list	2008-11-23 15:26:44 UTC (rev 383)
@@ -10,4 +10,5 @@
 11-gcc-4.3.dpatch
 12-make-module.dpatch
 13-module-mismatch.dpatch
+14-disable-registration-request.dpatch
 17-tmp-symlink.attack.dpatch

Added: virtualbox-ose/trunk/debian/patches/14-disable-registration-request.dpatch
===================================================================
--- virtualbox-ose/trunk/debian/patches/14-disable-registration-request.dpatch	                        (rev 0)
+++ virtualbox-ose/trunk/debian/patches/14-disable-registration-request.dpatch	2008-11-23 15:26:44 UTC (rev 383)
@@ -0,0 +1,33 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 14-disable-registration-request.dpatch by Daniel Hahler <ubuntu at thequod.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Disable the registration request at startup (LP: #285684)
+## DP: This is probably not the right way to do it, but I have found no
+## DP: better way to undefine VBOX_WITH_REGISTRATION_REQUEST
+
+ at DPATCH@
+diff -urNad virtualbox-ose-2.0.4-dfsg~/src/VBox/Frontends/VirtualBox/Makefile.kmk virtualbox-ose-2.0.4-dfsg/src/VBox/Frontends/VirtualBox/Makefile.kmk
+--- virtualbox-ose-2.0.4-dfsg~/src/VBox/Frontends/VirtualBox/Makefile.kmk	2008-10-23 22:11:39.000000000 +0200
++++ virtualbox-ose-2.0.4-dfsg/src/VBox/Frontends/VirtualBox/Makefile.kmk	2008-10-26 02:53:09.271786032 +0200
+@@ -27,7 +27,7 @@
+ #
+ VBOX_PATH_VIRTUALBOX3_SRC := $(PATH_SUB_CURRENT)
+ VBOX_WITH_REGISTRATION := 1
+-VBOX_WITH_REGISTRATION_REQUEST := 1
++#VBOX_WITH_REGISTRATION_REQUEST := 1
+ 
+ 
+ #
+diff -urNad virtualbox-ose-2.0.4-dfsg~/src/VBox/Frontends/VirtualBox4/Makefile.kmk virtualbox-ose-2.0.4-dfsg/src/VBox/Frontends/VirtualBox4/Makefile.kmk
+--- virtualbox-ose-2.0.4-dfsg~/src/VBox/Frontends/VirtualBox4/Makefile.kmk	2008-10-23 22:12:16.000000000 +0200
++++ virtualbox-ose-2.0.4-dfsg/src/VBox/Frontends/VirtualBox4/Makefile.kmk	2008-10-26 02:53:00.227785792 +0200
+@@ -32,7 +32,7 @@
+ 
+ # Ask the user to register at Sun. If this setting is disabled the user can
+ # still register using the menu if desired.
+-VBOX_WITH_REGISTRATION_REQUEST := 1
++#VBOX_WITH_REGISTRATION_REQUEST := 1
+ 
+ # Show the update notifier dialog during startup. If this setting is disabled
+ # the user can still update using the menu if desired.

Modified: virtualbox-ose/trunk/debian/virtualbox-ose.install
===================================================================
--- virtualbox-ose/trunk/debian/virtualbox-ose.install	2008-11-23 11:41:17 UTC (rev 382)
+++ virtualbox-ose/trunk/debian/virtualbox-ose.install	2008-11-23 15:26:44 UTC (rev 383)
@@ -21,7 +21,6 @@
 out/bin/VBoxXPCOM* /usr/lib/virtualbox
 out/bin/vditool /usr/lib/virtualbox
 out/bin/VirtualBox* /usr/lib/virtualbox
-out/bin/VirtualBox* /usr/lib/virtualbox
 out/bin/VMM* /usr/lib/virtualbox
 
 out/bin/nls /usr/share/virtualbox