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

meskes at alioth.debian.org meskes at alioth.debian.org
Sat Dec 29 15:50:16 UTC 2007 

Author: meskes
Date: 2007-12-29 15:50:16 +0000 (Sat, 29 Dec 2007)
New Revision: 164

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/08-module-build.dpatch
   trunk/debian/patches/09-no-registration.dpatch
Log:
Replaced our registration patch by the new config option taken from SVN.
Fixed two re-diffs.



Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2007-12-29 14:04:20 UTC (rev 163)
+++ trunk/debian/changelog	2007-12-29 15:50:16 UTC (rev 164)
@@ -14,6 +14,7 @@
     08-no-kernel.dpatch
     09-fix-initscript.dpatch
     12-kcompat-2.6.24.dpatch
+  * Replaced our registration patch by the new config option taken from SVN.
   * Rediffed and renumbered the remaining patches.
   * Added build dependency on libpulse-dev.
   * Moved shell scripts from /usr/lib to /usr/share.

Modified: trunk/debian/patches/01-no-64bit-guest.dpatch
===================================================================
--- trunk/debian/patches/01-no-64bit-guest.dpatch	2007-12-29 14:04:20 UTC (rev 163)
+++ trunk/debian/patches/01-no-64bit-guest.dpatch	2007-12-29 15:50:16 UTC (rev 164)
@@ -1,5 +1,5 @@
 #! /bin/sh /usr/share/dpatch/dpatch-run
-## 13-no-64bit-guest.dpatch by Michael Meskes <meskes at debian.org>
+## 01-no-64bit-guest.dpatch by Michael Meskes <meskes at debian.org>
 ##
 ## All lines beginning with `## DP:' are a description of the patch.
 ## DP: Do not build guest utils on 64 bit architectures
@@ -37,14 +37,14 @@
  INSTALLS = vboxvfs-bin vboxvfs-sh
  
  #
---- virtualbox-ose-1.5.2-dfsg2/configure.orig	2007-12-23 15:15:43.000000000 +0100
-+++ virtualbox-ose-1.5.2-dfsg2/configure	2007-12-23 15:16:44.000000000 +0100
-@@ -230,7 +230,7 @@
- check_environment()
- {
-   test_header environment
+--- 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)
-       BUILD_MACHINE='x86'

Modified: trunk/debian/patches/03-config-kmk.dpatch
===================================================================
--- trunk/debian/patches/03-config-kmk.dpatch	2007-12-29 14:04:20 UTC (rev 163)
+++ trunk/debian/patches/03-config-kmk.dpatch	2007-12-29 15:50:16 UTC (rev 164)
@@ -6,10 +6,9 @@
 
 @DPATCH@
 
-diff -Naurp virtualbox-ose-1.5.0-dfsg2.orig/Config.kmk virtualbox-ose-1.5.0-dfsg2/Config.kmk
---- virtualbox-ose-1.5.0-dfsg2.orig/Config.kmk	2007-08-31 13:01:30.000000000 +0000
-+++ virtualbox-ose-1.5.0-dfsg2/Config.kmk	2007-10-09 12:25:50.000000000 +0000
-@@ -838,7 +838,7 @@ VBOX_PATH_DIFX ?= $(PATH_DEVTOOLS)/win.$
+--- 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 @@
  # 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)),)
@@ -18,12 +17,12 @@
  endif
  
  # XPCOM setup for all but win32.
-@@ -1199,7 +1199,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))
--   VBOX_LINUX_INCS                 += $(VBOX_LINUX_SRC)/include2 $(kernelpath)/include
-+   VBOX_LINUX_INCS                 += $(VBOX_LINUX_SRC)/include2 /usr/include
-   else
-    kernelpath := $(VBOX_LINUX_SRC)
-   endif
+@@ -1214,7 +1214,7 @@
+    kernelsrc := $(shell $(SED_EXT) -ne 's+^KERNELSRC.*= *\(.*\)+\1+p' $(VBOX_LINUX_SRC)/Makefile)
+    ifneq ($(kernelsrc),)
+     kernelpath := $(realpath $(VBOX_LINUX_SRC)/$(kernelsrc))
+-    VBOX_LINUX_INCS                 += $(VBOX_LINUX_SRC)/include2 $(kernelpath)/include
++    VBOX_LINUX_INCS                 += $(VBOX_LINUX_SRC)/include2 /usr/include
+    else
+     kernelpath := $(VBOX_LINUX_SRC)
+    endif

Modified: trunk/debian/patches/04-localconf-kmk.dpatch
===================================================================
--- trunk/debian/patches/04-localconf-kmk.dpatch	2007-12-29 14:04:20 UTC (rev 163)
+++ trunk/debian/patches/04-localconf-kmk.dpatch	2007-12-29 15:50:16 UTC (rev 164)
@@ -10,7 +10,7 @@
 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
-@@ -0,0 +1,12 @@
+@@ -0,0 +1,13 @@
 +VBOX_WITH_VBOXDRV =
 +VBOX_WITH_LINUX_ONLY =
 +VBOX_ADDITIONS_LINUX_ONLY =
@@ -19,6 +19,7 @@
 +VBOX_WITH_TESTCASES =
 +VBOX_WITH_TESTSUITE =
 +VBOX_WITH_USB =
++VBOX_WITH_REGISTRATION_REQUEST =
 +DEFS += RTPATH_APP_DOCS=\"/usr/share/doc/virtualbox\"
 +DEFS += RTPATH_APP_PRIVATE_ARCH=\"/usr/lib/virtualbox\"
 +DEFS += RTPATH_APP_PRIVATE=\"/usr/share/virtualbox\"

Modified: trunk/debian/patches/08-module-build.dpatch
===================================================================
--- trunk/debian/patches/08-module-build.dpatch	2007-12-29 14:04:20 UTC (rev 163)
+++ trunk/debian/patches/08-module-build.dpatch	2007-12-29 15:50:16 UTC (rev 164)
@@ -1,5 +1,5 @@
 #!/bin/sh /usr/share/dpatch/dpatch-run
-## 11-module-build.dpatch by Michael Meskes <meskes at debian.org>
+## 08-module-build.dpatch by Michael Meskes <meskes at debian.org>
 ##
 ## DP: Build module correctly in linux-modules-extra
 

Modified: trunk/debian/patches/09-no-registration.dpatch
===================================================================
--- trunk/debian/patches/09-no-registration.dpatch	2007-12-29 14:04:20 UTC (rev 163)
+++ trunk/debian/patches/09-no-registration.dpatch	2007-12-29 15:50:16 UTC (rev 164)
@@ -1,22 +1,55 @@
 #!/bin/sh /usr/share/dpatch/dpatch-run
-## 10-no-registration.dpatch by Michael Meskes <meskes at debian.org>
+## 09-no-registration.dpatch by Michael Meskes <meskes at debian.org>
 ##
 ## DP: Do not ask for registration
+## This is taken from SVN and can safely be removed as soon as the files in SVN are realeased.
 
 @DPATCH@
 
-diff -Naurp virtualbox-ose-1.5.2-dfsg2.orig/src/VBox/Frontends/VirtualBox/Makefile.kmk virtualbox-ose-1.5.2-dfsg2/src/VBox/Frontends/VirtualBox/Makefile.kmk
---- virtualbox-ose-1.5.2-dfsg2.orig/src/VBox/Frontends/VirtualBox/Makefile.kmk	2007-10-18 11:07:28.000000000 +0000
-+++ virtualbox-ose-1.5.2-dfsg2/src/VBox/Frontends/VirtualBox/Makefile.kmk	2007-12-18 14:53:06.000000000 +0000
-@@ -38,9 +38,9 @@ include $(PATH_KBUILD)/header.kmk
+--- virtualbox-ose-1.5.4-dfsg/src/VBox/Frontends/VirtualBox/Makefile.kmk.orig	2007-12-29 16:33:24.000000000 +0100
++++ virtualbox-ose-1.5.4-dfsg/src/VBox/Frontends/VirtualBox/Makefile.kmk	2007-12-29 16:34:41.000000000 +0100
+@@ -31,6 +31,9 @@
+ TRANSLATIONS :=
+ IMAGES :=
+ 
++VBOX_WITH_REGISTRATION := 1
++VBOX_WITH_REGISTRATION_REQUEST := 1
++
+ DEPTH = ../../../..
+ include $(PATH_KBUILD)/header.kmk
+ 
+@@ -38,10 +41,6 @@
  #
  # exclude inappropriate UI content
  #
 -#ifndef VBOX_OSE
-+ifndef VBOX_OSE
- VBOX_WITH_REGISTRATION := 1
+-VBOX_WITH_REGISTRATION := 1
 -#endif
-+endif
- 
+-
  ifndef VBOX_WITH_REGISTRATION
  VirtualBox_QT_UISRCS := $(filter-out ui/VBoxRegistrationDlg.ui,$(VirtualBox_QT_UISRCS))
+ endif
+--- virtualbox-ose-1.5.4-dfsg/src/VBox/Frontends/VirtualBox/src/VBoxConsoleWnd.cpp.orig	2007-12-29 16:34:53.000000000 +0100
++++ virtualbox-ose-1.5.4-dfsg/src/VBox/Frontends/VirtualBox/src/VBoxConsoleWnd.cpp	2007-12-29 16:35:23.000000000 +0100
+@@ -929,7 +929,9 @@
+     mIsOpenViewFinished = true;
+     LogFlowFuncLeave();
+ 
++#ifdef VBOX_WITH_REGISTRATION_REQUEST
+     vboxGlobal().showRegistrationDialog (false /* aForce */);
++#endif
+ }
+ 
+ /**
+--- virtualbox-ose-1.5.4-dfsg/src/VBox/Frontends/VirtualBox/src/main.cpp.orig	2007-12-29 16:35:28.000000000 +0100
++++ virtualbox-ose-1.5.4-dfsg/src/VBox/Frontends/VirtualBox/src/main.cpp	2007-12-29 16:36:05.000000000 +0100
+@@ -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();
+             }

More information about the Pkg-virtualbox-commits mailing list