[SCM] LibreOffice packaging repository branch, master, updated. 109e9b4b167876fab71911d224dcd261cf5db93f
The following commit has been merged in the master branch:
commit 109e9b4b167876fab71911d224dcd261cf5db93f
Author: Rene Engelhard <rene@debian.org>
Date: Mon Jun 6 16:42:44 2011 +0000
update to 3.3.3 rc1
diff --git a/changelog b/changelog
index 25a6c2f..7998e66 100644
--- a/changelog
+++ b/changelog
@@ -1,4 +1,6 @@
-libreoffice (1:3.3.2-5) UNRELEASED; urgency=low
+libreoffice (1:3.3.3~rc1-1) UNRELEASED; urgency=low
+
+ * new upstream release candidate
* debian/patches/disable-optional-outplace-ole.diff: as name says; makes
toolbars work in e.g. Base edit forms (closes: #617319)
@@ -8,7 +10,7 @@ libreoffice (1:3.3.2-5) UNRELEASED; urgency=low
- stop moving vbaevents*.uno.so to -calc. Move libvbaswobj*uno.so
to -writer
- -- Rene Engelhard <rene@debian.org> Sun, 29 May 2011 22:13:56 +0000
+ -- Rene Engelhard <rene@debian.org> Mon, 06 Jun 2011 17:54:18 +0200
libreoffice (1:3.3.2-4) unstable; urgency=low
diff --git a/patches/fix-evolution-local.diff b/patches/fix-evolution-local.diff
deleted file mode 100644
index 193392c..0000000
--- a/patches/fix-evolution-local.diff
+++ /dev/null
@@ -1,69 +0,0 @@
---- /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 f1314d6..26c6bd0 100644
--- a/patches/series
+++ b/patches/series
@@ -8,7 +8,6 @@ alpha-no-relax.diff
ppc-openjdk.diff
no-minimaltoc.diff
update-debian-opt.diff
-fix-evolution-local.diff
gcc4.6.0.diff
odk-jni-include.diff
disable-optional-outplace-ole.diff
diff --git a/rules b/rules
index 3b83174..26aeaf8 100755
--- a/rules
+++ b/rules
@@ -81,8 +81,8 @@ MWS=OOO330
MILESTONE=m19
TAG=$(shell echo $(MWS) | tr A-Z a-z)-$(MILESTONE)
GIT_TAG=$(MWS)_$(MILESTONE)
-OOO_BUILD_BRANCH=libreoffice-3-3-2
-OOO_BUILD_VERSION=3.3.2.2
+OOO_BUILD_BRANCH=libreoffice-3-3-3
+OOO_BUILD_VERSION=3.3.3.1
# in ooo-build releases the same as OOO_BUILD_VERSION
OOO_BUILD_TARBALL_VERSION=$(OOO_BUILD_VERSION)
OOO_BUILD_TAG=libreoffice-$(OOO_BUILD_TARBALL_VERSION)
--
LibreOffice packaging repository
Reply to: