[SCM] LibreOffice packaging repository branch, debian-experimental-3.4.0, updated. libreoffice_3.4.1-1-38-gc3e807c
The following commit has been merged in the debian-experimental-3.4.0 branch:
commit 198e33085084a8c577bd479660e3be17748316d1
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date: Tue Jul 19 16:33:13 2011 +0200
update ubuntufixes: as-needed fix for gbuild, bump libebook so name again
diff --git a/changelog b/changelog
index be3bb2a..3388b6c 100644
--- a/changelog
+++ b/changelog
@@ -17,6 +17,7 @@ libreoffice (1:3.4.1-2) UNRELEASED; urgency=low
- fix -javafilter.destop Exec=
* debian/copyright: s/Specificatin/Specification/, thanks Jakub Wilk
* merge from ubuntu-oneiric-3.4:
+ - bump libebook so name to allow for libebook-1.2.so-11 too
- disable --dynamic-list-cpp-new/--dynamic-list-cpp-typeino
as they SIGSEGV ld from binutils-2.21.52.20110707-1ubuntu1
diff --git a/patches/libebook-1.2.so.11.diff b/patches/libebook-1.2.so.11.diff
new file mode 100644
index 0000000..b6b0d4e
--- /dev/null
+++ b/patches/libebook-1.2.so.11.diff
@@ -0,0 +1,28 @@
+Index: libreoffice-3.4.1/libreoffice-build/patches/hotfixes/ubuntufixes.diff
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ libreoffice-3.4.1/libreoffice-build/patches/hotfixes/libebook-1.2.so.11.diff 2011-07-19 16:29:10.855486007 +0200
+@@ -0,0 +1,23 @@
++From 795ac1b9088af83e36661d59b816edbe5aef5eab Mon Sep 17 00:00:00 2001
++From: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
++Date: Tue, 19 Jul 2011 15:48:36 +0200
++Subject: [PATCH 2/2] libebook-1.2.so SONAME bumped again
++
++---
++ connectivity/source/drivers/evoab2/EApi.cxx | 1 +
++ 1 files changed, 1 insertions(+), 0 deletions(-)
++
++diff --git a/connectivity/source/drivers/evoab2/EApi.cxx b/connectivity/source/drivers/evoab2/EApi.cxx
++index 1767ec1..f93d67a 100644
++--- connectivity/source/drivers/evoab2/EApi.cxx
+++++ connectivity/source/drivers/evoab2/EApi.cxx
++@@ -35,6 +35,7 @@
++ #define DECLARE_FN_POINTERS 1
++ #include "EApi.h"
++ static const char *eBookLibNames[] = {
+++ "libebook-1.2.so.11", // bumped again
++ "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+
++--
++1.7.5.4
diff --git a/patches/series b/patches/series
index f33a8fe..9e0f6ae 100644
--- a/patches/series
+++ b/patches/series
@@ -14,3 +14,4 @@ bsh-hardcode-path.diff
mips-openjdk-jre-paths.diff
autogen.diff
disable-dynamic-list-cpp.diff
+libebook-1.2.so.11.diff
--
LibreOffice packaging repository
Reply to: