The following commit has been merged in the ubuntu-oneiric-3.4 branch: commit 48c74060c9e8a0c03272849e4e7217db6a541497 Author: Bjoern Michaelsen <bjoern.michael...@canonical.com> Date: Tue Jul 12 13:09:45 2011 +0200
update buildfix-patches, add --as-needed fix to ubuntufixes.diff diff --git a/control b/control index 6355a9f..5c57a0f 100644 --- a/control +++ b/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Ubuntu Core Developers <ubuntu-devel-disc...@lists.ubuntu.com> XSBC-Original-Maintainer: Debian LibreOffice Maintainers <debian-openoffice@lists.debian.org> Uploaders: Rene Engelhard <r...@debian.org> -Build-Depends: lsb-release, bzip2, bison, flex | flex-old, libxaw7-dev, unzip, zip, autoconf, automake, sharutils, pkg-config, libfontconfig1-dev, libc0.1 (>= 2.10.2-7) [kfreebsd-i386 kfreebsd-amd64], zlib1g-dev, libfreetype6-dev, libx11-dev, libsm-dev, libxt-dev, libxext-dev, libxtst-dev, libice-dev, libsane-dev, libxrender-dev, libcups2-dev, libarchive-zip-perl, libpng12-dev, libjpeg-dev, libxml2-dev, libexpat1-dev, fastjar, xsltproc, libxkbfile-dev, libxinerama-dev, x11proto-render-dev, unixodbc-dev (>= 2.2.11), libxml-parser-perl, gperf, po-debconf, bc, wget | curl, dpkg-dev (>= 1.15.1), libgl1-mesa-dev [!armel !mips !mipsel], libglu1-mesa-dev [!armel !mips !mipsel], libpoppler-dev (>= 0.8.0), libtextcat-dev (>= 2.2-8), libcurl4-gnutls-dev, libssl-dev, libdb-dev, python (>= 2.6.6-3+squeeze4), python-dev, debhelper (>= 7.2.3~), libcppunit-dev (>= 1.12), openjdk-6-jdk [alpha amd64 armel armhf i386 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc], gcj-native-helper [! powerpc !powerpcspe !ppc64], libgcj-common (>= 1:4.4.1) [!powerpc !powerpcspe !ppc64], ant (>= 1.7.0), ant-optional (>= 1.7.0), libcommons-codec-java, libcommons-httpclient-java, libcommons-lang-java, libcommons-logging-java, libservlet2.5-java, libbase-java-openoffice.org [!armel], libsac-java [!armel], libxml-java-openoffice.org [!armel], libflute-java-openoffice.org [!armel], libpentaho-reporting-flow-engine-java-openoffice.org [!armel], liblayout-java-openoffice.org [!armel], libloader-java-openoffice.org [!armel], libformula-java-openoffice.org [!armel], librepository-java-openoffice.org [!armel], libfonts-java-openoffice.org [!armel], libserializer-java-openoffice.org [!armel], libcommons-logging-java, libservlet2.5-java, javahelper (>= 0.35), xulrunner-dev | firefox-dev, libnss3-dev (>= 3.12.3), dmake (>= 1:4.11), mono-devel (>= 2.4.2.3) [amd64 i386 ia64 kfreebsd-amd64 kfreebsd-i386], mono-utils (>= 2.4.2.3) [amd64 i386 ia64 kfreebsd-amd64 kfreebsd-i386], cli-common-d ev (>= 0.5.7) [amd64 i386 ia64 kfreebsd-amd64 kfreebsd-i386], libhunspell-dev (>= 1.1.5-2), libhyphen-dev (>= 2.4), libstlport4.6-dev (>= 4.6.2-3) [i386], libboost-dev (>= 1.38), libmdds-dev (>= 0.5.0), libvigraimpex-dev, libwpd-dev (>= 0.9.0), libmythes-dev (>= 2:1.2), libwps-dev (>= 0.2.0), libwpg-dev (>= 0.2.0), libicu-dev (>= 4.0), libxslt1-dev, libcairo2-dev, libmysqlclient-dev, libmysqlcppconn-dev (>= 1.1.0~r791), libxrandr-dev, libhsqldb-java (>> 1.8.0.10), bsh (>= 2.0b4), liblpsolve55-dev (>= 5.5.0.13-5+b1), lp-solve (>= 5.5.0.13-5+b1), libsuitesparse-dev (>= 1:3.4.0), libdbus-glib-1-dev (>= 0.60), libgstreamer-plugins-base0.10-dev, libneon27-gnutls-dev, librdf0-dev (>= 1.0.8), libgtk2.0-dev (>= 2.10), libgnomevfs2-dev, libgconf2-dev, libldap2-dev +Build-Depends: lsb-release, bzip2, bison, flex | flex-old, libxaw7-dev, unzip, zip, autoconf, automake, sharutils, pkg-config, libfontconfig1-dev, libc0.1 (>= 2.10.2-7) [kfreebsd-i386 kfreebsd-amd64], zlib1g-dev, libfreetype6-dev, libx11-dev, libsm-dev, libxt-dev, libxext-dev, libxtst-dev, libice-dev, libsane-dev, libxrender-dev, libcups2-dev, libarchive-zip-perl, libpng12-dev, libjpeg-dev, libxml2-dev, libexpat1-dev, fastjar, xsltproc, libxkbfile-dev, libxinerama-dev, x11proto-render-dev, unixodbc-dev (>= 2.2.11), libxml-parser-perl, gperf, po-debconf, bc, wget | curl, dpkg-dev (>= 1.15.1), libgl1-mesa-dev [!armel !mips !mipsel], libglu1-mesa-dev [!armel !mips !mipsel], libpoppler-dev (>= 0.8.0), libtextcat-dev (>= 2.2-8), libcurl4-gnutls-dev, libssl-dev, libdb-dev, python (>= 2.6.6-3+squeeze4), python-dev, debhelper (>= 7.2.3~), libcppunit-dev (>= 1.12), openjdk-6-jdk [alpha amd64 armel armhf i386 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc], gcj-native-helper [! powerpc !powerpcspe !ppc64], libgcj-common (>= 1:4.4.1) [!powerpc !powerpcspe !ppc64], ant (>= 1.7.0), ant-optional (>= 1.7.0), libcommons-codec-java, libcommons-httpclient-java, libcommons-lang-java, libcommons-logging-java, libservlet2.5-java, libbase-java-openoffice.org [!armel], libsac-java [!armel], libxml-java-openoffice.org [!armel], libflute-java-openoffice.org [!armel], libpentaho-reporting-flow-engine-java-openoffice.org [!armel], liblayout-java-openoffice.org [!armel], libloader-java-openoffice.org [!armel], libformula-java-openoffice.org [!armel], librepository-java-openoffice.org [!armel], libfonts-java-openoffice.org [!armel], libserializer-java-openoffice.org [!armel], libcommons-logging-java, libservlet2.5-java, javahelper (>= 0.35), xulrunner-dev | firefox-dev, libnss3-dev (>= 3.12.3), dmake (>= 1:4.11), libhunspell-dev (>= 1.1.5-2), libhyphen-dev (>= 2.4), libstlport4.6-dev (>= 4.6.2-3) [i386], libboost-dev (>= 1.38), libmdds-dev (>= 0.5.0), libvigraimpex-d ev, libwpd-dev (>= 0.9.0), libmythes-dev (>= 2:1.2), libwps-dev (>= 0.2.0), libwpg-dev (>= 0.2.0), libicu-dev (>= 4.0), libxslt1-dev, libcairo2-dev, libmysqlclient-dev, libmysqlcppconn-dev (>= 1.1.0~r791), libxrandr-dev, libhsqldb-java (>> 1.8.0.10), bsh (>= 2.0b4), liblpsolve55-dev (>= 5.5.0.13-5+b1), lp-solve (>= 5.5.0.13-5+b1), libsuitesparse-dev (>= 1:3.4.0), libdbus-glib-1-dev (>= 0.60), libgstreamer-plugins-base0.10-dev, libneon27-gnutls-dev, librdf0-dev (>= 1.0.8), libgtk2.0-dev (>= 2.10), libgnomevfs2-dev, libgconf2-dev, libldap2-dev Build-Depends-Indep: fdupes, xml-core, imagemagick Build-Conflicts: libcairo2 (= 1.4.8-1), libxul-dev (= 1.8.0.13~pre070720-0etch1), gjdoc (= 0.7.8-2), libc6-dev (= 2.6.1-3) [i386 amd64], libc6-dev (= 2.6.1-4) [i386 amd64], nvidia-glx-dev, nvidia-glx-legacy-dev, gcj-4.2 (= 4.2.2-6), flex (= 2.5.34-1) [amd64], libboost1.39-dev (<< 1.39.0-2), graphicsmagick-imagemagick-compat (<< 1.3.9~), qt3-dev-tools, ant (= 1.8.0-1) [hppa ia64 kfreebsd-i386 kfreebsd-amd64], ant (= 1.8.0-2) [hppa ia64 kfreebsd-i386 kfreebsd-amd64], ant (= 1.8.0-3) [hppa ia64 kfreebsd-i386 kfreebsd-amd64], base-files (= 6.0), base-files (= 6.0squeeze1), libhsqldb-java (>= 1.8.1~), libstlport4.6-dev Standards-Version: 3.9.1 @@ -547,77 +547,6 @@ Description: office productivity suite -- Java libraries for GIJ . This package has NO effect with Suns/Blackdowns/IBMs/etc. JDK. -Package: cli-uno-bridge -Section: cli-mono -Architecture: amd64 i386 ia64 kfreebsd-amd64 kfreebsd-i386 -Depends: ${shlibs:Depends}, libreoffice-core (>> ${base-version}), libuno-cli-basetypes1.0-cil, libuno-cli-uretypes1.0-cil, libuno-cli-oootypes1.0-cil, libuno-cli-cppuhelper1.0-cil, libuno-cli-ure1.0-cil, ${cli:Depends}, ${misc:Depends} -Conflicts: libuno-cil, libuno-cli-types1.1-cil -Provides: libuno-cil -Replaces: libuno-cil -Description: LibreOffice bindings for Mono CLI - LibreOffice is a full-featured office productivity suite that provides - a near drop-in replacement for Microsoft(R) Office. - . - This package contains the CLI bindings to LibreOffice for - accessing the LibreOffice API from Mono languages (e.g. C# and Boo) and - for using Mono for components. - -Package: libuno-cli-basetypes1.0-cil -Section: cli-mono -Architecture: all -Depends: ${cli:Depends}, ${misc:Depends} -Description: LibreOffice bindings for Mono CLI -- base types - LibreOffice is a full-featured office productivity suite that provides - a near drop-in replacement for Microsoft(R) Office. - . - This package contains cli_basetypes.dll, which, as the name implies, provides - some base types. - -Package: libuno-cli-uretypes1.0-cil -Section: cli-mono -Architecture: all -Depends: ${cli:Depends}, ${misc:Depends} -Description: LibreOffice bindings for Mono CLI -- URE type library - LibreOffice is a full-featured office productivity suite that provides - a near drop-in replacement for Microsoft(R) Office. - . - This package contains cli_uretypes.dll, a CLI library which provides classes - and interfaces for components and client programs. It contains the URE types. - -Package: libuno-cli-oootypes1.0-cil -Section: cli-mono -Architecture: all -Depends: ${cli:Depends}, ${misc:Depends} -Description: LibreOffice bindings for Mono CLI -- LibreOffice type library - LibreOffice is a full-featured office productivity suite that provides - a near drop-in replacement for Microsoft(R) Office. - . - This package contains cli_oootypes.dll, a CLI library which provides classes - and interfaces for components and client programs. It contains the OOo types. - -Package: libuno-cli-cppuhelper1.0-cil -Section: cli-mono -Architecture: all -Depends: ${cli:Depends}, cli-uno-bridge, ${misc:Depends} -Description: LibreOffice bindings for Mono CLI -- bootstrapping library - LibreOffice is a full-featured office productivity suite that provides - a near drop-in replacement for Microsoft(R) Office. - . - This package contains cli_cppuhelper.dll, a CLI library which provides - bootstrapping code to bootstrap native UNO (use various UNO services - implemented in different languages). - -Package: libuno-cli-ure1.0-cil -Section: cli-mono -Architecture: all -Depends: ${cli:Depends}, ${misc:Depends} -Description: LibreOffice bindings for Mono CLI -- helper classes - LibreOffice is a full-featured office productivity suite that provides - a near drop-in replacement for Microsoft(R) Office. - . - This package contains cli_ure.dll, a CLI library which contains helper - classes for implementing UNO interfaces. - Package: mozilla-libreoffice Section: net Architecture: alpha amd64 armel armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386 diff --git a/patches/buildfix-patches.diff b/patches/buildfix-patches.diff index c3385da..7e824c8 100644 --- a/patches/buildfix-patches.diff +++ b/patches/buildfix-patches.diff @@ -1,17 +1,8 @@ -Index: libreoffice-3.4.0/libreoffice-build/patches/dev300/apply +Index: libreoffice-3.4.1/libreoffice-build/patches/dev300/apply =================================================================== ---- libreoffice-3.4.0.orig/libreoffice-build/patches/dev300/apply 2011-06-28 16:21:40.672707032 +0200 -+++ libreoffice-3.4.0/libreoffice-build/patches/dev300/apply 2011-06-28 16:21:49.912707031 +0200 -@@ -148,7 +148,7 @@ - # don't lstat() that much while creating absolute URLs - breaks unopkg - # run as e.g. used during Mac dmg generation, as parts of the - # configmgr paths are not yet existing then --speed-sal-fewer-lstats.diff, i#89730, jholesov -+#speed-sal-fewer-lstats.diff, i#89730, jholesov - - #[ CJKTemporaryHacks ] - # the following patch is disabled temporary. -@@ -361,7 +361,7 @@ +--- libreoffice-3.4.1.orig/libreoffice-build/patches/dev300/apply 2011-07-07 18:42:46.000000000 +0200 ++++ libreoffice-3.4.1/libreoffice-build/patches/dev300/apply 2011-07-07 18:43:58.124799004 +0200 +@@ -356,7 +356,7 @@ #FIXME src680: separate-helpcontent.diff, jholesov # use -Wl,--as-needed, save 1% of relocations diff --git a/patches/ubuntufixes.diff b/patches/ubuntufixes.diff index 6abd37b..31ca238 100644 --- a/patches/ubuntufixes.diff +++ b/patches/ubuntufixes.diff @@ -1,8 +1,10 @@ -Index: libreoffice-3.4.0/libreoffice-build/patches/hotfixes/ubuntufixes.diff +Index: libreoffice-3.4.1/libreoffice-build/patches/hotfixes/ubuntufixes.diff =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ libreoffice-3.4.0/libreoffice-build/patches/hotfixes/ubuntufixes.diff 2011-07-04 11:56:09.197050119 +0200 -@@ -0,0 +1,1065 @@ ++++ libreoffice-3.4.1/libreoffice-build/patches/hotfixes/ubuntufixes.diff 2011-07-08 11:24:03.315618157 +0200 +@@ -0,0 +1,1099 @@ ++ ++./g format-patch libreoffice-3-4-0..libreoffice-3-4-0-ubuntu --stdout |sed -e 's|^--- a/|--- |' -e 's|^+++ b/|+++ |' +===== main repo ===== +From c8b0c9ab769ca586407a49578f251e3aaa1b7ead Mon Sep 17 00:00:00 2001 +From: Rene Engelhard <r...@debian.org> @@ -13,7 +15,7 @@ Index: libreoffice-3.4.0/libreoffice-build/patches/hotfixes/ubuntufixes.diff + solenv/inc/libs.mk | 6 ++++++ + 1 files changed, 6 insertions(+), 0 deletions(-) + -+diff --git solenv/inc/libs.mk solenv/inc/libs.mk ++diff --git a/solenv/inc/libs.mk b/solenv/inc/libs.mk +index 52dfada..7f8f67a 100644 +--- solenv/inc/libs.mk ++++ solenv/inc/libs.mk @@ -45,7 +47,7 @@ Index: libreoffice-3.4.0/libreoffice-build/patches/hotfixes/ubuntufixes.diff + solenv/gbuild/platform/unxgcc.mk | 1 + + 1 files changed, 1 insertions(+), 0 deletions(-) + -+diff --git solenv/gbuild/platform/unxgcc.mk solenv/gbuild/platform/unxgcc.mk ++diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk +index d3b63ed..7ad122e 100755 +--- solenv/gbuild/platform/unxgcc.mk ++++ solenv/gbuild/platform/unxgcc.mk @@ -71,7 +73,7 @@ Index: libreoffice-3.4.0/libreoffice-build/patches/hotfixes/ubuntufixes.diff + scp2/source/ooo/module_hidden_ooo.scp | 5 ++++- + 2 files changed, 13 insertions(+), 1 deletions(-) + -+diff --git scp2/source/ooo/file_ooo.scp scp2/source/ooo/file_ooo.scp ++diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp +index 65769d2..0eb9ff6 100644 +--- scp2/source/ooo/file_ooo.scp ++++ scp2/source/ooo/file_ooo.scp @@ -91,7 +93,7 @@ Index: libreoffice-3.4.0/libreoffice-build/patches/hotfixes/ubuntufixes.diff + File gid_File_Share_Registry_Lingucomponent_Xcd + TXT_FILE_BODY; + Styles = (PACKED); -+diff --git scp2/source/ooo/module_hidden_ooo.scp scp2/source/ooo/module_hidden_ooo.scp ++diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp +index c27d21d..308fe04 100644 +--- scp2/source/ooo/module_hidden_ooo.scp ++++ scp2/source/ooo/module_hidden_ooo.scp @@ -127,7 +129,7 @@ Index: libreoffice-3.4.0/libreoffice-build/patches/hotfixes/ubuntufixes.diff + 2 files changed, 106 insertions(+), 0 deletions(-) + create mode 100644 extras/source/palettes/standard.soc.orig + -+diff --git extras/source/palettes/standard.soc extras/source/palettes/standard.soc ++diff --git a/extras/source/palettes/standard.soc b/extras/source/palettes/standard.soc +index 0370e7a..f403bda 100644 +--- extras/source/palettes/standard.soc ++++ extras/source/palettes/standard.soc @@ -141,7 +143,7 @@ Index: libreoffice-3.4.0/libreoffice-build/patches/hotfixes/ubuntufixes.diff + <draw:color draw:name="Chart 1" draw:color="#004586"/> + <draw:color draw:name="Chart 2" draw:color="#ff420e"/> + <draw:color draw:name="Chart 3" draw:color="#ffd320"/> -+diff --git extras/source/palettes/standard.soc.orig extras/source/palettes/standard.soc.orig ++diff --git a/extras/source/palettes/standard.soc.orig b/extras/source/palettes/standard.soc.orig +new file mode 100644 +index 0000000..0370e7a +--- /dev/null @@ -254,6 +256,38 @@ Index: libreoffice-3.4.0/libreoffice-build/patches/hotfixes/ubuntufixes.diff +1.7.5.4 + +===== filters ===== ++From 2fa6a8fb2de3ae6ddd5a9f862139f69f4be67c04 Mon Sep 17 00:00:00 2001 ++From: Bjoern Michaelsen <bjoern.michael...@canonical.com> ++Date: Fri, 8 Jul 2011 11:04:50 +0200 ++Subject: [PATCH] another fix for --as-needed ++ ++--- ++ binfilter/filter/source/bf_offwrp/makefile.mk | 2 +- ++ 1 files changed, 1 insertions(+), 1 deletions(-) ++ ++diff --git a/binfilter/filter/source/bf_offwrp/makefile.mk b/binfilter/filter/source/bf_offwrp/makefile.mk ++index d65beed..0545931 100644 ++--- binfilter/filter/source/bf_offwrp/makefile.mk +++++ binfilter/filter/source/bf_offwrp/makefile.mk ++@@ -52,7 +52,6 @@ SHL1STDLIBS= \ ++ $(BFSVTOOLLIB) \ ++ $(BFOFALIB) \ ++ $(VCLLIB) \ ++- $(SOTLIB) \ ++ $(SALLIB) \ ++ $(TOOLSLIB) \ ++ $(CPPULIB) \ ++@@ -64,6 +63,7 @@ SHL1STDLIBS= \ ++ $(BFSCLIB) \ ++ $(BFSVXLIB) \ ++ $(BFSO3LIB) \ +++ $(SOTLIB) \ ++ $(UNOTOOLSLIB) \ ++ $(COMPHELPERLIB) \ ++ $(LEGACYSMGRLIB) ++-- ++1.7.5.4 ++ +===== help ===== +===== impress ===== +===== libs-core ===== @@ -277,7 +311,7 @@ Index: libreoffice-3.4.0/libreoffice-build/patches/hotfixes/ubuntufixes.diff + 11 files changed, 556 insertions(+), 5 deletions(-) + create mode 100644 sysui/desktop/share/launcher_unityquicklist.ulf + -+diff --git sysui/desktop/menus/base.desktop sysui/desktop/menus/base.desktop ++diff --git a/sysui/desktop/menus/base.desktop b/sysui/desktop/menus/base.desktop +index 40f7e79..9809e4e 100755 +--- sysui/desktop/menus/base.desktop ++++ sysui/desktop/menus/base.desktop @@ -290,7 +324,7 @@ Index: libreoffice-3.4.0/libreoffice-build/patches/hotfixes/ubuntufixes.diff ++UnityQuicklist=New Database ++Exec=libreoffice -base %U ++TargetEnvironment=Unity -+diff --git sysui/desktop/menus/calc.desktop sysui/desktop/menus/calc.desktop ++diff --git a/sysui/desktop/menus/calc.desktop b/sysui/desktop/menus/calc.desktop +index 80cc09d..0af1c53 100755 +--- sysui/desktop/menus/calc.desktop ++++ sysui/desktop/menus/calc.desktop @@ -303,7 +337,7 @@ Index: libreoffice-3.4.0/libreoffice-build/patches/hotfixes/ubuntufixes.diff ++UnityQuicklist=New Spreadsheet ++Exec=libreoffice -calc %U ++TargetEnvironment=Unity -+diff --git sysui/desktop/menus/draw.desktop sysui/desktop/menus/draw.desktop ++diff --git a/sysui/desktop/menus/draw.desktop b/sysui/desktop/menus/draw.desktop +index 57f7ade..ab4d092 100755 +--- sysui/desktop/menus/draw.desktop ++++ sysui/desktop/menus/draw.desktop @@ -316,7 +350,7 @@ Index: libreoffice-3.4.0/libreoffice-build/patches/hotfixes/ubuntufixes.diff ++UnityQuicklist=New Drawing ++Exec=libreoffice -draw %U ++TargetEnvironment=Unity -+diff --git sysui/desktop/menus/impress.desktop sysui/desktop/menus/impress.desktop ++diff --git a/sysui/desktop/menus/impress.desktop b/sysui/desktop/menus/impress.desktop +index 025524e..52f11c3 100755 +--- sysui/desktop/menus/impress.desktop ++++ sysui/desktop/menus/impress.desktop @@ -329,7 +363,7 @@ Index: libreoffice-3.4.0/libreoffice-build/patches/hotfixes/ubuntufixes.diff ++UnityQuicklist=New Presentation ++Exec=libreoffice -impress %U ++TargetEnvironment=Unity -+diff --git sysui/desktop/menus/math.desktop sysui/desktop/menus/math.desktop ++diff --git a/sysui/desktop/menus/math.desktop b/sysui/desktop/menus/math.desktop +index 55fcc29..c605994 100755 +--- sysui/desktop/menus/math.desktop ++++ sysui/desktop/menus/math.desktop @@ -342,7 +376,7 @@ Index: libreoffice-3.4.0/libreoffice-build/patches/hotfixes/ubuntufixes.diff ++UnityQuicklist=New Formula ++Exec=libreoffice -math %U ++TargetEnvironment=Unity -+diff --git sysui/desktop/menus/writer.desktop sysui/desktop/menus/writer.desktop ++diff --git a/sysui/desktop/menus/writer.desktop b/sysui/desktop/menus/writer.desktop +index 2222019..aae85b9 100755 +--- sysui/desktop/menus/writer.desktop ++++ sysui/desktop/menus/writer.desktop @@ -355,7 +389,7 @@ Index: libreoffice-3.4.0/libreoffice-build/patches/hotfixes/ubuntufixes.diff ++UnityQuicklist=New Document ++Exec=libreoffice -writer %U ++TargetEnvironment=Unity -+diff --git sysui/desktop/share/launcher_comment.ulf sysui/desktop/share/launcher_comment.ulf ++diff --git a/sysui/desktop/share/launcher_comment.ulf b/sysui/desktop/share/launcher_comment.ulf +index e369492..807fed1 100755 +--- sysui/desktop/share/launcher_comment.ulf ++++ sysui/desktop/share/launcher_comment.ulf @@ -552,7 +586,7 @@ Index: libreoffice-3.4.0/libreoffice-build/patches/hotfixes/ubuntufixes.diff ++zh_CN = "兼容开放标准 ODF 的办公软件套装。由 The Document Foundation 支持。" ++zh_TW = "與開放且標準化的 ODF 文件格式相容的辦公生產力套裝軟體。由文件基金會提供支援。" + -+diff --git sysui/desktop/share/launcher_genericname.ulf sysui/desktop/share/launcher_genericname.ulf ++diff --git a/sysui/desktop/share/launcher_genericname.ulf b/sysui/desktop/share/launcher_genericname.ulf +index ff8041a..bfe6ff4 100755 +--- sysui/desktop/share/launcher_genericname.ulf ++++ sysui/desktop/share/launcher_genericname.ulf @@ -748,7 +782,7 @@ Index: libreoffice-3.4.0/libreoffice-build/patches/hotfixes/ubuntufixes.diff + + [javafilter] + en-US = "Small Device Format Importer" -+diff --git sysui/desktop/share/launcher_unityquicklist.ulf sysui/desktop/share/launcher_unityquicklist.ulf ++diff --git a/sysui/desktop/share/launcher_unityquicklist.ulf b/sysui/desktop/share/launcher_unityquicklist.ulf +new file mode 100644 +index 0000000..49ec877 +--- /dev/null @@ -922,7 +956,7 @@ Index: libreoffice-3.4.0/libreoffice-build/patches/hotfixes/ubuntufixes.diff ++ ++[javafilter] ++en-US = "" -+diff --git sysui/desktop/share/makefile.mk sysui/desktop/share/makefile.mk ++diff --git a/sysui/desktop/share/makefile.mk b/sysui/desktop/share/makefile.mk +index 6e9ab75..61b329d 100755 +--- sysui/desktop/share/makefile.mk ++++ sysui/desktop/share/makefile.mk @@ -951,7 +985,7 @@ Index: libreoffice-3.4.0/libreoffice-build/patches/hotfixes/ubuntufixes.diff + .IF "$(WITH_LIBSN)"=="YES" + @noop x$(foreach,i,$(LAUNCHERLIST) $(shell @echo "StartupNotify=true" >> $(@:db).$(INPATH).$(@:f)/$i.desktop))x + .ENDIF -+diff --git sysui/desktop/share/translate.pl sysui/desktop/share/translate.pl ++diff --git a/sysui/desktop/share/translate.pl b/sysui/desktop/share/translate.pl +index cb209e4..9c50cc3 100755 +--- sysui/desktop/share/translate.pl ++++ sysui/desktop/share/translate.pl @@ -1021,7 +1055,7 @@ Index: libreoffice-3.4.0/libreoffice-build/patches/hotfixes/ubuntufixes.diff + vcl/unx/gtk/a11y/atkutil.cxx | 13 ++++++++++--- + 1 files changed, 10 insertions(+), 3 deletions(-) + -+diff --git vcl/unx/gtk/a11y/atkutil.cxx vcl/unx/gtk/a11y/atkutil.cxx ++diff --git a/vcl/unx/gtk/a11y/atkutil.cxx b/vcl/unx/gtk/a11y/atkutil.cxx +index 68bb949..97e44e7 100644 +--- vcl/unx/gtk/a11y/atkutil.cxx ++++ vcl/unx/gtk/a11y/atkutil.cxx -- 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/e1qinjw-0002nd...@vasks.debian.org