[SCM] LibreOffice packaging repository branch, debian-experimental-3.4.0, updated. libreoffice_3.4.2-2-26-g1aea9f3
The following commit has been merged in the debian-experimental-3.4.0 branch:
commit 63dce91ce25c255d63c98fcf712108b3e0dce021
Author: Rene Engelhard <rene@debian.org>
Date: Sun Aug 28 17:20:17 2011 +0000
update to 3.4.3 rc2
diff --git a/changelog b/changelog
index 1d50d38..acfc6d8 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,9 @@
+libreoffice (1:3.4.3~rc2-1) UNRELEASED; urgency=low
+
+ * New upstream release candidate
+
+ -- Rene Engelhard <rene@debian.org> Thu, 25 Aug 2011 01:40:35 +0200
+
libreoffice (1:3.4.2-3) UNRELEASED; urgency=low
* debian/patches/fdo35784.diff: add patch from fdo35784, thanks lmamane
diff --git a/patches/autogen.diff b/patches/autogen.diff
index 2468efc..7bfc4b7 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.2.3.
++# Generated by GNU Autoconf 2.68 for libreoffice-build 3.4.3.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.2.3'
-+PACKAGE_STRING='libreoffice-build 3.4.2.3'
++PACKAGE_VERSION='3.4.3.2'
++PACKAGE_STRING='libreoffice-build 3.4.3.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.2.3 to adapt to many kinds of systems.
++\`configure' configures libreoffice-build 3.4.3.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.2.3:";;
++ short | recursive ) echo "Configuration of libreoffice-build 3.4.3.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.2.3
++libreoffice-build configure 3.4.3.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.2.3, which was
++It was created by libreoffice-build $as_me 3.4.3.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.2.3'
++ VERSION='3.4.3.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.2.3
++OOO_BUILDVERSION=3.4.3.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.2.3, which was
++This file was extended by libreoffice-build $as_me 3.4.3.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.2.3
++libreoffice-build config.status 3.4.3.2
+configured by $0, generated by GNU Autoconf 2.68,
+ with options \\"\$ac_cs_config\\"
+
diff --git a/patches/fix-bridges-cpp-uno-depends.diff b/patches/fix-bridges-cpp-uno-depends.diff
deleted file mode 100644
index 1f2b3bd..0000000
--- a/patches/fix-bridges-cpp-uno-depends.diff
+++ /dev/null
@@ -1,27 +0,0 @@
---- /dev/null 2011-07-16 21:04:31.031883505 +0200
-+++ libreoffice-3.4.1/libreoffice-build/patches/hotfixes/fix-bridges-cpp-uno-depends.diff 2011-07-21 18:21:10.000000000 +0200
-@@ -0,0 +1,24 @@
-+diff --git a/bridges/prj/build.lst b/bridges/prj/build.lst
-+index 9c7b2f3..69b51bf 100644
-+--- bridges/prj/build.lst
-++++ bridges/prj/build.lst
-+@@ -13,13 +13,13 @@ br bridges\source\cpp_uno\gcc3_aix_powerpc nmake - u br_gcc3ap br_cppuno_shared
-+ br bridges\source\cpp_uno\gcc3_linux_powerpc64 nmake - u br_gcc3lp_64 br_cppuno_shared br_unotypes br_inc NULL
-+ br bridges\source\cpp_uno\gcc3_linux_mips nmake - u br_gcc3lmips br_cppuno_shared br_unotypes br_inc NULL
-+ br bridges\source\cpp_uno\gcc3_linux_m68k nmake - u br_gcc3lm68k br_cppuno_shared br_unotypes br_inc NULL
-+-br bridges\source\cpp_uno\gcc3_linux_s390 nmake - u br_gcc3l3 br_unotypes br_inc NULL
-+-br bridges\source\cpp_uno\gcc3_linux_s390x nmake - u br_gcc3l3_64 br_unotypes br_inc NULL
-++br bridges\source\cpp_uno\gcc3_linux_s390 nmake - u br_gcc3l3 br_unotypes br_cppuno_shared br_inc NULL
-++br bridges\source\cpp_uno\gcc3_linux_s390x nmake - u br_gcc3l3_64 br_unotypes br_cppuno_shared br_inc NULL
-+ br bridges\source\cpp_uno\gcc3_linux_sparc nmake - u br_gcc3ls br_unotypes br_cppuno_shared br_inc NULL
-+-br bridges\source\cpp_uno\gcc3_linux_arm nmake - u br_gcc3lr br_unotypes NULL
-+-br bridges\source\cpp_uno\gcc3_linux_ia64 nmake - u br_gcc3la br_unotypes NULL
-+-br bridges\source\cpp_uno\gcc3_linux_hppa nmake - u br_gcc3lh br_unotypes NULL
-+-br bridges\source\cpp_uno\gcc3_linux_alpha nmake - u br_gcc3ll br_unotypes NULL
-++br bridges\source\cpp_uno\gcc3_linux_arm nmake - u br_gcc3lr br_unotypes br_cppuno_shared br_inc NULL
-++br bridges\source\cpp_uno\gcc3_linux_ia64 nmake - u br_gcc3la br_unotypes br_cppuno_shared br_inc NULL
-++br bridges\source\cpp_uno\gcc3_linux_hppa nmake - u br_gcc3lh br_unotypes br_cppuno_shared br_inc NULL
-++br bridges\source\cpp_uno\gcc3_linux_alpha nmake - u br_gcc3ll br_unotypes br_cppuno_shared br_inc NULL
-+ br bridges\source\cpp_uno\gcc3_macosx_intel nmake - u br_gcc3macoxi br_cppuno_shared br_unotypes br_inc NULL
-+ br bridges\source\cpp_uno\gcc3_macosx_powerpc nmake - u br_gcc3macoxp br_cppuno_shared br_unotypes br_inc NULL
-+ br bridges\source\cpp_uno\cc50_solaris_sparc nmake - u br_cc50sols br_unotypes br_cppuno_shared br_inc NULL
diff --git a/patches/no-prctl-on-kfreebsd.diff b/patches/no-prctl-on-kfreebsd.diff
deleted file mode 100644
index 93ba4f1..0000000
--- a/patches/no-prctl-on-kfreebsd.diff
+++ /dev/null
@@ -1,23 +0,0 @@
---- /dev/null 2011-07-22 18:04:26.354741821 +0000
-+++ libreoffice-3.4.1/libreoffice-build/patches/hotfixes/no-prctl-on-kfreebsd.diff 2011-07-21 22:19:00.000000000 +0000
-@@ -0,0 +1,20 @@
-+--- sal/osl/unx/thread.c-old 2011-07-22 00:16:33.000000000 +0200
-++++ sal/osl/unx/thread.c 2011-07-22 00:17:41.000000000 +0200
-+@@ -37,7 +37,7 @@
-+ #include <rtl/textenc.h>
-+ #include <sal/macros.h>
-+
-+-#if defined LINUX
-++#if defined LINUX && ! defined __FreeBSD_kernel__
-+ #include <sys/prctl.h>
-+ #ifndef PR_SET_NAME
-+ #define PR_SET_NAME 15
-+@@ -598,7 +598,7 @@
-+ }
-+
-+ void SAL_CALL osl_setThreadName(char const * name) {
-+-#if defined LINUX
-++#if defined LINUX && ! defined __FreeBSD_kernel__
-+ if (prctl(PR_SET_NAME, (unsigned long) name, 0, 0, 0) != 0) {
-+ OSL_TRACE(
-+ "%s prctl(PR_SET_NAME) failed with errno %d", OSL_LOG_PREFIX,
diff --git a/patches/series b/patches/series
index 7ff9dd9..9be3808 100644
--- a/patches/series
+++ b/patches/series
@@ -16,8 +16,6 @@ autogen.diff
disable-dynamic-list-cpp.diff
libebook-1.2.so.11.diff
vbaobj-visibility-fix.diff
-fix-bridges-cpp-uno-depends.diff
-no-prctl-on-kfreebsd.diff
make-gengal-work-again.diff
fix-distro-config.diff
#fdo35784.diff
diff --git a/rules b/rules
index 79afaea..9fdac71 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-2
-OOO_BUILD_VERSION=3.4.2.3
+OOO_BUILD_BRANCH=libreoffice-3-4-3
+OOO_BUILD_VERSION=3.4.3.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)
@@ -3311,6 +3311,8 @@ ifneq (,$(filter redland, $(SYSTEM_STUFF)))
endif
# don't make uno-libs3 depend on ure...
perl -pi -e 's/, ure \(.*\)$$//' debian/uno-libs3.substvars
+ # .. and prevent ure to depend on itself..
+ perl -pi -e 's/, ure \(.*\)$$//' debian/ure.substvars
ifeq "$(ENABLE_JAVA)" "y"
LD_LIBRARY_PATH="/usr/lib/libfakeroot:debian/uno-libs3/$(OOUREDIR)/lib:debian/ure/$(OOUREDIR)/lib:$(PKGDIR)-core/$(OODIR)/program" \
dh_shlibdeps -plibreoffice$(VER)-officebean \
--
LibreOffice packaging repository
Reply to: