[SCM] LibreOffice packaging repository branch, master, updated. 5d551ef175814b1980e8f7614ce02cd0dc4835ed
The following commit has been merged in the master branch:
commit 5d551ef175814b1980e8f7614ce02cd0dc4835ed
Author: Rene Engelhard <rene@debian.org>
Date: Fri Apr 1 19:45:42 2011 +0200
backport fix for evoab; re-enable
diff --git a/changelog b/changelog
index efdd942..8a1f751 100644
--- a/changelog
+++ b/changelog
@@ -1,7 +1,11 @@
libreoffice (1:3.3.2-2) UNRELEASED; urgency=low
+ * debian/patches/fix-evolution-local.diff: backport from libreoffice-3-3
+ branch
+
* debian/rules:
- really use internal libtextcat on squeeze (thanks dba)
+ - re-enable -evolution
* debian/libreoffice-common.postinst.in:
- try to remove /etc/openoffice if it's empty
* debian/*.mime:
@@ -14,7 +18,7 @@ libreoffice (1:3.3.2-2) UNRELEASED; urgency=low
- remove fingerprint link, create on the fly in rules; we don't want
this if we use the internal data
- -- Rene Engelhard <rene@debian.org> Wed, 30 Mar 2011 19:45:01 +0000
+ -- Rene Engelhard <rene@debian.org> Fri, 01 Apr 2011 19:45:26 +0200
libreoffice (1:3.3.2-1) unstable; urgency=low
diff --git a/control b/control
index b33ead4..05447d4 100644
--- a/control
+++ b/control
@@ -3,7 +3,7 @@ Section: editors
Priority: optional
Maintainer: Debian LibreOffice Maintainers <debian-openoffice@lists.debian.org>
Uploaders: Rene Engelhard <rene@debian.org>
-Build-Depends: lsb-release, bzip2, bison, flex | flex-old, libxaw7-dev, unzip, zip, autoconf, automake, sharutils, pkg-config, libfontconfig1-dev, libc0.1 (>= 2.10.2-7) [kfreebsd-i386 kfreebsd-amd64], zlib1g-dev, libfreetype6-dev, libx11-dev, libsm-dev, libxt-dev, libxext-dev, libxtst-dev, libice-dev, libsane-dev, libxrender-dev, libcups2-dev, libarchive-zip-perl, libpng12-dev, libjpeg-dev, libxml2-dev, libexpat1-dev, fastjar, xsltproc, libxkbfile-dev, libxinerama-dev, x11proto-render-dev, unixodbc-dev (>= 2.2.11), libxml-parser-perl, gperf, libpq-dev, po-debconf, bc, wget | curl, g++ (>> 4.3.0) [s390], gcc (>> 4.3.0) [s390], dpkg-dev (>= 1.15.1), libgl1-mesa-dev [!armel !mips !mipsel], libglu1-mesa-dev [!armel !mips !mipsel], libpoppler-dev (>= 0.8.0), libgraphite-dev, libtextcat-dev (>= 2.2-8), libcurl4-gnutls-dev, libssl-dev, libdb-dev, python (>= 2.6.6-3+squeeze4), python-dev, debhelper (>= 7.2.3~), epm, libcppunit-dev (>= 1.12), openjdk-6-jdk [alpha amd64 armel armhf i3
86 powerpc powerpcspe ppc64 s390 s390x sparc], gcj-native-helper [!powerpc !powerpcspe !ppc64], libgcj-common (>= 1:4.4.1) [!powerpc !powerpcspe !ppc64], ant (>= 1.7.0), ant-optional (>= 1.7.0), gcc-mingw32, mingw32-runtime, libcommons-codec-java, libcommons-httpclient-java, libcommons-lang-java, libcommons-logging-java, libservlet2.5-java, libbase-java-openoffice.org [!armel], libsac-java [!armel], libxml-java-openoffice.org [!armel], libflute-java-openoffice.org [!armel], libpentaho-reporting-flow-engine-java-openoffice.org [!armel], liblayout-java-openoffice.org [!armel], libloader-java-openoffice.org [!armel], libformula-java-openoffice.org [!armel], librepository-java-openoffice.org [!armel], libfonts-java-openoffice.org [!armel], libserializer-java-openoffice.org [!armel], libcommons-logging-java, libservlet2.5-java, xulrunner-dev, libnss3-dev (>= 3.12.3), dmake (>= 1:4.11), mono-devel (>= 2.4.2.3) [amd64 i386 ia64 kfreebsd-amd64 kfreebsd-i386], libmono-dev (>= 2.4.2.3
) [amd64 i386 ia64 kfreebsd-amd64 kfreebsd-i386], mono-utils (>= 2.4.2.3) [amd64 i386 ia64 kfreebsd-amd64 kfreebsd-i386], cli-common-dev (>= 0.5.7) [amd64 i386 ia64 kfreebsd-amd64 kfreebsd-i386], libhunspell-dev (>= 1.1.5-2), libhyphen-dev (>= 2.4), libstlport4.6-dev (>= 4.6.2-3) [i386], libboost-dev (>= 1.38), libmdds-dev, libvigraimpex-dev, libwpd-dev (>= 0.9.0), libmythes-dev (>= 2:1.2), libwps-dev (>= 0.2.0), libwpg-dev (>= 0.2.0), libicu-dev (>= 4.0), libxslt1-dev, libcairo2-dev, kdelibs5-dev (>= 4:4.3.4), libqt4-dev (>= 4.5), libmysqlclient-dev, libmysqlcppconn-dev (>= 1.1.0~r791), libxrandr-dev, liblucene2-java (>= 2.3.2), libhsqldb-java (>> 1.8.0.10), bsh (>= 2.0b4), liblpsolve55-dev (>= 5.5.0.13-5+b1), lp-solve (>= 5.5.0.13-5+b1), libsuitesparse-dev (>= 1:3.4.0), libdbus-glib-1-dev (>= 0.60), libgstreamer-plugins-base0.10-dev, libneon27-gnutls-dev, librdf0-dev (>= 1.0.8), libgtk2.0-dev (>= 2.10), libgnomevfs2-dev, libgconf2-dev, libldap2-dev
+Build-Depends: lsb-release, bzip2, bison, flex | flex-old, libxaw7-dev, unzip, zip, autoconf, automake, sharutils, pkg-config, libfontconfig1-dev, libc0.1 (>= 2.10.2-7) [kfreebsd-i386 kfreebsd-amd64], zlib1g-dev, libfreetype6-dev, libx11-dev, libsm-dev, libxt-dev, libxext-dev, libxtst-dev, libice-dev, libsane-dev, libxrender-dev, libcups2-dev, libarchive-zip-perl, libpng12-dev, libjpeg-dev, libxml2-dev, libexpat1-dev, fastjar, xsltproc, libxkbfile-dev, libxinerama-dev, x11proto-render-dev, unixodbc-dev (>= 2.2.11), libxml-parser-perl, gperf, libpq-dev, po-debconf, bc, wget | curl, g++ (>> 4.3.0) [s390], gcc (>> 4.3.0) [s390], dpkg-dev (>= 1.15.1), libgl1-mesa-dev [!armel !mips !mipsel], libglu1-mesa-dev [!armel !mips !mipsel], libpoppler-dev (>= 0.8.0), libgraphite-dev, libtextcat-dev (>= 2.2-8), libcurl4-gnutls-dev, libssl-dev, libdb-dev, python (>= 2.6.6-3+squeeze4), python-dev, debhelper (>= 7.2.3~), epm, libcppunit-dev (>= 1.12), openjdk-6-jdk [alpha amd64 armel armhf i3
86 powerpc powerpcspe ppc64 s390 s390x sparc], gcj-native-helper [!powerpc !powerpcspe !ppc64], libgcj-common (>= 1:4.4.1) [!powerpc !powerpcspe !ppc64], ant (>= 1.7.0), ant-optional (>= 1.7.0), gcc-mingw32, mingw32-runtime, libcommons-codec-java, libcommons-httpclient-java, libcommons-lang-java, libcommons-logging-java, libservlet2.5-java, libbase-java-openoffice.org [!armel], libsac-java [!armel], libxml-java-openoffice.org [!armel], libflute-java-openoffice.org [!armel], libpentaho-reporting-flow-engine-java-openoffice.org [!armel], liblayout-java-openoffice.org [!armel], libloader-java-openoffice.org [!armel], libformula-java-openoffice.org [!armel], librepository-java-openoffice.org [!armel], libfonts-java-openoffice.org [!armel], libserializer-java-openoffice.org [!armel], libcommons-logging-java, libservlet2.5-java, xulrunner-dev, libnss3-dev (>= 3.12.3), dmake (>= 1:4.11), mono-devel (>= 2.4.2.3) [amd64 i386 ia64 kfreebsd-amd64 kfreebsd-i386], libmono-dev (>= 2.4.2.3
) [amd64 i386 ia64 kfreebsd-amd64 kfreebsd-i386], mono-utils (>= 2.4.2.3) [amd64 i386 ia64 kfreebsd-amd64 kfreebsd-i386], cli-common-dev (>= 0.5.7) [amd64 i386 ia64 kfreebsd-amd64 kfreebsd-i386], libhunspell-dev (>= 1.1.5-2), libhyphen-dev (>= 2.4), libstlport4.6-dev (>= 4.6.2-3) [i386], libboost-dev (>= 1.38), libmdds-dev, libvigraimpex-dev, libwpd-dev (>= 0.9.0), libmythes-dev (>= 2:1.2), libwps-dev (>= 0.2.0), libwpg-dev (>= 0.2.0), libicu-dev (>= 4.0), libxslt1-dev, libcairo2-dev, kdelibs5-dev (>= 4:4.3.4), libqt4-dev (>= 4.5), libmysqlclient-dev, libmysqlcppconn-dev (>= 1.1.0~r791), libebook1.2-dev [!armel], libxrandr-dev, liblucene2-java (>= 2.3.2), libhsqldb-java (>> 1.8.0.10), bsh (>= 2.0b4), liblpsolve55-dev (>= 5.5.0.13-5+b1), lp-solve (>= 5.5.0.13-5+b1), libsuitesparse-dev (>= 1:3.4.0), libdbus-glib-1-dev (>= 0.60), libgstreamer-plugins-base0.10-dev, libneon27-gnutls-dev, librdf0-dev (>= 1.0.8), libgtk2.0-dev (>= 2.10), libgnomevfs2-dev, libgconf2-dev, libldap2-de
v
Build-Depends-Indep: fdupes, xml-core, imagemagick, fontforge
Build-Conflicts: libcairo2 (= 1.4.8-1), libxul-dev (= 1.8.0.13~pre070720-0etch1), gjdoc (= 0.7.8-2), libc6-dev (= 2.6.1-3) [i386 amd64], libc6-dev (= 2.6.1-4) [i386 amd64], nvidia-glx-dev, nvidia-glx-legacy-dev, libmono-dev (= 1.2.6+dfsg-1), libmono-dev (= 1.2.6+dfsg-2), libmono-dev (= 1.2.6+dfsg-3), libmono-dev (= 1.2.6+dfsg-4), libmono-dev (= 2.4+dfsg-2) [sparc], gcj-4.2 (= 4.2.2-6), flex (= 2.5.34-1) [amd64], libboost1.39-dev (<< 1.39.0-2), graphicsmagick-imagemagick-compat (<< 1.3.9~), ant (= 1.8.0-1) [hppa ia64 kfreebsd-i386 kfreebsd-amd64 mips mipsel], ant (= 1.8.0-2) [hppa ia64 kfreebsd-i386 kfreebsd-amd64 mips mipsel], ant (= 1.8.0-3) [hppa ia64 kfreebsd-i386 kfreebsd-amd64 mips mipsel], base-files (= 6.0), base-files (= 6.0squeeze1), libhsqldb-java (>= 1.8.1~)
Standards-Version: 3.9.1
@@ -3448,3 +3448,16 @@ Description: MySQL Connector extension for LibreOffice
The MySQL Connector extension allows to use the MySQL database from
LibreOffice without any wrapper layer such as ODBC or JDBC.
+Package: libreoffice-evolution
+Architecture: alpha amd64 armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386
+Section: gnome
+Depends: libreoffice-core (= ${binary:Version}), libreoffice-base, ${shlibs:Depends}, ${libebook-dep}, ${misc:Depends}
+Recommends: evolution
+Conflicts: ure (<< 1.5.1+OOo3.1.1-15)
+Description: office productivity suite -- Evolution addressbook support
+ LibreOffice is a full-featured office productivity suite that provides
+ a near drop-in replacement for Microsoft(R) Office.
+ .
+ This package allows LibreOffice to access Evolution address books.
+ You need to install evolution separately.
+
diff --git a/patches/fix-evolution-local.diff b/patches/fix-evolution-local.diff
new file mode 100644
index 0000000..193392c
--- /dev/null
+++ b/patches/fix-evolution-local.diff
@@ -0,0 +1,69 @@
+--- /dev/null 2011-03-30 10:29:57.024592290 +0200
++++ libreoffice-3.3.2/libreoffice-build/patches/dev300/fix-evolution-local.diff 2011-04-01 19:42:04.000000000 +0200
+@@ -0,0 +1,56 @@
++ connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx | 13 +++++++------
++ connectivity/source/drivers/evoab2/NResultSet.cxx | 3 ++-
++ 2 files changed, 9 insertions(+), 7 deletions(-)
++
++New commits:
++commit 2833c4cb4dc6c6def3d3cb3b134f22eda3a87207
++Author: Michael Meeks <michael.meeks@novell.com>
++Date: Fri Apr 1 15:55:42 2011 +0100
++
++ fix evolution local addressbook integration, which uses a new local: uri
++
++diff --git a/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx b/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx
++index c6dc8bb..d868b2a 100644
++--- connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx
+++++ connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx
++@@ -1147,19 +1147,20 @@ Reference< XResultSet > SAL_CALL OEvoabDatabaseMetaData::getTables(
++
++ switch (m_pConnection->getSDBCAddressType()) {
++ case SDBCAddress::EVO_GWISE:
++- if (0==strncmp( "groupwise://", p, 11 ))
+++ if ( !strncmp( "groupwise://", p, 11 ))
++ break;
++- else
+++ else
++ continue;
++ case SDBCAddress::EVO_LOCAL:
++- if (0==strncmp( "file://", p, 6 ))
+++ if ( !strncmp( "file://", p, 6 ) ||
+++ !strncmp( "local://", p, 6 ) )
++ break;
++ else
++ continue;
++- case SDBCAddress::EVO_LDAP:
++- if (0==strncmp( "ldap://";, p, 6 ))
+++ case SDBCAddress::EVO_LDAP:
+++ if ( !strncmp( "ldap://";, p, 6 ))
++ break;
++- else
+++ else
++ continue;
++ case SDBCAddress::Unknown:
++ break;
++diff --git a/connectivity/source/drivers/evoab2/NResultSet.cxx b/connectivity/source/drivers/evoab2/NResultSet.cxx
++index 4bea08a..e16e459 100644
++--- connectivity/source/drivers/evoab2/NResultSet.cxx
+++++ connectivity/source/drivers/evoab2/NResultSet.cxx
++@@ -182,7 +182,8 @@ static bool isLDAP( EBook *pBook )
++
++ static bool isLocal( EBook *pBook )
++ {
++- return pBook && !strncmp( "file://", e_book_get_uri( pBook ), 6 );
+++ return pBook && ( !strncmp( "file://", e_book_get_uri( pBook ), 6 ) ||
+++ !strncmp( "local:", e_book_get_uri( pBook ), 6 ) );
++ }
++
++ static bool isAuthRequired( EBook *pBook )
+--- libreoffice-3.3.2/libreoffice-build/patches/dev300/apply-old 2011-04-01 19:43:52.000000000 +0200
++++ libreoffice-3.3.2/libreoffice-build/patches/dev300/apply 2011-04-01 19:44:02.000000000 +0200
+@@ -845,6 +845,7 @@
+ # I think that the Evolution 1.x address book is obsolete anyway
+ buildfix-evo1-vs-evo2.diff, bnc#496902, i#101439, pmladek
+
++fix-evolution-local.diff
+
+ [ DebianBaseOnly ]
+ # add JDK paths for MySQL, PostgreSQL, JTDS
diff --git a/patches/series b/patches/series
index b8cb791..ed51728 100644
--- a/patches/series
+++ b/patches/series
@@ -8,3 +8,4 @@ alpha-no-relax.diff
ppc-openjdk.diff
no-minimaltoc.diff
update-debian-opt.diff
+fix-evolution-local.diff
diff --git a/rules b/rules
index e2b5078..543b86e 100755
--- a/rules
+++ b/rules
@@ -249,7 +249,7 @@ ENABLE_MINIMIZER=y
ENABLE_PRESENTER_CONSOLE=y
ENABLE_PDFIMPORT=y
BUILD_GTK=y
-ENABLE_EVO2=n
+ENABLE_EVO2=y
ENABLE_GVFS=y
ENABLE_GCONF=y
# broken!
--
LibreOffice packaging repository
Reply to: