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

[meskes at alioth.debian.org]

Author: meskes
Date: 2008-05-26 09:05:17 +0000 (Mon, 26 May 2008)
New Revision: 289

Modified:
   trunk/debian/changelog
   trunk/debian/copyright
   trunk/debian/patches/02-config-kmk.dpatch
Log:
Prepare for 1.6.2



Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2008-05-12 09:51:53 UTC (rev 288)
+++ trunk/debian/changelog	2008-05-26 09:05:17 UTC (rev 289)
@@ -1,7 +1,7 @@
-virtualbox-ose (1.6.0-dfsg-1) unstable; urgency=low
+virtualbox-ose (1.6.2-dfsg-1) unstable; urgency=low
 
   [ Michael Meskes ]
-  * New upstream version, closes: #479744
+  * New upstream version, closes: #479744, #482504
   * Removed unneeded xalan build dependency.
   * Added build dependency on libxslt and libxml.
   * Fixed LocalConfig.kmk to list new variables.

Modified: trunk/debian/copyright
===================================================================
--- trunk/debian/copyright	2008-05-12 09:51:53 UTC (rev 288)
+++ trunk/debian/copyright	2008-05-26 09:05:17 UTC (rev 289)
@@ -233,6 +233,9 @@
 ./src/VBox/Devices/Graphics/BIOS/vgabios.c
         Copyright: 2001,2002 the LGPL VGABios developers Team
 
+./src/libs/kStuff
+	Copyright (C) 2007 Sun Microsystems, Inc.
+
 On Debian systems, the complete text of the LGPL License
 can be found in /usr/share/common-licenses/LGPL file.
 

Modified: trunk/debian/patches/02-config-kmk.dpatch
===================================================================
--- trunk/debian/patches/02-config-kmk.dpatch	2008-05-12 09:51:53 UTC (rev 288)
+++ trunk/debian/patches/02-config-kmk.dpatch	2008-05-26 09:05:17 UTC (rev 289)
@@ -6,19 +6,18 @@
 
 @DPATCH@
 
-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.$
+--- virtualbox-ose-1.6.2-dfsg.orig/Config.kmk	2008-05-22 00:11:41.000000000 +0200
++++ virtualbox-ose-1.6.2-dfsg/Config.kmk	2008-05-26 00:24:55.000000000 +0200
+@@ -957,7 +957,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)
+ if1of ($(KBUILD_HOST).$(KBUILD_HOST_ARCH),  win.x86 linux.x86 solaris.x86)
 - PATH_TOOL_YASM ?= $(PATH_DEVTOOLS_BLD)/bin
 + PATH_TOOL_YASM ?= /usr/bin
  endif
  
  # XPCOM setup for all but win32.
-@@ -1456,7 +1456,7 @@ if1of ($(BUILD_TARGET), linux)
+@@ -1459,7 +1459,7 @@ if1of ($(KBUILD_TARGET), linux)
     kernelsrc := $(shell $(SED_EXT) -ne 's+^KERNELSRC.*= *\(.*\)+\1+p' $(VBOX_LINUX_SRC)/Makefile)
     ifneq ($(kernelsrc),)
      kernelpath := $(realpath $(VBOX_LINUX_SRC)/$(kernelsrc))