------------------------------------------------------------
revno: 1847
committer: Rene Engelhard <r...@debian.org>
branch nick: unstable
timestamp: Tue 2010-03-09 19:03:26 +0100
message:
update ooo-build to 3.2.0.8
removed:
patches/update-postgresql-sdbc-to-0.7.6a.diff
modified:
changelog
patches/series
patches/system-mysqlcpp.diff
patches/update-mysqlnative-cws.diff
rules
source/components
=== modified file 'changelog'
--- a/changelog 2010-03-09 14:34:02 +0000
+++ b/changelog 2010-03-09 18:03:26 +0000
@@ -1,5 +1,8 @@
openoffice.org (1:3.2.0-5) UNRELEASED; urgency=low
+ * ooo-build:
+ - update (3.2.0.8)
+
* debian/shell-lib-extensions.sh: handle non-existant basis-link
(closes: #561498)
* debian/patches/update-mysqlnative-cws.diff: update MySQL Connector
@@ -9,7 +12,7 @@
* debian/rules: re-enable system-mysqlcppconn (also in the STLport case);
handle MYSQLC_STATUS suffix
- -- Rene Engelhard <r...@debian.org> Mon, 08 Mar 2010 20:45:08 +0100
+ -- Rene Engelhard <r...@debian.org> Tue, 09 Mar 2010 18:48:49 +0100
openoffice.org (1:3.2.0-4) unstable; urgency=low
=== modified file 'patches/series'
--- a/patches/series 2010-03-09 14:34:02 +0000
+++ b/patches/series 2010-03-09 18:03:26 +0000
@@ -1,3 +1,2 @@
-update-postgresql-sdbc-to-0.7.6a.diff
update-mysqlnative-cws.diff
system-mysqlcpp.diff
=== modified file 'patches/system-mysqlcpp.diff'
--- a/patches/system-mysqlcpp.diff 2010-03-09 14:34:02 +0000
+++ b/patches/system-mysqlcpp.diff 2010-03-09 18:03:26 +0000
@@ -1,7 +1,7 @@
diff --git a/patches/dev300/apply b/patches/dev300/apply
index a1c1306..10ac499 100644
---- openoffice.org-3.2.0/ooo-build-3-2-0-7/patches/dev300/apply
-+++ openoffice.org-3.2.0/ooo-build-3-2-0-7/patches/dev300/apply
+--- openoffice.org-3.2.0/ooo-build-3-2-0-8/patches/dev300/apply
++++ openoffice.org-3.2.0/ooo-build-3-2-0-8/patches/dev300/apply
@@ -35,7 +35,7 @@
KDE4Experimental, MinGW, CalcExperimental, \
OOXMLExportExperimental, CrossWin32Patches, AutoLayout, \
@@ -24,7 +24,7 @@
[ GnomeSessionManagement ]
gnome-screen-saver.diff, i#106372, cmc
--- /dev/null 2010-02-27 12:54:19.449251469 +0100
-+++ openoffice.org-3.2.0/ooo-build-3-2-0-7/patches/dev300/system.mysqlcpp.diff
2010-03-08 19:47:52.000000000 +0100
++++ openoffice.org-3.2.0/ooo-build-3-2-0-8/patches/dev300/system.mysqlcpp.diff
2010-03-08 19:47:52.000000000 +0100
@@ -0,0 +1,475 @@
+diff -r 93402e754dbd configure.in
+--- configure.in Tue Mar 02 12:22:53 2010 +0100
=== modified file 'patches/update-mysqlnative-cws.diff'
--- a/patches/update-mysqlnative-cws.diff 2010-03-09 14:34:02 +0000
+++ b/patches/update-mysqlnative-cws.diff 2010-03-09 18:03:26 +0000
@@ -1,7 +1,7 @@
diff --git patches/dev300/apply patches/dev300/apply
index a1c1306..f1251e2 100644
---- openoffice.org-3.2.0/ooo-build-3-2-0-7/patches/dev300/apply
-+++ openoffice.org-3.2.0/ooo-build-3-2-0-7/patches/dev300/apply
+--- openoffice.org-3.2.0/ooo-build-3-2-0-8/patches/dev300/apply
++++ openoffice.org-3.2.0/ooo-build-3-2-0-8/patches/dev300/apply
@@ -3310,7 +3310,7 @@ writer-doc-comparison-help.diff, tzvetelina
@@ -12,7 +12,7 @@
[ MySQL and DebianBaseOnly ]
# add hack to link against STLport version of libmysqlcppconn on i386.
--- /dev/null 2010-02-27 12:54:19.449251469 +0100
-+++
openoffice.org-3.2.0/ooo-build-3-2-0-7/patches/dev300/cws-mysqlconnector.diff
2010-03-08 22:40:33.000000000 +0100
++++
openoffice.org-3.2.0/ooo-build-3-2-0-8/patches/dev300/cws-mysqlconnector.diff
2010-03-08 22:40:33.000000000 +0100
@@ -0,0 +1,12273 @@
+
+# HG changeset patch
@@ -11371,7 +11371,7 @@
++# if this is different from "final", it will be appended to the title
displayed in the Extension Manager
++# and also added to the file name of the resulting .oxt file
++MYSQLC_STATUS=Alpha
-+--- /dev/mull
++--- /dev/null
++++ mysqlc/source/delzip
+@@ -0,0 +1 @@
++
=== removed file 'patches/update-postgresql-sdbc-to-0.7.6a.diff'
--- a/patches/update-postgresql-sdbc-to-0.7.6a.diff 2010-03-05 09:51:13
+0000
+++ b/patches/update-postgresql-sdbc-to-0.7.6a.diff 1970-01-01 00:00:00
+0000
@@ -1,114 +0,0 @@
-diff --git ooo-build-3-2-0-7/patches/postgresql/sdbc-postgresql.diff
ooo-build-3-2-0-7/patches/postgresql/sdbc-postgresql.diff
-index f588017..a850911 100644
----
openoffice.org-3.2.0/ooo-build-3-2-0-7/patches/postgresql/sdbc-postgresql.diff
-+++
openoffice.org-3.2.0/ooo-build-3-2-0-7/patches/postgresql/sdbc-postgresql.diff
-@@ -20,14 +20,14 @@
- \ Kein Zeilenumbruch am Dateiende.
- --- /dev/null 2008-11-25 09:24:02.506388553 +0100
- +++ connectivity/source/drivers/postgresql/makefile.mk 2008-07-07
23:37:11.000000000 +0200
--@@ -0,0 +1,218 @@
-+@@ -0,0 +1,224 @@
- +#*************************************************************************
- +#
- +# $RCSfile: makefile.mk,v $
- +#
--+# $Revision: 1.1.2.14 $
-++# $Revision: 1.1.2.15 $
- +#
--+# last change: $Author: jbu $ $Date: 2008/07/07 21:37:11 $
-++# last change: $Author: jbu $ $Date: 2010/02/07 12:31:34 $
- +#
- +# The Contents of this file are made available subject to the terms of
- +# either of the following licenses
-@@ -104,7 +104,7 @@
- +
- +PQ_SDBC_MAJOR=0
- +PQ_SDBC_MINOR=7
--+PQ_SDBC_MICRO=6
-++PQ_SDBC_MICRO=6a
- +.IF "$(SYSTEM_POSTGRESQL)" == "YES"
- +POSTGRESQL_MAJOR=`pg_config --version | awk '{ print $$2 }' | cut -d. -f1`
- +POSTGRESQL_MINOR=`pg_config --version | awk '{ print $$2 }' | cut -d. -f2`
-@@ -217,6 +217,7 @@
- +
- +$(DLLDEST)$/$(DRIVERNAME): \
- + $(DLLDEST)$/DataAccess.xcu \
-++ $(DLLDEST)$/postgresql.xcu \
- + $(DLLDEST)$/$(SHL1TARGET)$(DLLPOST) \
- + $(DLLDEST)$/$(SHL2TARGET)$(DLLPOST) \
- + $(DLLDEST)$/$(SHL1TARGET)$(INI_EXT)
-@@ -225,7 +226,12 @@
- + $(SHL1TARGET)$(DLLPOST) \
- + $(SHL2TARGET)$(DLLPOST) \
- + $(SHL1TARGET)$(INI_EXT) \
--+ DataAccess.xcu
-++ DataAccess.xcu \
-++ postgresql.xcu
-++
-++$(DLLDEST)$/postgresql.xcu : postgresql.xcu
-++ -rm -f $@
-++ cat postgresql.xcu > $@
- +
- +$(DLLDEST)$/DataAccess.xcu : DataAccess.xcu
- + -rm -f $@
-@@ -21851,3 +21857,60 @@
- +};
- +}
- +#endif
-+Index: postgresql/postgresql.xcu
-+===================================================================
-+RCS file: postgresql/postgresql.xcu
-+diff -N postgresql/postgresql.xcu
-+--- /dev/null 1 Jan 1970 00:00:00 -0000
-++++ connectivity/source/drivers/postgresql/postgresql.xcu 7 Feb 2010
12:31:34 -0000 1.1.2.1
-+@@ -0,0 +1,50 @@
-++<?xml version="1.0" encoding="UTF-8"?>
-++<!--***********************************************************************
-++ *
-++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-++ *
-++ * Copyright 2008 by Sun Microsystems, Inc.
-++ *
-++ * OpenOffice.org - a multi-platform office productivity suite
-++ *
-++ * This file is part of OpenOffice.org.
-++ *
-++ * OpenOffice.org is free software: you can redistribute it and/or modify
-++ * it under the terms of the GNU Lesser General Public License version 3
-++ * only, as published by the Free Software Foundation.
-++ *
-++ * OpenOffice.org is distributed in the hope that it will be useful,
-++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-++ * GNU Lesser General Public License version 3 for more details
-++ * (a copy is included in the LICENSE file that accompanied this code).
-++ *
-++ * You should have received a copy of the GNU Lesser General Public License
-++ * version 3 along with OpenOffice.org. If not, see
-++ * <http://www.openoffice.org/license.html>
-++ * for a copy of the LGPLv3 License.
-++ *
-++ ************************************************************************ -->
-++<oor:component-data oor:name="Drivers"
oor:package="org.openoffice.Office.DataAccess"
xmlns:oor="http://openoffice.org/2001/registry";
xmlns:xs="http://www.w3.org/2001/XMLSchema";>
-++ <node oor:name="Installed">
-++ <node oor:name="sdbc:postgresql:*" oor:op="replace">
-++ <prop oor:name="Driver">
-++ <value>org.openoffice.comp.connectivity.pq.Driver</value>
-++ </prop>
-++ <prop oor:name="DriverTypeDisplayName" oor:type="xs:string">
-++ <value xml:lang="en-US">postgresql</value>
-++ </prop>
-++ <node oor:name="Properties">
-++ </node>
-++ <node oor:name="Features">
-++ </node>
-++ <node oor:name="MetaData">
-++ <node oor:name="Authentication" oor:op="replace">
-++ <prop oor:name="Value" oor:type="xs:string">
-++ <value>UserPassword</value>
-++ </prop>
-++ </node>
-++ </node>
-++ </node>
-++ </node>
-++</oor:component-data>
=== modified file 'rules'
--- a/rules 2010-03-09 14:34:02 +0000
+++ b/rules 2010-03-09 18:03:26 +0000
@@ -68,7 +68,7 @@
#TAG=$(shell echo $(MWS) | tr A-Z a-z)-$(MILESTONE)
TAG=$(MWS)_$(MILESTONE)
OOO_BUILD_BRANCH=ooo-build-3-2
-OOO_BUILD_VERSION=3.2.0.7
+OOO_BUILD_VERSION=3.2.0.8
OOO_BUILD_TAG=OOO_BUILD_$(shell echo $(OOO_BUILD_VERSION) | sed -e 's/\./_/g')
OOO_BUILD_TREE=ooo-build-$(shell echo $(OOO_BUILD_VERSION) | sed -e 's/\./-/g')
SOURCE_TREE=$(OOO_BUILD_TREE)/build/$(TAG)
=== modified file 'source/components'
--- a/source/components 2010-02-24 18:19:20 +0000
+++ b/source/components 2010-03-09 18:03:26 +0000
@@ -1,3 +1,3 @@
-ooo-build-3-2-0-7
-ext-sources-ooo-build-3-2-0-7
+ooo-build-3-2-0-8
+ext-sources-ooo-build-3-2-0-8
translation-updates-20100219
