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

[SCM] LibreOffice packaging repository branch, debian-experimental-3.6, updated. libreoffice_3.6.3_rc2-1-20-g591a891



The following commit has been merged in the debian-experimental-3.6 branch:
commit 591a891e2b42a73d901bc6dc749ea28fe627a7b7
Author: Rene Engelhard <rene@debian.org>
Date:   Wed Oct 31 18:52:19 2012 +0100

    remove obsolete disable-broken-sdext_pdfimport-cppunit-test-for-now.diff

diff --git a/patches/disable-broken-sdext_pdfimport-cppunit-test-for-now.diff b/patches/disable-broken-sdext_pdfimport-cppunit-test-for-now.diff
deleted file mode 100644
index e416252..0000000
--- a/patches/disable-broken-sdext_pdfimport-cppunit-test-for-now.diff
+++ /dev/null
@@ -1,26 +0,0 @@
-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 a4826a9..a6818d5 100644
--- a/patches/series
+++ b/patches/series
@@ -25,7 +25,6 @@ gtk3-hack-explicit-gmodule.diff
 pyuno-py3-module.diff
 ignore-sc_cellrangesbase-fails.diff
 build-dont-run-checks.diff
-#disable-broken-sdext_pdfimport-cppunit-test-for-now.diff
 disable-flaky-unoapi-tests.diff
 soffice-bashisms.diff
 he-lucida-sans-unicode.diff

-- 
LibreOffice packaging repository


Reply to: