[SCM] LibreOffice packaging repository branch, ubuntu-quantal-3.6, updated. libreoffice_3.5.4-3-123-gc3618b9
The following commit has been merged in the ubuntu-quantal-3.6 branch:
commit b68c6297e35de7d3a22c249d79ab7d24ebf15ae2
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date: Fri Jun 22 12:07:29 2012 +0200
disable xmloff subsequentchecks for fdo#51324 for now
Conflicts:
patches/series
diff --git a/patches/disable-xmloff-subsequentchecks-for-fdo-51324-for-no.diff b/patches/disable-xmloff-subsequentchecks-for-fdo-51324-for-no.diff
new file mode 100644
index 0000000..0a0dd99
--- /dev/null
+++ b/patches/disable-xmloff-subsequentchecks-for-fdo-51324-for-no.diff
@@ -0,0 +1,27 @@
+From cf8640ded9612f65789931e99d2ad98b1e2b940a Mon Sep 17 00:00:00 2001
+From: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
+Date: Fri, 22 Jun 2012 12:05:34 +0200
+Subject: [PATCH] disable xmloff subsequentchecks for fdo#51324 for now
+
+Change-Id: Ie59810c1c6ff3523631a4fc75de48d09c7f461b3
+---
+ xmloff/Module_xmloff.mk | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/xmloff/Module_xmloff.mk b/xmloff/Module_xmloff.mk
+index db84838..bc5f90f 100644
+--- a/xmloff/Module_xmloff.mk
++++ b/xmloff/Module_xmloff.mk
+@@ -35,7 +35,8 @@ $(eval $(call gb_Module_add_targets,xmloff,\
+ Package_inc \
+ ))
+
+-$(eval $(call gb_Module_add_subsequentcheck_targets,xmloff,\
++# fdo#51324
++#$(eval $(call gb_Module_add_subsequentcheck_targets,xmloff,\
+ JunitTest_xmloff_unoapi \
+ ))
+
+--
+1.7.9.5
+
diff --git a/patches/series b/patches/series
index d470a29..c2dbddd 100644
--- a/patches/series
+++ b/patches/series
@@ -31,3 +31,4 @@ s390-remove-fsigned-char.diff
fix-verbosity.diff
lp-753627-readd-updated-Ubuntu-brand-palette-colors.diff
remove-broken-mysqlcon-version-check.diff
+disable-xmloff-subsequentchecks-for-fdo-51324-for-no.diff
--
LibreOffice packaging repository
Reply to: