[SCM] LibreOffice packaging repository branch, debian-experimental-3.5, updated. libreoffice_3.5.0_rc2-2-28-g9514122
The following commit has been merged in the debian-experimental-3.5 branch:
commit 95141229b8ff3a53f944e10488796a11678373a5
Author: Rene Engelhard <rene@debian.org>
Date: Sat Feb 4 11:28:05 2012 +0100
also disable sw unoapi test
diff --git a/changelog b/changelog
index 26d229b..1bb93e8 100644
--- a/changelog
+++ b/changelog
@@ -16,7 +16,7 @@ libreoffice (1:3.5.0~rc3-1) experimental; urgency=low
- simplify -dbg/--enable-symbols conditionals
- build with default boost again but add build-dep on g++-4.6 (>= 4.6.2-12)
- -- Rene Engelhard <rene@debian.org> Sat, 04 Feb 2012 00:17:47 +0100
+ -- Rene Engelhard <rene@debian.org> Sat, 04 Feb 2012 11:27:46 +0100
libreoffice (1:3.5.0~rc2-2) experimental; urgency=low
diff --git a/patches/disable-sc-unoapi-subsequentcheck-for-now.diff b/patches/disable-sc-sw-unoapi-subsequentcheck-for-now.diff
similarity index 56%
rename from patches/disable-sc-unoapi-subsequentcheck-for-now.diff
rename to patches/disable-sc-sw-unoapi-subsequentcheck-for-now.diff
index 25d5bae..8ff75ea 100644
--- a/patches/disable-sc-unoapi-subsequentcheck-for-now.diff
+++ b/patches/disable-sc-sw-unoapi-subsequentcheck-for-now.diff
@@ -1,12 +1,3 @@
-From 23f23a5de14eabd80fd18e57ac03d34208ffb852 Mon Sep 17 00:00:00 2001
-From: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
-Date: Thu, 22 Dec 2011 23:46:42 +0100
-Subject: [PATCH] disable sc unoapi subsequentcheck for now
-
----
- sc/Module_sc.mk | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
diff --git a/sc/Module_sc.mk b/sc/Module_sc.mk
index 9c8696b..385e126 100644
--- a/sc/Module_sc.mk
@@ -23,3 +14,14 @@ index 9c8696b..385e126 100644
--
1.7.5.4
+--- a/sw/Module_sw.mk-old 2012-02-04 11:25:21.000000000 +0100
++++ b/sw/Module_sw.mk 2012-02-04 11:25:30.000000000 +0100
+@@ -48,7 +48,7 @@
+
+ $(eval $(call gb_Module_add_subsequentcheck_targets,sw,\
+ JunitTest_sw_complex \
+- JunitTest_sw_unoapi \
+ ))
++# JunitTest_sw_unoapi \
+
+ # vim: set noet sw=4 ts=4:
diff --git a/patches/series b/patches/series
index e998d91..041039f 100644
--- a/patches/series
+++ b/patches/series
@@ -25,7 +25,7 @@ fix-ARM-detection-in-set-soenv.diff
add-debian-multiarch-support.diff
revert-468fe685e3c58c84bce6d9a48b931dcc21682679.diff
propagate-gb_FULLDEPS.diff
-disable-sc-unoapi-subsequentcheck-for-now.diff
+disable-sc-sw-unoapi-subsequentcheck-for-now.diff
SwTblBoxFormula-destructor.diff
ia64-oox-size.diff
mediwiki-oor-replace.diff
--
LibreOffice packaging repository
Reply to: