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

[meskes at alioth.debian.org]

Author: meskes
Date: 2008-05-12 09:49:17 +0000 (Mon, 12 May 2008)
New Revision: 286

Added:
   tags/1.5.6-dfsg-7/debian/patches/15-asm-sed.dpatch
Modified:
   tags/1.5.6-dfsg-7/debian/changelog
Log:
Seems this sed file needs an update too.



Modified: tags/1.5.6-dfsg-7/debian/changelog
===================================================================
--- tags/1.5.6-dfsg-7/debian/changelog	2008-05-11 21:20:58 UTC (rev 285)
+++ tags/1.5.6-dfsg-7/debian/changelog	2008-05-12 09:49:17 UTC (rev 286)
@@ -12,7 +12,9 @@
   * Patched module Makefile to allow amd64 build in linux-modules-extra-2.6.
   * Added patch by Pascal Volk <user at localhost.localdomain.org> to prevent
     init script from overwriting values, closes: #475193
-  * Added patch from upstream SVN to fix FTBFS in xpcom, closes: #479910.
+  * Added patch from upstream SVN to fix FTBFS in xpcom, closes: #479910
+  * Took another change from SVN to update sed file for newer buildchain.
+  * Recompiled against latest libxalan110, closes: #480739
 
   [ Daniel Baumann ]
   * Correcting wrong module-assistant manpage section in

Added: tags/1.5.6-dfsg-7/debian/patches/15-asm-sed.dpatch
===================================================================
--- tags/1.5.6-dfsg-7/debian/patches/15-asm-sed.dpatch	                        (rev 0)
+++ tags/1.5.6-dfsg-7/debian/patches/15-asm-sed.dpatch	2008-05-12 09:49:17 UTC (rev 286)
@@ -0,0 +1,45 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 15-asm-sed.dpatch by Michael Meskes <meskes at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Update ASM sed file for newer buildchain
+
+ at DPATCH@
+
+--- virtualbox-ose-1.5.6-dfsg/src/VBox/VMM/testcase/tstAsmStructsAsm-lst.sed	2007-03-21 20:57:54.000000000 +0100
++++ virtualbox-ose-1.6.0-dfsg/src/VBox/VMM/testcase/tstAsmStructsAsm-lst.sed	2008-05-01 17:27:48.000000000 +0200
+@@ -17,9 +17,11 @@
+ #
+ # Figure which type of line this is and process it accordingly.
+ #
+-/^[A-Za-z][A-Za-z0-9_]*:/b struct
++/^[A-Za-z_][A-Za-z0-9_]*:/b struct
+ /<gap>/b member
++/^\.[A-Za-z_][A-Za-z0-9_.:]* res.*$/b member_two
+ b error
++b member_two
+ 
+ 
+ #
+@@ -48,6 +50,21 @@
+ 
+ b end
+ 
++
++#
++# Struct member, no address. yasm r1842 and later.
++#
++:member_two
++s/[:]*  *res[bwdtq] .*$//
++s/$/ /
++/^\.[a-zA-Z0-9_.]* *$/!t error
++G
++s/^\([^ ]*\) \(.*\)$/global \2\1 ; member2/
++s/\n//m
++
++b end
++
++
+ :error
+ s/^/\nSed script logic error!\nBuffer: /
+ s/$/\nHold: /