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

[SCM] LibreOffice packaging repository branch, debian-experimental-3.4.0, updated. f6e0f0ece62eac484adaed388fce8b1a7f73e8d0



The following commit has been merged in the debian-experimental-3.4.0 branch:
commit 4894e2ae27499d2995dfba5558c853d8b86d21c4
Author: Rene Engelhard <rene@debian.org>
Date:   Fri May 27 22:50:32 2011 +0200

    fix sal unittests, disable speed-sal-fewer-lstats.diff

diff --git a/patches/buildfix-patches.diff b/patches/buildfix-patches.diff
index b4c1aaf..7d4a225 100644
--- a/patches/buildfix-patches.diff
+++ b/patches/buildfix-patches.diff
@@ -1,3 +1,16 @@
+diff --git a/patches/dev300/apply b/patches/dev300/apply
+index dd51188..bc5cf54 100644
+--- libreoffice-3.4.0/libreoffice-build/patches/dev300/apply
++++ libreoffice-3.4.0/libreoffice-build/patches/dev300/apply
+@@ -148,7 +148,7 @@ gcc-HelpLinker.diff # RENAMED transex3 -> l10ntools
+ # don't lstat() that much while creating absolute URLs - breaks unopkg
+ # run as e.g. used during Mac dmg generation, as parts of the
+ # configmgr paths are not yet existing then
+-speed-sal-fewer-lstats.diff, i#89730, jholesov
++#speed-sal-fewer-lstats.diff, i#89730, jholesov
+
+ #[ CJKTemporaryHacks ]
+ # the following patch is disabled temporary.
 --- libreoffice-3.3.0/libreoffice-build/patches/dev300/reportdesign-mention-package-l10n.diff-old	2011-02-09 17:44:39.000000000 +0100
 +++ libreoffice-3.3.0/libreoffice-build/patches/dev300/reportdesign-mention-package-l10n.diff	2011-02-09 17:47:38.000000000 +0100
 @@ -1,8 +1,7 @@

-- 
LibreOffice packaging repository


Reply to: