[SCM] LibreOffice packaging repository branch, master, updated. libreoffice_3.4.4-1-3-g01b5bc9
The following commit has been merged in the master branch:
commit 01b5bc9fa1fe615c9e2a15ec0dd1717bd7e97e65
Author: Rene Engelhard <rene@debian.org>
Date: Sat Nov 19 00:44:59 2011 +0100
rename libebook-1.2.so.11.diff to libebook-1.2.so.12.diff and update accordingly (evolution 3.2)
diff --git a/changelog b/changelog
index 7f82868..c6d6a5b 100644
--- a/changelog
+++ b/changelog
@@ -1,10 +1,14 @@
libreoffice (1:3.4.4-2) UNRELEASED; urgency=low
+ * debian/patches/libebook-1.2.so.11.diff: remove ...
+ * debian/patches/libebook-1.2.so.12.diff: ... for this and update
+ accordingly (evolution 3.2)
+
* debian/rules:
- recommend fonts-thai-tlwg instead of ttf-thai-tlwg (closes: #648785)
- disable mono in prepartion for mono transition
- -- Rene Engelhard <rene@debian.org> Wed, 16 Nov 2011 22:30:42 +0000
+ -- Rene Engelhard <rene@debian.org> Sat, 19 Nov 2011 00:43:52 +0100
libreoffice (1:3.4.4-1) unstable; urgency=low
diff --git a/patches/libebook-1.2.so.11.diff b/patches/libebook-1.2.so.12.diff
similarity index 95%
rename from patches/libebook-1.2.so.11.diff
rename to patches/libebook-1.2.so.12.diff
index b6b0d4e..c6e72ef 100644
--- a/patches/libebook-1.2.so.11.diff
+++ b/patches/libebook-1.2.so.12.diff
@@ -20,7 +20,7 @@ Index: libreoffice-3.4.1/libreoffice-build/patches/hotfixes/ubuntufixes.diff
+ #define DECLARE_FN_POINTERS 1
+ #include "EApi.h"
+ static const char *eBookLibNames[] = {
-++ "libebook-1.2.so.11", // bumped again
+++ "libebook-1.2.so.12", // bumped again (evolution-3.2)
+ "libebook-1.2.so.10", // bumped again
+ "libebook-1.2.so.9", // evolution-2.8
+ "libebook-1.2.so.5", // evolution-2.4 and 2.6+
diff --git a/patches/series b/patches/series
index 44297b8..52f60b7 100644
--- a/patches/series
+++ b/patches/series
@@ -13,7 +13,7 @@ bsh-hardcode-path.diff
mips-openjdk-jre-paths.diff
autogen.diff
disable-dynamic-list-cpp.diff
-libebook-1.2.so.11.diff
+libebook-1.2.so.12.diff
vbaobj-visibility-fix.diff
make-gengal-work-again.diff
fix-distro-config.diff
--
LibreOffice packaging repository
Reply to: