The following commit has been merged in the debian-experimental-3.4.0 branch:
commit 094e1f13625f61a2614ac1c6669f842368451c07
Author: Rene Engelhard <r...@debian.org>
Date: Tue Aug 9 19:22:26 2011 +0000
update to 3.4.2; migrate debian/patches/* to libreoffice-build/hotfixes
where possible
diff --git a/changelog b/changelog
index cd584a0..8001d90 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,11 @@
+libreoffice (1:3.4.2-1) UNRELEASED; urgency=low
+
+ * new upstream release
+
+ * debian/patches/*: migrate to libreoffice-build/hotfixes where possible
+
+ -- Rene Engelhard <r...@debian.org> Tue, 09 Aug 2011 18:16:03 +0000
+
libreoffice (1:3.4.1-4) experimental; urgency=low
* debian/rules:
diff --git a/patches/autogen.diff b/patches/autogen.diff
index 5125e24..2468efc 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.1.3.
++# Generated by GNU Autoconf 2.68 for libreoffice-build 3.4.2.3.
+#
+#
+# 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.1.3'
-+PACKAGE_STRING='libreoffice-build 3.4.1.3'
++PACKAGE_VERSION='3.4.2.3'
++PACKAGE_STRING='libreoffice-build 3.4.2.3'
+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.1.3 to adapt to many kinds of
systems.
++\`configure' configures libreoffice-build 3.4.2.3 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.1.3:";;
++ short | recursive ) echo "Configuration of libreoffice-build 3.4.2.3:";;
+ 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.1.3
++libreoffice-build configure 3.4.2.3
+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.1.3, which was
++It was created by libreoffice-build $as_me 3.4.2.3, 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.1.3'
++ VERSION='3.4.2.3'
+
+
+cat >>confdefs.h <<_ACEOF
@@ -5693,7 +5693,7 @@
+DEJAVU_FONTS_UPSTREAM_MAJOR_VER=2
+DEJAVU_FONTS_UPSTREAM_MINOR_VER=32
+
-+OOO_BUILDVERSION=3.4.1.3
++OOO_BUILDVERSION=3.4.2.3
+
+
+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.1.3, which was
++This file was extended by libreoffice-build $as_me 3.4.2.3, 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.1.3
++libreoffice-build config.status 3.4.2.3
+configured by $0, generated by GNU Autoconf 2.68,
+ with options \\"\$ac_cs_config\\"
+
diff --git a/patches/debian-debug.diff b/patches/debian-debug.diff
index 8e1034f..49fa108 100644
--- a/patches/debian-debug.diff
+++ b/patches/debian-debug.diff
@@ -1,5 +1,5 @@
--- /dev/null 2011-06-02 14:58:12.448567841 +0000
-+++ libreoffice-3.4.0/libreoffice-build/patches/dev300/g1.diff 2011-06-16
22:10:26.000000000 +0000
++++ libreoffice-3.4.0/libreoffice-build/patches/hotfixes/g1.diff
2011-06-16 22:10:26.000000000 +0000
@@ -0,0 +1,74 @@
+diff --git a/configure.in b/configure.in
+index 3257668..afd36de 100755
@@ -75,14 +75,3 @@
+
+ gb_LinkTarget_INCLUDE := $(filter-out %/stl, $(subst -I. , ,$(SOLARINC)))
+ gb_LinkTarget_INCLUDE_STL := $(filter %/stl, $(subst -I. , ,$(SOLARINC)))
---- libreoffice-3.4.0/libreoffice-build/patches/dev300/apply-old
2011-06-16 22:12:11.000000000 +0000
-+++ libreoffice-3.4.0/libreoffice-build/patches/dev300/apply 2011-06-16
22:12:49.000000000 +0000
-@@ -250,6 +250,8 @@
-
- # build using -O2 on x86 and sparc according to Debian policy.
- debian-opt.diff
-+# ... and reintroduce -g1
-+g1.diff
-
- # on debian based systems, we know where our soffice is
- jurt-soffice-location.diff
diff --git a/patches/disable-sdbc-postgresql.diff
b/patches/disable-sdbc-postgresql.diff
index 45f8723..5a78ff2 100644
--- a/patches/disable-sdbc-postgresql.diff
+++ b/patches/disable-sdbc-postgresql.diff
@@ -6,8 +6,8 @@ index dd51188..6e09796 100644
# Slackware
Slackware : LinuxCommon, Mono, msaccess
# Debian
--DebianBase : LinuxCommon, DebianBaseOnly, GCCSTL, BerkeleyDB43, Split,
PostgreSQL, PowerPC
-+DebianBase : LinuxCommon, DebianBaseOnly, GCCSTL, BerkeleyDB43, Split, PowerPC
+-DebianBase : LinuxCommon, DebianBaseOnly, GCCSTL, BerkeleyDB43, Split,
PostgreSQL
++DebianBase : LinuxCommon, DebianBaseOnly, GCCSTL, BerkeleyDB43, Split
Debian : DebianBase, DebianOnly, DebianSidOnly, Debian32Only
DebianEtch : DebianBase, DebianOnly, DebianEtchOnly, Debian32Only
# Ubuntu
diff --git a/patches/gcc4.6.0.diff b/patches/gcc4.6.0.diff
index ab30608..5871fed 100644
--- a/patches/gcc4.6.0.diff
+++ b/patches/gcc4.6.0.diff
@@ -1,5 +1,5 @@
--- /dev/null 2011-04-24 04:52:22.984502351 +0000
-+++ libreoffice-3.4.0/libreoffice-build/patches/dev300/gcc4.6.0.diff
2011-04-29 22:34:08.000000000 +0000
++++ libreoffice-3.4.0/libreoffice-build/patches/hotfixes/gcc4.6.0.diff
2011-04-29 22:34:08.000000000 +0000
@@ -0,0 +1,9 @@
+--- cli_ure/util/makefile.pmk-old 2011-04-30 12:45:51.000000000 +0000
++++ cli_ure/util/makefile.pmk 2011-04-30 12:45:55.000000000 +0000
@@ -10,20 +10,3 @@
+-CFLAGSENABLESYMBOLS:=-Z7
+ .ENDIF
+ .ENDIF # "L10N_framework"==""
---- libreoffice-3.4.0/libreoffice-build/patches/dev300/apply-old
2011-04-30 11:42:54.000000000 +0000
-+++ libreoffice-3.4.0/libreoffice-build/patches/dev300/apply 2011-04-30
11:43:23.000000000 +0000
-@@ -21,7 +21,7 @@
-
- LinuxCommon : Common, FontConfigTemporaryHacks, \
- LinuxOnly, msaccess, \
-- CliMonoCommon, Mono, MonoComp
-+ CliMonoCommon, Mono, MonoComp, Gcc46
- MacOSXCommon : Common
- Win32Common : Common, Win32Only, CliMonoCommon, CliComponent
- # Experimental sections
-@@ -1485,3 +1485,5 @@
- [ PowerPC ]
- no-minimaltoc.diff
-
-+[ Gcc46 ]
-+gcc4.6.0.diff
diff --git a/patches/jurt-soffice-location.diff
b/patches/jurt-soffice-location.diff
index 8a63030..3d9b894 100644
--- a/patches/jurt-soffice-location.diff
+++ b/patches/jurt-soffice-location.diff
@@ -1,7 +1,7 @@
Index:
libreoffice-3.3.2/libreoffice-build/patches/dev300/jurt-soffice-location.diff
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++
libreoffice-3.3.2/libreoffice-build/patches/dev300/jurt-soffice-location.diff
2011-06-07 14:06:35.057334630 +0200
++++
libreoffice-3.3.2/libreoffice-build/patches/hotfixes/jurt-soffice-location.diff
2011-06-07 14:06:35.057334630 +0200
@@ -0,0 +1,20 @@
+commit b71107fb12e3c3125e0cb62c5a4f6636a80c6408
+Author: Bjoern Michaelsen <bjoern.michael...@canonical.com>
@@ -23,17 +23,3 @@ Index:
libreoffice-3.3.2/libreoffice-build/patches/dev300/jurt-soffice-location.
++ return new File("/usr/lib/libreoffice/program/soffice");
+ return null;
+ }
-Index: libreoffice-3.3.2/libreoffice-build/patches/dev300/apply
-===================================================================
---- libreoffice-3.3.2.orig/libreoffice-build/patches/dev300/apply
2011-06-07 14:07:04.887334622 +0200
-+++ libreoffice-3.3.2/libreoffice-build/patches/dev300/apply 2011-06-07
14:08:18.797334602 +0200
-@@ -531,6 +531,9 @@
- # build using -O2 on x86 and sparc according to Debian policy.
- debian-opt.diff
-
-+# on debian based systems, we know where our soffice is
-+jurt-soffice-location.diff
-+
- [ LocalizeFixes and DebianBaseOnly ]
- # mention openoffice.org-report-builder instead of getting people
- # to download it from elsewhere
diff --git a/patches/mips-openjdk-jre-paths.diff
b/patches/mips-openjdk-jre-paths.diff
index bddf262..b495204 100644
--- a/patches/mips-openjdk-jre-paths.diff
+++ b/patches/mips-openjdk-jre-paths.diff
@@ -1,5 +1,5 @@
--- /dev/null 2011-06-27 20:29:01.643585831 +0200
-+++
libreoffice-3.4.0/libreoffice-build/patches/dev300/mips-openjdk-jre-paths.diff
2011-06-28 16:06:31.000000000 +0200
++++
libreoffice-3.4.0/libreoffice-build/patches/hotfixes/mips-openjdk-jre-paths.diff
2011-06-28 16:06:31.000000000 +0200
@@ -0,0 +1,18 @@
+--- set_soenv.in-old 2011-06-28 16:05:08.000000000 +0200
++++ set_soenv.in 2011-06-28 16:06:07.000000000 +0200
@@ -19,21 +19,3 @@
+ }
+
+
---- libreoffice-3.4.0/libreoffice-build/patches/dev300/apply-old
2011-06-28 16:06:54.000000000 +0200
-+++ libreoffice-3.4.0/libreoffice-build/patches/dev300/apply 2011-06-28
16:07:30.000000000 +0200
-@@ -50,7 +50,7 @@
- # Slackware
- Slackware : LinuxCommon, Mono, msaccess
- # Debian
--DebianBase : LinuxCommon, DebianBaseOnly, GCCSTL, BerkeleyDB43, Split, PowerPC
-+DebianBase : LinuxCommon, DebianBaseOnly, GCCSTL, BerkeleyDB43, Split,
PowerPC, MIPS
- Debian : DebianBase, DebianOnly, DebianSidOnly, Debian32Only
- DebianEtch : DebianBase, DebianOnly, DebianEtchOnly, Debian32Only
- # Ubuntu
-@@ -1505,3 +1505,6 @@
-
- [ DebianBaseOnly ]
- packcomponents-remove-split-components.diff
-+
-+[ MIPS ]
-+mips-openjdk-jre-paths.diff
diff --git a/patches/no-minimaltoc.diff b/patches/no-minimaltoc.diff
index a2c50da..510e3d7 100644
--- a/patches/no-minimaltoc.diff
+++ b/patches/no-minimaltoc.diff
@@ -1,37 +1,7 @@
-Index: libreoffice-3.3.1/libreoffice-build/patches/dev300/apply
-===================================================================
---- libreoffice-3.4.0.orig/libreoffice-build/patches/dev300/apply
2011-03-01 14:37:29.144671999 +0100
-+++ libreoffice-3.4.0/libreoffice-build/patches/dev300/apply 2011-03-01
14:40:52.064672001 +0100
-@@ -30,7 +30,7 @@
- PostgreSQL, RadioButtons, WWInProgress, \
- KDE4Experimental, MinGW, Netbook, \
- CrossWin32Patches, AutoLayout, \
-- Speed, GSoC2010, Toolbars
-+ Speed, GSoC2010, Toolbars, PowerPC
- DebianLooseSections: DebianBaseNoHelpContent
- # Optional sections
- Optional : LiberationFontsOnWindows, NovellOnlyExtensionFixes
-@@ -50,7 +50,7 @@
- # Slackware
- Slackware : LinuxCommon, Mono, msaccess
- # Debian
--DebianBase : LinuxCommon, DebianBaseOnly, GCCSTL, BerkeleyDB43, Split,
PostgreSQL
-+DebianBase : LinuxCommon, DebianBaseOnly, GCCSTL, BerkeleyDB43, Split,
PostgreSQL, PowerPC
- Debian : DebianBase, DebianOnly, DebianSidOnly, Debian32Only
- DebianEtch : DebianBase, DebianOnly, DebianEtchOnly, Debian32Only
- # Ubuntu
-@@ -1481,3 +1481,7 @@
- sd_effects_styles.diff, pixie
- symbols-20-august.diff, i#11167, jopsen
- vEdit-13-August.diff, jopsen
-+
-+[ PowerPC ]
-+no-minimaltoc.diff
-+
Index: libreoffice-3.3.1/libreoffice-build/patches/dev300/no-minimaltoc.diff
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ libreoffice-3.3.1/libreoffice-build/patches/dev300/no-minimaltoc.diff
2011-03-01 14:37:20.344672014 +0100
++++ libreoffice-3.3.1/libreoffice-build/patches/hotfixes/no-minimaltoc.diff
2011-03-01 14:37:20.344672014 +0100
@@ -0,0 +1,9 @@
+--- solenv/inc/unxlngppc64.mk
++++ solenv/inc/unxlngppc64.mk
diff --git a/patches/odk-jni-include.diff b/patches/odk-jni-include.diff
index 50063fc..457f40e 100644
--- a/patches/odk-jni-include.diff
+++ b/patches/odk-jni-include.diff
@@ -1,5 +1,5 @@
--- /dev/null 2011-04-24 04:52:22.984502351 +0000
-+++ libreoffice-3.3.2/libreoffice-build/patches/dev300/odk-jni-include.diff
2011-04-30 12:07:10.000000000 +0000
++++ libreoffice-3.3.2/libreoffice-build/patches/hotfixes/odk-jni-include.diff
2011-04-30 12:07:10.000000000 +0000
@@ -0,0 +1,11 @@
+--- odk/source/unowinreg/win/makefile.mk-old 2011-06-25 10:18:32.000000000
+0200
++++ odk/source/unowinreg/win/makefile.mk 2011-06-25 10:19:22.000000000
+0200
@@ -12,15 +12,3 @@
+ -I$(PRJ)/inc/pch -shared -o $(BIN)$/unowinreg.dll unowinreg.cxx \
+ -Wl,--kill-at -lkernel32 -ladvapi32
+ $(MINGWSTRIP) $(BIN)$/unowinreg.dll
---- libreoffice-3.4.0/libreoffice-build/patches/dev300/apply-old
2011-04-30 12:09:37.000000000 +0000
-+++ libreoffice-3.4.0/libreoffice-build/patches/dev300/apply 2011-04-30
12:10:00.000000000 +0000
-@@ -150,6 +150,9 @@
- # don't let HelpLinker be miscompiled with g++ 4.3
- gcc-HelpLinker.diff # RENAMED transex3 -> l10ntools
-
-+[ TemporaryHacks and DebianBaseOnly ]
-+odk-jni-include.diff
-+
- #[ CJKTemporaryHacks ]
- # the following patch is disabled temporary.
- # default value of tab stop for Chinese version
diff --git a/patches/packcomponents-remove-split-components.diff
b/patches/packcomponents-remove-split-components.diff
index 266de33..4770220 100644
--- a/patches/packcomponents-remove-split-components.diff
+++ b/patches/packcomponents-remove-split-components.diff
@@ -1,5 +1,5 @@
--- /dev/null 2011-06-02 16:58:12.448567841 +0200
-+++
libreoffice-3.4.0/libreoffice-build/patches/dev300/packcomponents-remove-split-components.diff
2011-06-14 00:59:26.000000000 +0200
++++
libreoffice-3.4.0/libreoffice-build/patches/hotfixes/packcomponents-remove-split-components.diff
2011-06-14 00:59:26.000000000 +0200
@@ -0,0 +1,37 @@
+--- postprocess/packcomponents/makefile.mk-old 2011-06-13
23:35:26.000000000 +0000
++++ postprocess/packcomponents/makefile.mk 2011-06-13 23:35:58.000000000
+0000
@@ -38,12 +38,3 @@
+ .IF "$(OS)" != "WNT" && "$(ENABLE_GSTREAMER)" != ""
+ my_components += avmediagstreamer
+ .END
---- libreoffice-3.4.0/libreoffice-build/patches/dev300/apply-old
2011-06-14 01:21:36.000000000 +0200
-+++ libreoffice-3.4.0/libreoffice-build/patches/dev300/apply 2011-06-14
01:21:48.000000000 +0200
-@@ -1493,3 +1493,6 @@
-
- [ Gcc46 ]
- gcc4.6.0.diff
-+
-+[ DebianBaseOnly ]
-+packcomponents-remove-split-components.diff
diff --git a/patches/splash-progressbarcolor.diff
b/patches/splash-progressbarcolor.diff
index a6510a6..43b33e3 100644
--- a/patches/splash-progressbarcolor.diff
+++ b/patches/splash-progressbarcolor.diff
@@ -1,5 +1,5 @@
--- /dev/null 2010-09-28 02:28:57.560060918 +0200
-+++ libreoffice-3.3.0/libreoffice-build/patches/dev300/debian-splash.diff
2010-10-07 19:19:42.000000000 +0200
++++ libreoffice-3.3.0/libreoffice-build/patches/hotfixes/debian-splash.diff
2010-10-07 19:19:42.000000000 +0200
@@ -0,0 +1,11 @@
+--- instsetoo_native/util/openoffice.lst-old 2008-08-06 00:03:46.000000000
+0200
++++ instsetoo_native/util/openoffice.lst 2008-08-06 00:04:01.000000000
+0200
@@ -12,16 +12,3 @@
+ PROGRESSSIZE 319,10
+ PROGRESSPOSITION 164,225
+ PROGRESSFRAMECOLOR 207,208,211
-diff --git a/patches/dev300/apply b/patches/dev300/apply
-index 485e60d..536caec 100644
---- libreoffice-3.4.0/libreoffice-build/patches/dev300/apply
-+++ libreoffice-3.4.0/libreoffice-build/patches/dev300/apply
-@@ -1034,6 +1034,8 @@
-
- [ DebianBaseOnly ]
- soffice-opengl-and-locking-config.diff, mklose
-+# fix the splash progressbar colors
-+debian-splash.diff
-
- [ SUSE101 ]
- sled10-splash.diff, i#123456, pmladek
diff --git a/rules b/rules
index 3b8cfe5..d2615ac 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-1
-OOO_BUILD_VERSION=3.4.1.3
+OOO_BUILD_BRANCH=libreoffice-3-4-2
+OOO_BUILD_VERSION=3.4.2.3
# 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/e1qrqa8-0001uy...@vasks.debian.org
