[SCM] LibreOffice packaging repository branch, master, updated. libreoffice_3.4.4-1-32-g1485c6b
The following commit has been merged in the master branch:
commit 1485c6b1fe12f24cbb28a953aa84efd1d6c6b7dd
Author: Rene Engelhard <rene@debian.org>
Date: Tue Jan 3 19:09:56 2012 +0100
update to 3.4.5 rc2
diff --git a/changelog b/changelog
index 86021c0..5d8a28a 100644
--- a/changelog
+++ b/changelog
@@ -1,8 +1,8 @@
-libreoffice (1:3.4.4-3) UNRELEASED; urgency=low
+libreoffice (1:3.4.5~rc2-1) UNRELEASED; urgency=low
[ Rene Engelhard ]
- * debian/patches/fdo43139.diff: add from libreoffice-3-4 branch:
- fix build with bleeding edge external boost and gcc (closes: #652784)
+ * new upstream release
+ - fixes build with bleeding edge external boost and gcc (closes: #652784)
* debian/libreoffice-core.postrm.in:
- on remove, delete created services.rdb (closes: #650341)
@@ -22,7 +22,7 @@ libreoffice (1:3.4.4-3) UNRELEASED; urgency=low
* debian/patches/fix-armhf-build-in-bridges.patch: fix armhf build in
bridges
- -- Rene Engelhard <rene@debian.org> Wed, 28 Dec 2011 20:57:18 +0100
+ -- Rene Engelhard <rene@debian.org> Tue, 03 Jan 2012 18:46:10 +0100
libreoffice (1:3.4.4-2) unstable; urgency=medium
diff --git a/patches/autogen.diff b/patches/autogen.diff
index 10b527a..116f50b 100644
--- a/patches/autogen.diff
+++ b/patches/autogen.diff
@@ -2552,7 +2552,7 @@
@@ -0,0 +1,8705 @@
+#! /bin/sh
+# Guess values for system-dependent variables and create Makefiles.
-+# Generated by GNU Autoconf 2.68 for libreoffice-build 3.4.4.2.
++# Generated by GNU Autoconf 2.68 for libreoffice-build 3.4.5.2.
+#
+#
+# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -3109,8 +3109,8 @@
+# Identity of this package.
+PACKAGE_NAME='libreoffice-build'
+PACKAGE_TARNAME='libreoffice-build'
-+PACKAGE_VERSION='3.4.4.2'
-+PACKAGE_STRING='libreoffice-build 3.4.4.2'
++PACKAGE_VERSION='3.4.5.2'
++PACKAGE_STRING='libreoffice-build 3.4.5.2'
+PACKAGE_BUGREPORT=''
+PACKAGE_URL=''
+
@@ -4021,7 +4021,7 @@
+ # Omit some internal or obsolete options to make the list less imposing.
+ # This message is too long to be a string in the A/UX 3.1 sh.
+ cat <<_ACEOF
-+\`configure' configures libreoffice-build 3.4.4.2 to adapt to many kinds of systems.
++\`configure' configures libreoffice-build 3.4.5.2 to adapt to many kinds of systems.
+
+Usage: $0 [OPTION]... [VAR=VALUE]...
+
@@ -4088,7 +4088,7 @@
+
+if test -n "$ac_init_help"; then
+ case $ac_init_help in
-+ short | recursive ) echo "Configuration of libreoffice-build 3.4.4.2:";;
++ short | recursive ) echo "Configuration of libreoffice-build 3.4.5.2:";;
+ esac
+ cat <<\_ACEOF
+
@@ -4492,7 +4492,7 @@
+test -n "$ac_init_help" && exit $ac_status
+if $ac_init_version; then
+ cat <<\_ACEOF
-+libreoffice-build configure 3.4.4.2
++libreoffice-build configure 3.4.5.2
+generated by GNU Autoconf 2.68
+
+Copyright (C) 2010 Free Software Foundation, Inc.
@@ -4744,7 +4744,7 @@
+This file contains any messages produced by compilers while
+running configure, to aid debugging if configure makes a mistake.
+
-+It was created by libreoffice-build $as_me 3.4.4.2, which was
++It was created by libreoffice-build $as_me 3.4.5.2, which was
+generated by GNU Autoconf 2.68. Invocation command line was
+
+ $ $0 $@
@@ -5566,7 +5566,7 @@
+
+# Define the identity of the package.
+ PACKAGE='libreoffice-build'
-+ VERSION='3.4.4.2'
++ VERSION='3.4.5.2'
+
+
+cat >>confdefs.h <<_ACEOF
@@ -5693,7 +5693,7 @@
+DEJAVU_FONTS_UPSTREAM_MAJOR_VER=2
+DEJAVU_FONTS_UPSTREAM_MINOR_VER=32
+
-+OOO_BUILDVERSION=3.4.4.2
++OOO_BUILDVERSION=3.4.5.2
+
+
+PROPAGATED_ARGS=$ac_configure_args
@@ -10310,7 +10310,7 @@
+# report actual input values of CONFIG_FILES etc. instead of their
+# values after options handling.
+ac_log="
-+This file was extended by libreoffice-build $as_me 3.4.4.2, which was
++This file was extended by libreoffice-build $as_me 3.4.5.2, which was
+generated by GNU Autoconf 2.68. Invocation command line was
+
+ CONFIG_FILES = $CONFIG_FILES
@@ -10367,7 +10367,7 @@
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
+ac_cs_version="\\
-+libreoffice-build config.status 3.4.4.2
++libreoffice-build config.status 3.4.5.2
+configured by $0, generated by GNU Autoconf 2.68,
+ with options \\"\$ac_cs_config\\"
+
diff --git a/patches/fdo43139.diff b/patches/fdo43139.diff
deleted file mode 100644
index 0233340..0000000
--- a/patches/fdo43139.diff
+++ /dev/null
@@ -1,33 +0,0 @@
---- /dev/null 2011-12-15 01:37:17.931118287 +0100
-+++ libreoffice-3.4.4/libreoffice-build/patches/hotfixes/fdo43139.diff 2011-12-20 10:49:37.000000000 +0100
-@@ -0,0 +1,30 @@
-+From 9c2ab9f4febec2b2c5fac25469f1d0cfedc6af5e Mon Sep 17 00:00:00 2001
-+From: Caolán McNamara <caolanm@redhat.com>
-+Date: Wed, 21 Dec 2011 12:10:02 +0000
-+Subject: fix build with bleeding edge external boost and gcc
-+
-+It seems that a recent boost and recent gcc causes a problem when
-+boost::unordered_map is used as a baseclass for something.
-+Asking gcc to use -std=c++0x mode makes gcc do the right thing.
-+
-+Signed-off-by: Petr Mladek <pmladek@suse.cz>
-+---
-+diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk
-+index d3b63ed..3d6a088 100755
-+--- solenv/gbuild/platform/unxgcc.mk
-++++ solenv/gbuild/platform/unxgcc.mk
-+@@ -97,6 +97,12 @@ gb_CFLAGS += -fno-strict-aliasing
-+ gb_CXXFLAGS += -fno-strict-aliasing
-+ endif
-+
-++ifeq ($(HAVE_CXX0X),TRUE)
-++#Currently, as well as for its own merits, c++11/c++0x mode allows use to use
-++#a template for SAL_N_ELEMENTS to detect at compiler time its misuse
-++gb_CXXFLAGS += -std=c++0x -Wno-deprecated-declarations
-++endif
-++
-+ ifneq ($(EXTERNAL_WARNINGS_NOT_ERRORS),TRUE)
-+ gb_CFLAGS_WERROR := -Werror
-+ gb_CXXFLAGS_WERROR := -Werror
-+--
-+cgit v0.9.0.2-2-gbebe
diff --git a/patches/jdk-1.7.0-vendorname.diff b/patches/jdk-1.7.0-vendorname.diff
deleted file mode 100644
index be08ae5..0000000
--- a/patches/jdk-1.7.0-vendorname.diff
+++ /dev/null
@@ -1,65 +0,0 @@
---- /dev/null 2011-09-14 22:08:43.143634037 +0200
-+++ libreoffice-3.4.3/libreoffice-build/patches/hotfixes/jdk-1.7.0-vendorname.diff 2011-09-22 18:31:03.000000000 +0200
-@@ -0,0 +1,62 @@
-+From 549e54fb2f8113502743c443d6deadfe648dede1 Mon Sep 17 00:00:00 2001
-+From: Hanno Meyer-Thurow <h.mth@web.de>
-+Date: Tue, 13 Sep 2011 12:23:28 +0000
-+Subject: add Oracle Java 1.7.0 recognition
-+
-+---
-+diff --git a/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml b/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml
-+index ed329e5..489511f 100644
-+--- jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml
-++++ jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml
-+@@ -9,6 +9,9 @@
-+ <vendor name="Sun Microsystems Inc.">
-+ <minVersion>1.5.0</minVersion>
-+ </vendor>
-++ <vendor name="Oracle Corporation">
-++ <minVersion>1.7.0</minVersion>
-++ </vendor>
-+ <vendor name="IBM Corporation">
-+ <minVersion>1.5.0</minVersion>
-+ </vendor>
-+@@ -25,6 +28,7 @@
-+
-+ <plugins>
-+ <library vendor="Sun Microsystems Inc.">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.so</library>
-++ <library vendor="Oracle Corporation">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.so</library>
-+ <library vendor="IBM Corporation">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.so</library>
-+ <library vendor="Blackdown Java-Linux Team">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.so</library>
-+ <library vendor="Free Software Foundation, Inc.">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.so</library>
-+diff --git a/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx b/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx
-+index 8567d79..91ad4c6 100644
-+--- jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx
-++++ jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx
-+@@ -112,6 +112,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
-+
-+ //Only do something if the sunjavaplugin created this JavaInfo
-+ rtl::OUString sVendor1(RTL_CONSTASCII_USTRINGPARAM("Sun Microsystems Inc."));
-++ rtl::OUString sVendor9(RTL_CONSTASCII_USTRINGPARAM("Oracle Corporation"));
-+ rtl::OUString sVendor2(RTL_CONSTASCII_USTRINGPARAM("IBM Corporation"));
-+ rtl::OUString sVendor3(RTL_CONSTASCII_USTRINGPARAM("Blackdown Java-Linux Team"));
-+ rtl::OUString sVendor4(RTL_CONSTASCII_USTRINGPARAM("Apple Inc."));
-+@@ -121,6 +122,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
-+ rtl::OUString sVendor8(RTL_CONSTASCII_USTRINGPARAM("The FreeBSD Foundation"));
-+ if ( ! (sVendor1.equals(pInfo->sVendor) == sal_True
-+ || sVendor2.equals(pInfo->sVendor) == sal_True
-++ || sVendor9.equals(pInfo->sVendor) == sal_True
-+ || sVendor3.equals(pInfo->sVendor) == sal_True
-+ || sVendor4.equals(pInfo->sVendor) == sal_True
-+ || sVendor5.equals(pInfo->sVendor) == sal_True
-+diff --git a/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx b/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx
-+index f24b6ff..5e87002 100644
-+--- jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx
-++++ jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx
-+@@ -52,6 +52,7 @@ namespace jfw_plugin
-+ */
-+ BEGIN_VENDOR_MAP()
-+ VENDOR_MAP_ENTRY("Sun Microsystems Inc.", SunInfo)
-++ VENDOR_MAP_ENTRY("Oracle Corporation", SunInfo)
-+ VENDOR_MAP_ENTRY("IBM Corporation", OtherInfo)
-+ VENDOR_MAP_ENTRY("Blackdown Java-Linux Team", OtherInfo)
-+ VENDOR_MAP_ENTRY("Apple Inc.", OtherInfo)
-+--
-+cgit v0.9.0.2-2-gbebe
diff --git a/patches/libebook-1.2.so.12.diff b/patches/libebook-1.2.so.12.diff
deleted file mode 100644
index 0299b3a..0000000
--- a/patches/libebook-1.2.so.12.diff
+++ /dev/null
@@ -1,19 +0,0 @@
-Index: libreoffice-3.4.1/libreoffice-build/patches/hotfixes/libebook-1.2.so.12.diff
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ libreoffice-3.4.1/libreoffice-build/patches/hotfixes/libebook-1.2.so.12.diff 2011-07-19 16:29:10.855486007 +0200
-@@ -0,0 +1,14 @@
-+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.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+
-+--
-+1.7.5.4
diff --git a/patches/series b/patches/series
index 637bab5..fd20274 100644
--- a/patches/series
+++ b/patches/series
@@ -13,17 +13,14 @@ bsh-hardcode-path.diff
mips-openjdk-jre-paths.diff
autogen.diff
disable-dynamic-list-cpp.diff
-libebook-1.2.so.12.diff
vbaobj-visibility-fix.diff
make-gengal-work-again.diff
fix-distro-config.diff
mipsel-jfw-plugin-arch.diff
no-deprecated-options-in-qstart-wrappers.diff
update-sdbc-postgresql.diff
-jdk-1.7.0-vendorname.diff
s390x.diff
update-libreoffice.1.diff
wordml2ooo_draw.xsl-add-missing-include.diff
fix-armhf-build-in-bridges.diff
-fdo43139.diff
add-debian-multiarch-support.diff
diff --git a/rules b/rules
index f1e0a5d..6efe024 100755
--- a/rules
+++ b/rules
@@ -81,8 +81,8 @@ MWS=OOO340
MILESTONE=m1
TAG=$(shell echo $(MWS) | tr A-Z a-z)-$(MILESTONE)
GIT_TAG=$(MWS)_$(MILESTONE)
-OOO_BUILD_BRANCH=libreoffice-3-4-4
-OOO_BUILD_VERSION=3.4.4.2
+OOO_BUILD_BRANCH=libreoffice-3-4-5
+OOO_BUILD_VERSION=3.4.5.2
# 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: