[Pkg-virtualbox-commits] r282 - in tags/1.5.6-dfsg-7/debian: . patches

[meskes at alioth.debian.org]

Author: meskes
Date: 2008-05-11 21:04:59 +0000 (Sun, 11 May 2008)
New Revision: 282

Added:
   tags/1.5.6-dfsg-7/debian/patches/13-make-module.dpatch
Removed:
   tags/1.5.6-dfsg-7/debian/watch
Log:
Some more changes brought back to 1.5.6 release.



Added: tags/1.5.6-dfsg-7/debian/patches/13-make-module.dpatch
===================================================================
--- tags/1.5.6-dfsg-7/debian/patches/13-make-module.dpatch	                        (rev 0)
+++ tags/1.5.6-dfsg-7/debian/patches/13-make-module.dpatch	2008-05-11 21:04:59 UTC (rev 282)
@@ -0,0 +1,39 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 13-make-module.dpatch by Michael Meskes <meskes at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix ARCH setting in module Makefile
+
+ at DPATCH@
+
+--- virtualbox-ose-1.5.6-dfsg/src/VBox/HostDrivers/Support/linux/Makefile.orig	2008-02-19 12:49:05.000000000 +0100
++++ virtualbox-ose-1.5.6-dfsg/src/VBox/HostDrivers/Support/linux/Makefile	2008-04-25 11:49:43.000000000 +0200
+@@ -28,12 +28,24 @@
+   BUILD_TARGET_ARCH := amd64
+  else
+   ifeq ($(ARCH),i386)
+-   BUILD_TARGET_ARCH := x86
++   ifeq ($(CONFIG_X86_32),y)
++     BUILD_TARGET_ARCH := x86
++   else
++     BUILD_TARGET_ARCH := amd64
++   endif
+   else
+-   ifeq ($(filter-out x86_64 amd64 AMD64,$(shell uname -m)),)
+-    BUILD_TARGET_ARCH := amd64
++   ifeq ($(ARCH),x86)
++    ifeq ($(CONFIG_X86_32),y)
++     BUILD_TARGET_ARCH := x86
++    else
++     BUILD_TARGET_ARCH := amd64
++    endif
+    else
+-    BUILD_TARGET_ARCH := x86
++    ifeq ($(filter-out x86_64 amd64 AMD64,$(shell uname -m)),)
++     BUILD_TARGET_ARCH := amd64
++    else
++     BUILD_TARGET_ARCH := x86
++    endif
+    endif
+   endif
+  endif

Deleted: tags/1.5.6-dfsg-7/debian/watch
===================================================================
--- tags/1.5.6-dfsg-7/debian/watch	2008-05-11 21:03:52 UTC (rev 281)
+++ tags/1.5.6-dfsg-7/debian/watch	2008-05-11 21:04:59 UTC (rev 282)
@@ -1,4 +0,0 @@
-version=3
-
-opts=dversionmangle=s/-dfsg\d*$//,uversionmangle=s/-.*// \
- http://virtualbox.org/wiki/Downloads .*/VirtualBox-([\d\.\-]+)_OSE.tar.bz2