The following commit has been merged in the master branch:
commit 4d720ac7bbd7ba54b84f9313e56ca0bea0804bc6
Author: Rene Engelhard <r...@debian.org>
Date: Tue Mar 6 02:02:56 2012 +0100
update to 3.4.6 rc2
diff --git a/changelog b/changelog
index 55df002..bb8d026 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,12 @@
+libreoffice (1:3.4.6~rc2-1) UNRELEASED; urgency=low
+
+ * new upstream release candidate
+
+ * libreoffice-build: move to plain current libreoffice-3-4 branch
+ * debian/patches/update-version.diff: ... and add this as patch
+
+ -- Rene Engelhard <r...@debian.org> Tue, 13 Mar 2012 20:12:36 +0100
+
libreoffice (1:3.4.5-6) UNRELEASED; urgency=low
* debian/patches/bibliography-no-crash-if-no-base.diff: add fixup from
diff --git a/patches/autogen.diff b/patches/autogen.diff
index 116f50b..273a360 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.5.2.
++# Generated by GNU Autoconf 2.68 for libreoffice-build 3.4.6.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.5.2'
-+PACKAGE_STRING='libreoffice-build 3.4.5.2'
++PACKAGE_VERSION='3.4.6.2'
++PACKAGE_STRING='libreoffice-build 3.4.6.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.5.2 to adapt to many kinds of
systems.
++\`configure' configures libreoffice-build 3.4.6.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.5.2:";;
++ short | recursive ) echo "Configuration of libreoffice-build 3.4.6.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.5.2
++libreoffice-build configure 3.4.6.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.5.2, which was
++It was created by libreoffice-build $as_me 3.4.6.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.5.2'
++ VERSION='3.4.6.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.5.2
++OOO_BUILDVERSION=3.4.6.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.5.2, which was
++This file was extended by libreoffice-build $as_me 3.4.6.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.5.2
++libreoffice-build config.status 3.4.6.2
+configured by $0, generated by GNU Autoconf 2.68,
+ with options \\"\$ac_cs_config\\"
+
diff --git a/patches/nsplugin-fix-SimpleFileAccess-instance.diff
b/patches/nsplugin-fix-SimpleFileAccess-instance.diff
deleted file mode 100644
index 8aa0ac9..0000000
--- a/patches/nsplugin-fix-SimpleFileAccess-instance.diff
+++ /dev/null
@@ -1,28 +0,0 @@
---- /dev/null 2012-02-23 23:30:09.346169274 +0000
-+++
libreoffice-3.4.5/libreoffice-build/patches/hotfixes/nsplugin-fix-SimpleFileAccess-instance.diff
2012-02-29 22:19:19.000000000 +0000
-@@ -0,0 +1,25 @@
-+From 3d22544462e4fde4440d383c8792936df5f57990 Mon Sep 17 00:00:00 2001
-+From: Rene Engelhard <r...@debian.org>
-+Date: Wed, 29 Feb 2012 23:19:00 +0100
-+Subject: [PATCH] fix nsplugin to create correct
com.sun.star.ucb.SimpleFileAccess instance
-+
-+---
-+ extensions/source/nsplugin/source/so_instance.cxx | 2 +-
-+ 1 files changed, 1 insertions(+), 1 deletions(-)
-+
-+diff --git a/extensions/source/nsplugin/source/so_instance.cxx
b/extensions/source/nsplugin/source/so_instance.cxx
-+index b87b83f..8b243ae 100644
-+--- extensions/source/nsplugin/source/so_instance.cxx
-++++ extensions/source/nsplugin/source/so_instance.cxx
-+@@ -239,7 +239,7 @@ sal_Bool SoPluginInstance::LoadDocument(NSP_HWND hParent)
-+
-+ //create stream for the document
-+ Reference< ::com::sun::star::ucb::XSimpleFileAccess >
xSimpleFileAccess(
-+- mxRemoteMSF->createInstance(
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ucb.SimpleFileAccessw"))
),
-++ mxRemoteMSF->createInstance(
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ucb.SimpleFileAccess"))
),
-+ uno::UNO_QUERY );
-+ if(!xSimpleFileAccess.is())
-+ {
-+--
-+1.7.2.5
-+
diff --git a/patches/series b/patches/series
index be01140..c0bcc58 100644
--- a/patches/series
+++ b/patches/series
@@ -11,6 +11,7 @@ debian-debug.diff
disable-rhino.diff
bsh-hardcode-path.diff
mips-openjdk-jre-paths.diff
+update-version.diff
autogen.diff
disable-dynamic-list-cpp.diff
vbaobj-visibility-fix.diff
@@ -28,5 +29,4 @@ mediwiki-oor-replace.diff
armhf-bridges.diff
armhf-bridges-fix-armv4t-armel.diff
armhf-bridges-doubles.diff
-nsplugin-fix-SimpleFileAccess-instance.diff
bibliography-no-crash-if-no-base.diff
diff --git a/patches/update-version.diff b/patches/update-version.diff
new file mode 100644
index 0000000..37e3400
--- /dev/null
+++ b/patches/update-version.diff
@@ -0,0 +1,10 @@
+diff --git a/configure.in b/configure.in
+index 09b3666..c2271f5 100755
+--- libreoffice-3.4.6/libreoffice-build/configure.in
++++ libreoffice-3.4.6/libreoffice-build/configure.in
+@@ -1,4 +1,4 @@
+-AC_INIT(libreoffice-build, 3.4.3.2)
++AC_INIT(libreoffice-build, 3.4.6.2)
+ AC_PREREQ(2.51)
+ AC_CONFIG_SRCDIR(bin/build-ooo)
+ AC_PREFIX_DEFAULT(/usr)
diff --git a/rules b/rules
index d987d3b..3dc27f4 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-5
-OOO_BUILD_VERSION=3.4.5.2
+OOO_BUILD_BRANCH=libreoffice-3-4-6
+OOO_BUILD_VERSION=3.4.6.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
--
To UNSUBSCRIBE, email to debian-openoffice-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1sakgs-0000sd...@vasks.debian.org
