[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 c3618b9d91e9d20d5efd3731f656b1597b587eb5
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date: Sun Jun 24 15:24:36 2012 +0200
disable broken sdext_pdfimport cppunit test
diff --git a/patches/disable-broken-sdext_pdfimport-cppunit-test-for-now.diff b/patches/disable-broken-sdext_pdfimport-cppunit-test-for-now.diff
new file mode 100644
index 0000000..e416252
--- /dev/null
+++ b/patches/disable-broken-sdext_pdfimport-cppunit-test-for-now.diff
@@ -0,0 +1,26 @@
+From ad81c0472c6fbf4d1df2875eaa749a06b7f09489 Mon Sep 17 00:00:00 2001
+From: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
+Date: Sun, 24 Jun 2012 15:21:22 +0200
+Subject: [PATCH] disable broken sdext_pdfimport cppunit test for now
+
+Change-Id: I536c969fa230df471acc11838f9cb23533f46271
+---
+ sdext/Module_sdext.mk | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/sdext/Module_sdext.mk b/sdext/Module_sdext.mk
+index 6280984..9aadd5f 100644
+--- a/sdext/Module_sdext.mk
++++ b/sdext/Module_sdext.mk
+@@ -49,7 +49,7 @@ $(eval $(call gb_Module_add_targets,sdext,\
+ StaticLibrary_pdfimport_s \
+ ))
+
+-$(eval $(call gb_Module_add_check_targets,sdext,\
++#$(eval $(call gb_Module_add_check_targets,sdext,\
+ CppunitTest_pdfimport \
+ ))
+ endif
+--
+1.7.9.5
+
diff --git a/patches/series b/patches/series
index d470a29..0306fa6 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-broken-sdext_pdfimport-cppunit-test-for-now.diff
--
LibreOffice packaging repository
Reply to: