The following commit has been merged in the ubuntu-quantal-3.6 branch:
commit 3739f22512022771aa13f3accd65754a55f0617d
Author: Bjoern Michaelsen <bjoern.michael...@canonical.com>
Date: Sun Jun 24 14:31:46 2012 +0200
renable xmloff subsequentcheck as long as we are on gcc-4.6
diff --git a/patches/disable-xmloff-subsequentchecks-for-fdo-51324-for-no.diff
b/patches/disable-xmloff-subsequentchecks-for-fdo-51324-for-no.diff
deleted file mode 100644
index 0a0dd99..0000000
--- a/patches/disable-xmloff-subsequentchecks-for-fdo-51324-for-no.diff
+++ /dev/null
@@ -1,27 +0,0 @@
-From cf8640ded9612f65789931e99d2ad98b1e2b940a Mon Sep 17 00:00:00 2001
-From: Bjoern Michaelsen <bjoern.michael...@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 c2dbddd..d470a29 100644
--- a/patches/series
+++ b/patches/series
@@ -31,4 +31,3 @@ 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
--
To UNSUBSCRIBE, email to debian-openoffice-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1sinyx-0005th...@vasks.debian.org
