[Pkg-virtualbox-commits] r283 - tags/1.5.6-dfsg-7/debian tags/1.5.6-dfsg-7/debian/patches trunk/debian

[meskes at alioth.debian.org]

Author: meskes
Date: 2008-05-11 21:15:42 +0000 (Sun, 11 May 2008)
New Revision: 283

Added:
   tags/1.5.6-dfsg-7/debian/patches/14-xpcom-make.dpatch
Modified:
   tags/1.5.6-dfsg-7/debian/changelog
   trunk/debian/changelog
Log:
Added patch to fix FTFBS in xpcom in 1.5.6.


Modified: tags/1.5.6-dfsg-7/debian/changelog
===================================================================
--- tags/1.5.6-dfsg-7/debian/changelog	2008-05-11 21:04:59 UTC (rev 282)
+++ tags/1.5.6-dfsg-7/debian/changelog	2008-05-11 21:15:42 UTC (rev 283)
@@ -12,6 +12,7 @@
   * 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.
 
   [ Daniel Baumann ]
   * Correcting wrong module-assistant manpage section in

Added: tags/1.5.6-dfsg-7/debian/patches/14-xpcom-make.dpatch
===================================================================
--- tags/1.5.6-dfsg-7/debian/patches/14-xpcom-make.dpatch	                        (rev 0)
+++ tags/1.5.6-dfsg-7/debian/patches/14-xpcom-make.dpatch	2008-05-11 21:15:42 UTC (rev 283)
@@ -0,0 +1,20 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 14-xpcom-make.dpatch by Michael Meskes <meskes at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: XPCOMBLDPROG should extend VBOXBLDPROG not the non-existing BLDPROG
+
+ at DPATCH@
+
+diff -ruN virtualbox-ose-1.5.6-dfsg.orig/src/libs/xpcom18a4/Makefile.kmk virtualbox-ose-1.5.6-dfsg/src/libs/xpcom18a4/Makefile.kmk
+--- virtualbox-ose-1.5.6-dfsg.orig/src/libs/xpcom18a4/Makefile.kmk	2007-08-14 14:26:00.000000000 +0200
++++ virtualbox-ose-1.5.6-dfsg/src/libs/xpcom18a4/Makefile.kmk	2008-05-11 23:12:15.000000000 +0200
+@@ -139,7 +139,7 @@
+ # and CXXFLAGS completely at the moment.
+ #
+ TEMPLATE_XPCOMBLDPROG                   = XPCOM Build programs executables
+-TEMPLATE_XPCOMBLDPROG_EXTENDS           = BLDPROG
++TEMPLATE_XPCOMBLDPROG_EXTENDS           = VBOXBLDPROG
+ 
+ TEMPLATE_XPCOMBLDPROG_DEFS                      = $(TEMPLATE_BLDPROG_DEFS)                      $(TEMPLATE_XPCOMEXE_DEFS)
+ TEMPLATE_XPCOMBLDPROG_DEFS.$(BUILD_TARGET)      = $(TEMPLATE_BLDPROG_DEFS.$(BUILD_TARGET))      $(TEMPLATE_XPCOMEXE_DEFS.$(BUILD_TARGET))

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2008-05-11 21:04:59 UTC (rev 282)
+++ trunk/debian/changelog	2008-05-11 21:15:42 UTC (rev 283)
@@ -33,7 +33,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.
 
+
   [ Daniel Baumann ]
   * Correcting wrong module-assistant manpage section in
     virtualbox-ose-*source.README.Debian.