[SCM] LibreOffice packaging repository branch, ubuntu-oneiric-3.4, updated. libreoffice_3.4.2-2-170-g3956dc8
The following commit has been merged in the ubuntu-oneiric-3.4 branch:
commit 0bfc8c595c17f34dfa5389242baaa9d68a1e50bc
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date: Fri Aug 19 11:49:44 2011 +0200
refresh patch queue
diff --git a/changelog b/changelog
index 0c6fab8..054995c 100644
--- a/changelog
+++ b/changelog
@@ -1,6 +1,7 @@
libreoffice (1:3.4.2-3ubuntu1) UNRELEASED; urgency=low
* merge from debian 165efec47b35fa52a88e3b4bc8eaa410d2c323e0
+ * refresh patch queue
* regenerate control
-- Bjoern Michaelsen <bjoern.michaelsen@canonical.com> Fri, 19 Aug 2011 10:22:20 +0200
diff --git a/patches/bsh-hardcode-path.diff b/patches/bsh-hardcode-path.diff
index 58107e9..2c1612e 100644
--- a/patches/bsh-hardcode-path.diff
+++ b/patches/bsh-hardcode-path.diff
@@ -1,7 +1,7 @@
-Index: libreoffice-3.4.1/libreoffice-build/patches/dev300/bsh-hardcode-path.diff
+Index: libreoffice-3.4.2/libreoffice-build/patches/dev300/bsh-hardcode-path.diff
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ libreoffice-3.4.1/libreoffice-build/patches/dev300/bsh-hardcode-path.diff 2011-07-15 11:41:35.596849817 +0200
++++ libreoffice-3.4.2/libreoffice-build/patches/dev300/bsh-hardcode-path.diff 2011-08-19 11:47:53.529434889 +0200
@@ -0,0 +1,11 @@
+--- scripting/java/build.xml 2011-06-28 11:11:12.000000000 +0000
++++ scripting/java/build.xml-old 2011-06-28 11:10:53.000000000 +0000
@@ -14,24 +14,12 @@ Index: libreoffice-3.4.1/libreoffice-build/patches/dev300/bsh-hardcode-path.diff
+ <pathelement location="${jardir}"/>
+ </path>
+
-<<<<<<< HEAD
-Index: libreoffice-3.4.1/libreoffice-build/patches/dev300/apply
+Index: libreoffice-3.4.2/libreoffice-build/patches/dev300/apply
===================================================================
---- libreoffice-3.4.1.orig/libreoffice-build/patches/dev300/apply 2011-07-15 11:41:30.696849750 +0200
-+++ libreoffice-3.4.1/libreoffice-build/patches/dev300/apply 2011-07-15 11:41:35.596849817 +0200
-@@ -1484,6 +1484,7 @@
-=======
---- libreoffice-3.4.0/libreoffice-build/patches/dev300/apply-old 2011-06-28 11:18:27.000000000 +0000
-+++ libreoffice-3.4.0/libreoffice-build/patches/dev300/apply 2011-06-28 11:18:39.000000000 +0000
+--- libreoffice-3.4.2.orig/libreoffice-build/patches/dev300/apply 2011-08-19 11:47:41.799434982 +0200
++++ libreoffice-3.4.2/libreoffice-build/patches/dev300/apply 2011-08-19 11:47:53.529434889 +0200
@@ -1418,3 +1418,4 @@
->>>>>>> debian-experimental-3.4.0
- [ TemporaryHacks ]
+ [TemporaryHacks]
disable-rhino.diff
+bsh-hardcode-path.diff
-<<<<<<< HEAD
-
- [ DebianBaseOnly ]
- packcomponents-remove-split-components.diff
-=======
->>>>>>> debian-experimental-3.4.0
diff --git a/patches/buildfix-patches.diff b/patches/buildfix-patches.diff
index 7f493e8..0e2dfeb 100644
--- a/patches/buildfix-patches.diff
+++ b/patches/buildfix-patches.diff
@@ -1,8 +1,8 @@
-Index: libreoffice-3.4.1/libreoffice-build/patches/dev300/apply
+Index: libreoffice-3.4.2/libreoffice-build/patches/dev300/apply
===================================================================
---- libreoffice-3.4.1.orig/libreoffice-build/patches/dev300/apply 2011-07-15 11:39:45.556848313 +0200
-+++ libreoffice-3.4.1/libreoffice-build/patches/dev300/apply 2011-07-15 11:40:25.496848861 +0200
-@@ -354,7 +354,7 @@
+--- libreoffice-3.4.2.orig/libreoffice-build/patches/dev300/apply 2011-08-19 11:40:48.779438099 +0200
++++ libreoffice-3.4.2/libreoffice-build/patches/dev300/apply 2011-08-19 11:40:58.649438023 +0200
+@@ -356,7 +356,7 @@
#FIXME src680: separate-helpcontent.diff, jholesov
# use -Wl,--as-needed, save 1% of relocations
diff --git a/patches/debian-debug.diff b/patches/debian-debug.diff
index ed0f1bf..1a3ca24 100644
--- a/patches/debian-debug.diff
+++ b/patches/debian-debug.diff
@@ -1,12 +1,6 @@
-<<<<<<< HEAD
Index: libreoffice-3.4.1/libreoffice-build/patches/dev300/g1.diff
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ libreoffice-3.4.1/libreoffice-build/patches/dev300/g1.diff 2011-07-15 11:41:20.206849605 +0200
-=======
--- /dev/null 2011-06-02 14:58:12.448567841 +0000
+++ libreoffice-3.4.0/libreoffice-build/patches/hotfixes/g1.diff 2011-06-16 22:10:26.000000000 +0000
->>>>>>> debian-experimental-3.4.0
@@ -0,0 +1,74 @@
+diff --git a/configure.in b/configure.in
+index 3257668..afd36de 100755
@@ -82,19 +76,3 @@ Index: libreoffice-3.4.1/libreoffice-build/patches/dev300/g1.diff
+
+ gb_LinkTarget_INCLUDE := $(filter-out %/stl, $(subst -I. , ,$(SOLARINC)))
+ gb_LinkTarget_INCLUDE_STL := $(filter %/stl, $(subst -I. , ,$(SOLARINC)))
-<<<<<<< HEAD
-Index: libreoffice-3.4.1/libreoffice-build/patches/dev300/apply
-===================================================================
---- libreoffice-3.4.1.orig/libreoffice-build/patches/dev300/apply 2011-07-15 11:41:11.306849481 +0200
-+++ libreoffice-3.4.1/libreoffice-build/patches/dev300/apply 2011-07-15 11:41:20.206849605 +0200
-@@ -243,6 +243,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
-=======
->>>>>>> debian-experimental-3.4.0
diff --git a/patches/disable-rhino.diff b/patches/disable-rhino.diff
index 1e7ccc1..fefce78 100644
--- a/patches/disable-rhino.diff
+++ b/patches/disable-rhino.diff
@@ -1,7 +1,7 @@
-Index: libreoffice-3.4.1/libreoffice-build/patches/dev300/disable-rhino.diff
+Index: libreoffice-3.4.2/libreoffice-build/patches/dev300/disable-rhino.diff
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ libreoffice-3.4.1/libreoffice-build/patches/dev300/disable-rhino.diff 2011-07-15 11:41:30.696849750 +0200
++++ libreoffice-3.4.2/libreoffice-build/patches/dev300/disable-rhino.diff 2011-08-19 11:46:52.379435353 +0200
@@ -0,0 +1,857 @@
+--- scripting/prj/build.lst-old 2011-06-27 20:07:54.000000000 +0000
++++ scripting/prj/build.lst 2011-06-27 20:06:28.000000000 +0000
@@ -860,23 +860,14 @@ Index: libreoffice-3.4.1/libreoffice-build/patches/dev300/disable-rhino.diff
+ // new user interface configuration files
+ File gid_File_Share_Config_Sofficecfg_uiconfig_Zip
+ TXT_FILE_BODY;
-<<<<<<< HEAD
-Index: libreoffice-3.4.1/libreoffice-build/patches/dev300/apply
+Index: libreoffice-3.4.2/libreoffice-build/patches/dev300/apply
===================================================================
---- libreoffice-3.4.1.orig/libreoffice-build/patches/dev300/apply 2011-07-15 11:41:20.206849605 +0200
-+++ libreoffice-3.4.1/libreoffice-build/patches/dev300/apply 2011-07-15 11:41:30.696849750 +0200
-@@ -1482,5 +1482,8 @@
- [ Gcc46 ]
- gcc4.6.0.diff
-
-=======
---- libreoffice-3.4.0/libreoffice-build/patches/dev300/apply-old 2011-06-28 11:17:59.000000000 +0000
-+++ libreoffice-3.4.0/libreoffice-build/patches/dev300/apply 2011-06-28 11:18:15.000000000 +0000
+--- libreoffice-3.4.2.orig/libreoffice-build/patches/dev300/apply 2011-08-19 11:46:09.000000000 +0200
++++ libreoffice-3.4.2/libreoffice-build/patches/dev300/apply 2011-08-19 11:47:41.799434982 +0200
@@ -1415,3 +1415,6 @@
sd_effects_styles.diff, pixie
symbols-20-august.diff, i#11167, jopsen
vEdit-13-August.diff, jopsen
+
->>>>>>> debian-experimental-3.4.0
-+[ TemporaryHacks ]
++[TemporaryHacks]
+disable-rhino.diff
diff --git a/patches/gcc4.6.0.diff b/patches/gcc4.6.0.diff
index e64aef4..5871fed 100644
--- a/patches/gcc4.6.0.diff
+++ b/patches/gcc4.6.0.diff
@@ -1,12 +1,5 @@
-<<<<<<< HEAD
-Index: libreoffice-3.4.1/libreoffice-build/patches/dev300/gcc4.6.0.diff
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ libreoffice-3.4.1/libreoffice-build/patches/dev300/gcc4.6.0.diff 2011-07-15 11:40:51.676849212 +0200
-=======
--- /dev/null 2011-04-24 04:52:22.984502351 +0000
+++ libreoffice-3.4.0/libreoffice-build/patches/hotfixes/gcc4.6.0.diff 2011-04-29 22:34:08.000000000 +0000
->>>>>>> debian-experimental-3.4.0
@@ -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
@@ -17,25 +10,3 @@ Index: libreoffice-3.4.1/libreoffice-build/patches/dev300/gcc4.6.0.diff
+-CFLAGSENABLESYMBOLS:=-Z7
+ .ENDIF
+ .ENDIF # "L10N_framework"==""
-<<<<<<< HEAD
-Index: libreoffice-3.4.1/libreoffice-build/patches/dev300/apply
-===================================================================
---- libreoffice-3.4.1.orig/libreoffice-build/patches/dev300/apply 2011-07-15 11:40:42.896849100 +0200
-+++ libreoffice-3.4.1/libreoffice-build/patches/dev300/apply 2011-07-15 11:40:51.676849212 +0200
-@@ -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
-@@ -1471,3 +1471,5 @@
- [ PowerPC ]
- no-minimaltoc.diff
-
-+[ Gcc46 ]
-+gcc4.6.0.diff
-=======
->>>>>>> debian-experimental-3.4.0
diff --git a/patches/jurt-soffice-location.diff b/patches/jurt-soffice-location.diff
index a739685..ef0ccca 100644
--- a/patches/jurt-soffice-location.diff
+++ b/patches/jurt-soffice-location.diff
@@ -1,11 +1,6 @@
Index: libreoffice-3.4.1/libreoffice-build/patches/dev300/jurt-soffice-location.diff
-===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-<<<<<<< HEAD
-+++ libreoffice-3.4.1/libreoffice-build/patches/dev300/jurt-soffice-location.diff 2011-07-12 13:26:53.076722801 +0200
-=======
+++ libreoffice-3.3.2/libreoffice-build/patches/hotfixes/jurt-soffice-location.diff 2011-06-07 14:06:35.057334630 +0200
->>>>>>> debian-experimental-3.4.0
@@ -0,0 +1,20 @@
+commit b71107fb12e3c3125e0cb62c5a4f6636a80c6408
+Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
@@ -27,20 +22,3 @@ Index: libreoffice-3.4.1/libreoffice-build/patches/dev300/jurt-soffice-location.
++ return new File("/usr/lib/libreoffice/program/soffice");
+ return null;
+ }
-<<<<<<< HEAD
-Index: libreoffice-3.4.1/libreoffice-build/patches/dev300/apply
-===================================================================
---- libreoffice-3.4.1.orig/libreoffice-build/patches/dev300/apply 2011-07-12 13:26:45.576722699 +0200
-+++ libreoffice-3.4.1/libreoffice-build/patches/dev300/apply 2011-07-12 13:26:53.086722800 +0200
-@@ -244,6 +244,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
-=======
->>>>>>> debian-experimental-3.4.0
diff --git a/patches/mips-openjdk-jre-paths.diff b/patches/mips-openjdk-jre-paths.diff
index 8b326a6..b495204 100644
--- a/patches/mips-openjdk-jre-paths.diff
+++ b/patches/mips-openjdk-jre-paths.diff
@@ -1,12 +1,5 @@
-<<<<<<< HEAD
-Index: libreoffice-3.4.1/libreoffice-build/patches/dev300/mips-openjdk-jre-paths.diff
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ libreoffice-3.4.1/libreoffice-build/patches/dev300/mips-openjdk-jre-paths.diff 2011-07-15 11:41:40.016849878 +0200
-=======
--- /dev/null 2011-06-27 20:29:01.643585831 +0200
+++ libreoffice-3.4.0/libreoffice-build/patches/hotfixes/mips-openjdk-jre-paths.diff 2011-06-28 16:06:31.000000000 +0200
->>>>>>> debian-experimental-3.4.0
@@ -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
@@ -26,26 +19,3 @@ Index: libreoffice-3.4.1/libreoffice-build/patches/dev300/mips-openjdk-jre-paths
+ }
+
+
-<<<<<<< HEAD
-Index: libreoffice-3.4.1/libreoffice-build/patches/dev300/apply
-===================================================================
---- libreoffice-3.4.1.orig/libreoffice-build/patches/dev300/apply 2011-07-15 11:41:35.596849817 +0200
-+++ libreoffice-3.4.1/libreoffice-build/patches/dev300/apply 2011-07-15 11:41:40.016849878 +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
-@@ -1488,3 +1488,6 @@
-
- [ DebianBaseOnly ]
- packcomponents-remove-split-components.diff
-+
-+[ MIPS ]
-+mips-openjdk-jre-paths.diff
-=======
->>>>>>> debian-experimental-3.4.0
diff --git a/patches/no-minimaltoc.diff b/patches/no-minimaltoc.diff
index 6056a35..eddf016 100644
--- a/patches/no-minimaltoc.diff
+++ b/patches/no-minimaltoc.diff
@@ -1,44 +1,7 @@
-<<<<<<< HEAD
-Index: libreoffice-3.4.1/libreoffice-build/patches/dev300/apply
-===================================================================
---- libreoffice-3.4.1.orig/libreoffice-build/patches/dev300/apply 2011-07-15 11:40:25.496848861 +0200
-+++ libreoffice-3.4.1/libreoffice-build/patches/dev300/apply 2011-07-15 11:40:42.896849100 +0200
-@@ -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
-@@ -1467,3 +1467,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.4.1/libreoffice-build/patches/dev300/no-minimaltoc.diff
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ libreoffice-3.4.1/libreoffice-build/patches/dev300/no-minimaltoc.diff 2011-07-15 11:40:42.896849100 +0200
-=======
-Index: libreoffice-3.3.1/libreoffice-build/patches/dev300/no-minimaltoc.diff
+Index: libreoffice-3.4.2/libreoffice-build/patches/hotfixes/no-minimaltoc.diff
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ libreoffice-3.3.1/libreoffice-build/patches/hotfixes/no-minimaltoc.diff 2011-03-01 14:37:20.344672014 +0100
->>>>>>> debian-experimental-3.4.0
++++ libreoffice-3.4.2/libreoffice-build/patches/hotfixes/no-minimaltoc.diff 2011-08-19 11:41:02.989437991 +0200
@@ -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 662665b..457f40e 100644
--- a/patches/odk-jni-include.diff
+++ b/patches/odk-jni-include.diff
@@ -1,12 +1,5 @@
-<<<<<<< HEAD
-Index: libreoffice-3.4.1/libreoffice-build/patches/dev300/odk-jni-include.diff
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ libreoffice-3.4.1/libreoffice-build/patches/dev300/odk-jni-include.diff 2011-07-15 11:40:56.756849286 +0200
-=======
--- /dev/null 2011-04-24 04:52:22.984502351 +0000
+++ libreoffice-3.3.2/libreoffice-build/patches/hotfixes/odk-jni-include.diff 2011-04-30 12:07:10.000000000 +0000
->>>>>>> debian-experimental-3.4.0
@@ -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
@@ -19,20 +12,3 @@ Index: libreoffice-3.4.1/libreoffice-build/patches/dev300/odk-jni-include.diff
+ -I$(PRJ)/inc/pch -shared -o $(BIN)$/unowinreg.dll unowinreg.cxx \
+ -Wl,--kill-at -lkernel32 -ladvapi32
+ $(MINGWSTRIP) $(BIN)$/unowinreg.dll
-<<<<<<< HEAD
-Index: libreoffice-3.4.1/libreoffice-build/patches/dev300/apply
-===================================================================
---- libreoffice-3.4.1.orig/libreoffice-build/patches/dev300/apply 2011-07-15 11:40:51.676849212 +0200
-+++ libreoffice-3.4.1/libreoffice-build/patches/dev300/apply 2011-07-15 11:40:56.756849286 +0200
-@@ -143,6 +143,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
-=======
->>>>>>> debian-experimental-3.4.0
diff --git a/patches/packcomponents-remove-split-components.diff b/patches/packcomponents-remove-split-components.diff
index 34fd670..a2ea5ba 100644
--- a/patches/packcomponents-remove-split-components.diff
+++ b/patches/packcomponents-remove-split-components.diff
@@ -1,12 +1,6 @@
-<<<<<<< HEAD
-Index: libreoffice-3.4.1/libreoffice-build/patches/dev300/packcomponents-remove-split-components.diff
-===================================================================
+Index: libreoffice-3.4.2/libreoffice-build/patches/hotfixes/packcomponents-remove-split-components.diff
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ libreoffice-3.4.1/libreoffice-build/patches/dev300/packcomponents-remove-split-components.diff 2011-07-15 11:41:11.306849481 +0200
-=======
---- /dev/null 2011-06-02 16:58:12.448567841 +0200
-+++ libreoffice-3.4.0/libreoffice-build/patches/hotfixes/packcomponents-remove-split-components.diff 2011-06-14 00:59:26.000000000 +0200
->>>>>>> debian-experimental-3.4.0
++++ libreoffice-3.4.2/libreoffice-build/patches/hotfixes/packcomponents-remove-split-components.diff 2011-08-19 11:44:57.949436217 +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
@@ -45,17 +39,3 @@ Index: libreoffice-3.4.1/libreoffice-build/patches/dev300/packcomponents-remove-
+ .IF "$(OS)" != "WNT" && "$(ENABLE_GSTREAMER)" != ""
+ my_components += avmediagstreamer
+ .END
-<<<<<<< HEAD
-Index: libreoffice-3.4.1/libreoffice-build/patches/dev300/apply
-===================================================================
---- libreoffice-3.4.1.orig/libreoffice-build/patches/dev300/apply 2011-07-15 11:41:09.576849458 +0200
-+++ libreoffice-3.4.1/libreoffice-build/patches/dev300/apply 2011-07-15 11:41:11.306849481 +0200
-@@ -1479,3 +1479,6 @@
-
- [ Gcc46 ]
- gcc4.6.0.diff
-+
-+[ DebianBaseOnly ]
-+packcomponents-remove-split-components.diff
-=======
->>>>>>> debian-experimental-3.4.0
diff --git a/patches/splash-progressbarcolor.diff b/patches/splash-progressbarcolor.diff
index 441cf72..1c94d7b 100644
--- a/patches/splash-progressbarcolor.diff
+++ b/patches/splash-progressbarcolor.diff
@@ -1,12 +1,8 @@
<<<<<<< HEAD
-Index: libreoffice-3.4.1/libreoffice-build/patches/dev300/debian-splash.diff
+Index: libreoffice-3.4.2/libreoffice-build/patches/hotfixes/debian-splash.diff
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ libreoffice-3.4.1/libreoffice-build/patches/dev300/debian-splash.diff 2011-07-06 16:59:59.055044428 +0200
-=======
---- /dev/null 2010-09-28 02:28:57.560060918 +0200
-+++ libreoffice-3.3.0/libreoffice-build/patches/hotfixes/debian-splash.diff 2010-10-07 19:19:42.000000000 +0200
->>>>>>> debian-experimental-3.4.0
++++ libreoffice-3.4.2/libreoffice-build/patches/hotfixes/debian-splash.diff 2011-08-19 11:40:51.649438077 +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
--
LibreOffice packaging repository
Reply to: