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

[daniel at alioth.debian.org]

Author: daniel
Date: 2008-06-09 17:41:33 +0000 (Mon, 09 Jun 2008)
New Revision: 298

Modified:
   trunk/debian/changelog
   trunk/debian/patches/02-config-kmk.dpatch
Log:
Rediffing 02-config-kmk.dpatch.

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2008-06-09 17:39:42 UTC (rev 297)
+++ trunk/debian/changelog	2008-06-09 17:41:33 UTC (rev 298)
@@ -3,6 +3,7 @@
   * Using dpkg-architecture rather than dpkg --print-architecture in
     01-no-64bit-guest.dpatch in order to be more accurate for ia32 subarchs
     like lpia, thanks to Loic Minier <lool at debian.org>.
+  * Rediffing 02-config-kmk.dpatch.
 
  -- Daniel Baumann <daniel at debian.org>  Mon,  9 Jun 2008 19:39:00 +0200
 

Modified: trunk/debian/patches/02-config-kmk.dpatch
===================================================================
--- trunk/debian/patches/02-config-kmk.dpatch	2008-06-09 17:39:42 UTC (rev 297)
+++ trunk/debian/patches/02-config-kmk.dpatch	2008-06-09 17:41:33 UTC (rev 298)
@@ -6,9 +6,10 @@
 
 @DPATCH@
 
---- 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.$
+diff -Naurp virtualbox-ose-1.6.2-dfsg.orig/Config.kmk virtualbox-ose-1.6.2-dfsg/Config.kmk
+--- virtualbox-ose-1.6.2-dfsg.orig/Config.kmk	2008-05-31 17:22:52.000000000 +0000
++++ virtualbox-ose-1.6.2-dfsg/Config.kmk	2008-06-09 17:40:09.000000000 +0000
+@@ -969,7 +969,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 ($(KBUILD_HOST).$(KBUILD_HOST_ARCH),  win.x86 linux.x86 solaris.x86)
@@ -17,7 +18,7 @@
  endif
  
  # XPCOM setup for all but win32.
-@@ -1459,7 +1459,7 @@ if1of ($(KBUILD_TARGET), linux)
+@@ -1480,7 +1480,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))