[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[SCM] LibreOffice packaging repository branch, debian-experimental-3.6, updated. libreoffice_3.5.4-5-104-g09006f1



The following commit has been merged in the debian-experimental-3.6 branch:
commit a44e84cf8a1adc177b39df194831c9e51e77e992
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 9a6fb63..043ec00 100644
--- a/patches/series
+++ b/patches/series
@@ -28,3 +28,4 @@ ignore-sc_cellrangesbase-fails.diff
 build-dont-run-checks.diff
 #lp-904212-add-missing-mimetypes-to-impress.desktop.diff
 disable-xmloff-subsequentchecks-for-fdo-51324-for-no.diff
+disable-broken-sdext_pdfimport-cppunit-test-for-now.diff

-- 
LibreOffice packaging repository


Reply to: