diff -ruN a/debian/changelog b/debian/changelog --- a/debian/changelog 2015-08-28 15:18:09.000000000 +0000 +++ b/debian/changelog 2015-11-14 17:25:07.096000000 +0000 @@ -1,3 +1,10 @@ +libreoffice (1:4.3.3-2+tde1+deb8u3a) jessie; urgency=high + + * Enable TDE module + * Fix FTBFS on ppc64el + + -- Slávek Banko Sun, 28 Feb 2016 15:33:45 +0100 + libreoffice (1:4.3.3-2+deb8u3) jessie-security; urgency=high * debian/patches/V-1lp8t84lh4.diff: fix "LibreOffice Writer Lotus Word Pro diff -ruN a/debian/control b/debian/control --- a/debian/control 2015-08-28 17:51:39.000000000 +0000 +++ b/debian/control 2015-11-14 17:25:07.096000000 +0000 @@ -133,6 +133,8 @@ python-dev (>= 2.6), python3, python3-dev (>= 3.3), + tdelibs14-trinity-dev, + tdepim-trinity-dev, ucpp, unixodbc-dev (>= 2.2.11), unzip, @@ -253,6 +255,7 @@ * libreoffice-gtk: Gtk UI Plugin, GNOME File Picker support, QuickStarter for GNOMEs notification are * libreoffice-gnome: GIO, GConf backend + * libreoffice-trinity: TDE UI Plugin and TDE File Picker support * libreoffice-kde: KDE UI Plugin and KDE File Picker support * unixodbc: ODBC database support * cups-bsd: Allows LibreOffice to detect your CUPS printer queues @@ -366,6 +369,7 @@ libreoffice-style-hicontrast (<< 1:3.3.0-1), libreoffice-style-oxygen (<< 1:3.3.0-1), libreoffice-style-tango (<< 1:3.3.0-1), + libreoffice-trinity (<< ${binary:Version}), libreoffice-writer (<< ${binary:Version}), mozilla-libreoffice (<< 1:3.5.0~beta~), mozilla-plugin-vlc (<< 1.0), @@ -4417,6 +4421,28 @@ * konqueror / kmail * libreoffice-kab: KDE Addressbook support +Package: libreoffice-trinity +Architecture: alpha amd64 armel armhf hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc ppc64el arm64 +Depends: libreoffice-core (= ${binary:Version}), + ${misc:Depends}, + ${shlibs:Depends} +Recommends: ${trinity-iconset-dep} +Suggests: kmail-trinity, konqueror-trinity, libreoffice-tdeab-trinity +Section: tde +Enhances: libreoffice +Replaces: libreoffice-core (= 1:3.5.0~beta2-1), + openoffice.org-trinity (<< 1:3.3.0~) +Description: office productivity suite -- TDE integration + LibreOffice is a full-featured office productivity suite that provides + a near drop-in replacement for Microsoft(R) Office. + . + This package contains the TDE plugin for drawing OOo's widgets with + TDE/Qt and a TDEish File Picker when running under TDE. + You can extend the functionality of this by installing these packages: + . + * konqueror / kmail + * libreoffice-tdeab-trinity: TDE Addressbook support + Package: libreoffice-sdbc-postgresql Section: misc Architecture: alpha amd64 arm64 armel armhf arm64 i386 mips mipsel powerpc powerpcspe ppc64 ppc64el s390x hppa ia64 s390 sparc kfreebsd-amd64 kfreebsd-i386 @@ -4467,6 +4493,21 @@ This package allows LibreOffice to access Evolution address books. You need to install evolution separately. +Package: libreoffice-tdeab-trinity +Architecture: alpha amd64 armel armhf hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc ppc64el arm64 +Depends: libreoffice-common (>= 1:3.4.0~), + libreoffice-core (= ${binary:Version}), + ${misc:Depends}, + ${shlibs:Depends} +Recommends: kaddressbook-trinity +Conflicts: ure (<< 1.5.1+OOo3.1.1-15) +Description: office productivity suite -- TDE adressbook support + LibreOffice is a full-featured office productivity suite that provides + a near drop-in replacement for Microsoft(R) Office. + . + This package allows LibreOffice to access the TDE Addressbook. + You need to install kaddressbook-trinity separately. + Package: libreoffice-subsequentcheckbase Section: libs Priority: extra diff -ruN a/debian/control.in b/debian/control.in --- a/debian/control.in 2015-04-25 16:33:35.000000000 +0000 +++ b/debian/control.in 2015-11-14 17:25:07.096000000 +0000 @@ -197,6 +197,7 @@ libreoffice-impress (<< ${binary:Version}), libreoffice-kab (<< 1:3.4.1~), libreoffice-kde (<< ${binary:Version}), + libreoffice-trinity (<< ${binary:Version}), libreoffice-officebean (<< ${binary:Version}), libreoffice-presentation-minimizer (<< 1:4.2~), libreoffice-sdbc-postgresql (<< 0.8.1~), diff -ruN a/debian/control.tdeab.in b/debian/control.tdeab.in --- a/debian/control.tdeab.in 1970-01-01 00:00:00.000000000 +0000 +++ b/debian/control.tdeab.in 2015-11-14 17:25:07.096000000 +0000 @@ -0,0 +1,15 @@ +Package: libreofficeVER-tdeab-trinity +Architecture: %OOO_BASE_ARCHS% +Depends: libreofficeVER-core (= ${binary:Version}), + libreofficeVER-common (>= 1:3.4.0~), + ${shlibs:Depends}, + ${misc:Depends} +Recommends: kaddressbook-trinity +Conflicts: ure (<< 1.5.1+OOo3.1.1-15) +Description: office productivity suite -- TDE adressbook support + LibreOffice is a full-featured office productivity suite that provides + a near drop-in replacement for Microsoft(R) Office. + . + This package allows LibreOffice to access the TDE Addressbook. + You need to install kaddressbook-trinity separately. + diff -ruN a/debian/control.trinity.in b/debian/control.trinity.in --- a/debian/control.trinity.in 1970-01-01 00:00:00.000000000 +0000 +++ b/debian/control.trinity.in 2015-11-14 17:25:07.096000000 +0000 @@ -0,0 +1,23 @@ +Package: libreofficeVER-trinity +Architecture: %OOO_ARCHS% +Depends: libreofficeVER-core (= ${binary:Version}), + ${shlibs:Depends}, + ${misc:Depends} +Recommends: ${trinity-iconset-dep} +Suggests: konqueror-trinity, + kmail-trinity, + libreofficeVER-tdeab-trinity +Section: tde +Enhances: libreofficeVER +Replaces: openoffice.org-trinity (<< 1:3.3.0~), libreoffice-core (= 1:3.5.0~beta2-1) +Description: office productivity suite -- TDE integration + LibreOffice is a full-featured office productivity suite that provides + a near drop-in replacement for Microsoft(R) Office. + . + This package contains the TDE plugin for drawing OOo's widgets with + TDE/Qt and a TDEish File Picker when running under TDE. + You can extend the functionality of this by installing these packages: + . + * konqueror / kmail + * libreoffice-tdeab-trinity: TDE Addressbook support + diff -ruN a/debian/patches/bp000-ppc64el-7a66dbe9.diff b/debian/patches/bp000-ppc64el-7a66dbe9.diff --- a/debian/patches/bp000-ppc64el-7a66dbe9.diff 1970-01-01 00:00:00.000000000 +0000 +++ b/debian/patches/bp000-ppc64el-7a66dbe9.diff 2016-02-28 13:36:04.000000000 +0000 @@ -0,0 +1,29 @@ +commit 7a66dbe982623be620ad6ac426fe689a434e5f51 +Author: David Tardon +Date: Tue May 12 10:37:53 2015 +0200 + + java dir for powepc64 and powepc64le can differ + + E.g., RHEL >= 7.1 uses ppc64le for reasons listed in + https://bugs.openjdk.java.net/browse/JDK-8073139 . + + Change-Id: I982e65cdf99999e8a5ed23cf444ccb2aee764c4c + +diff --git a/configure.ac b/configure.ac +index 26071dc..55157a9 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -6997,9 +6997,12 @@ then + powerpc) + my_java_arch=ppc + ;; +- powerpc64*) ++ powerpc64) + my_java_arch=ppc64 + ;; ++ powerpc64le) ++ AS_IF([test -d "$JAVA_HOME/jre/lib/ppc64le"], [my_java_arch=ppc64le], [my_java_arch=ppc64]) ++ ;; + x86_64) + my_java_arch=amd64 + ;; diff -ruN a/debian/patches/bp001-ppc64el-d8eee8e4.diff b/debian/patches/bp001-ppc64el-d8eee8e4.diff --- a/debian/patches/bp001-ppc64el-d8eee8e4.diff 1970-01-01 00:00:00.000000000 +0000 +++ b/debian/patches/bp001-ppc64el-d8eee8e4.diff 2016-02-28 14:31:41.308000000 +0000 @@ -0,0 +1,77 @@ +commit d8eee8e4d1a303044bf34b28c2e95bd6da23fd79 +Author: David Tardon +Date: Tue May 12 12:10:16 2015 +0200 + + java dir for powepc64 and powepc64le can differ + + E.g., RHEL >= 7.1 uses ppc64le for reasons listed in + https://bugs.openjdk.java.net/browse/JDK-8073139 . + + This is a follow-up to commit 7a66dbe982623be620ad6ac426fe689a434e5f51. + + Change-Id: I685f76d51e9775788a7fb225c6a5e2309a45ceb7 + +diff --git a/config_host/config_java.h.in b/config_host/config_java.h.in +new file mode 100644 +index 0000000..8b23de9 +--- /dev/null ++++ b/config_host/config_java.h.in +@@ -0,0 +1,6 @@ ++#ifndef CONFIG_JAVA_H ++#define CONFIG_JAVA_H ++ ++#undef JAVA_ARCH ++ ++#endif +diff --git a/configure.ac b/configure.ac +index 55157a9..5414754 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -7002,6 +7002,7 @@ then + ;; + powerpc64le) + AS_IF([test -d "$JAVA_HOME/jre/lib/ppc64le"], [my_java_arch=ppc64le], [my_java_arch=ppc64]) ++ JAVA_ARCH=$my_java_arch + ;; + x86_64) + my_java_arch=amd64 +@@ -7011,6 +7012,7 @@ then + ;; + esac + JAWTLIB="-L$JAVA_HOME/jre/lib/$my_java_arch -ljawt" ++ AS_IF([test "$JAVA_ARCH" != ""], [AC_DEFINE_UNQUOTED([JAVA_ARCH], ["$JAVA_ARCH"])]) + fi + AC_MSG_RESULT([$JAWTLIB]) + fi +@@ -12988,6 +12990,7 @@ AC_CONFIG_HEADERS([config_host/config_folders.h]) + AC_CONFIG_HEADERS([config_host/config_gcc.h]) + AC_CONFIG_HEADERS([config_host/config_global.h]) + AC_CONFIG_HEADERS([config_host/config_graphite.h]) ++AC_CONFIG_HEADERS([config_host/config_java.h]) + AC_CONFIG_HEADERS([config_host/config_lgpl.h]) + AC_CONFIG_HEADERS([config_host/config_locales.h]) + AC_CONFIG_HEADERS([config_host/config_mpl.h]) +diff --git a/jvmfwk/inc/vendorbase.hxx b/jvmfwk/inc/vendorbase.hxx +index 2ecd01f..a01db56 100644 +--- a/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.hxx ++++ b/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.hxx +@@ -20,6 +20,8 @@ + #ifndef INCLUDED_JVMFWK_PLUGINS_SUNMAJOR_PLUGINLIB_VENDORBASE_HXX + #define INCLUDED_JVMFWK_PLUGINS_SUNMAJOR_PLUGINLIB_VENDORBASE_HXX + ++#include "config_java.h" ++ + #include "rtl/ustring.hxx" + #include "rtl/ref.hxx" + #include "osl/endian.h" +@@ -31,7 +33,9 @@ namespace jfw_plugin + + + //Used by subclasses of VendorBase to build paths to Java runtime +-#if defined(__sparcv9) ++#if defined(JAVA_ARCH) ++#define JFW_PLUGIN_ARCH JAVA_ARCH ++#elif defined(__sparcv9) + #define JFW_PLUGIN_ARCH "sparcv9" + #elif defined SPARC + #define JFW_PLUGIN_ARCH "sparc" diff -ruN a/debian/patches/bp002-ppc64el-caacdc4b.diff b/debian/patches/bp002-ppc64el-caacdc4b.diff --- a/debian/patches/bp002-ppc64el-caacdc4b.diff 1970-01-01 00:00:00.000000000 +0000 +++ b/debian/patches/bp002-ppc64el-caacdc4b.diff 2016-02-28 13:37:53.000000000 +0000 @@ -0,0 +1,21 @@ +commit caacdc4b39460fcd9ba34652da7c25740f077160 +Author: Caolán McNamara +Date: Wed Jul 1 08:34:58 2015 +0100 + + f22 openjdk for ppc64le has both these dirs, but jawt is only on one + + Change-Id: Ie770ecceb8c8f5a6fa882a9f5d5a26806b029589 + +diff --git a/configure.ac b/configure.ac +index aecbe8f..8964c96 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -7058,7 +7058,7 @@ then + my_java_arch=ppc64 + ;; + powerpc64le) +- AS_IF([test -d "$JAVA_HOME/jre/lib/ppc64le"], [my_java_arch=ppc64le], [my_java_arch=ppc64]) ++ AS_IF([test -d "$JAVA_HOME/jre/lib/ppc64le/libjawt.so"], [my_java_arch=ppc64le], [my_java_arch=ppc64]) + JAVA_ARCH=$my_java_arch + ;; + x86_64) diff -ruN a/debian/patches/bp003-ppc64el-e1d8fb13.diff b/debian/patches/bp003-ppc64el-e1d8fb13.diff --- a/debian/patches/bp003-ppc64el-e1d8fb13.diff 1970-01-01 00:00:00.000000000 +0000 +++ b/debian/patches/bp003-ppc64el-e1d8fb13.diff 2016-02-28 13:38:26.000000000 +0000 @@ -0,0 +1,21 @@ +commit e1d8fb13b2f033d89dd4d1bf9a6fbf0c7a686b53 +Author: Caolán McNamara +Date: Wed Jul 1 10:52:34 2015 +0100 + + d->e + + Change-Id: I76ced60151bcc160eb4a4c12cc86f01edec076fc + +diff --git a/configure.ac b/configure.ac +index 8964c96..70ab9c8 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -7058,7 +7058,7 @@ then + my_java_arch=ppc64 + ;; + powerpc64le) +- AS_IF([test -d "$JAVA_HOME/jre/lib/ppc64le/libjawt.so"], [my_java_arch=ppc64le], [my_java_arch=ppc64]) ++ AS_IF([test -e "$JAVA_HOME/jre/lib/ppc64le/libjawt.so"], [my_java_arch=ppc64le], [my_java_arch=ppc64]) + JAVA_ARCH=$my_java_arch + ;; + x86_64) diff -ruN a/debian/patches/series b/debian/patches/series --- a/debian/patches/series 2016-02-05 20:00:07.000000000 +0000 +++ b/debian/patches/series 2016-02-28 14:23:16.780000000 +0000 @@ -45,3 +45,8 @@ V-a7vjdei7l7.diff V-mgylorku1q.diff V-pxk0pgyk9d.diff + +bp000-ppc64el-7a66dbe9.diff +bp001-ppc64el-d8eee8e4.diff +bp002-ppc64el-caacdc4b.diff +bp003-ppc64el-e1d8fb13.diff diff -ruN a/debian/rules b/debian/rules --- a/debian/rules 2015-04-25 16:33:35.000000000 +0000 +++ b/debian/rules 2015-11-14 17:25:07.096000000 +0000 @@ -223,6 +223,13 @@ QT_MINVER= (>= 4:4.5) endif KDELIBS_MINVER= (>= 4:4.3.4) +BUILD_TDE=y +ifeq "$(BUILD_TDE)" "y" + ENABLE_TDEAB=y +endif +ifeq "$(BUILD_TDE)" "y" + TDELIBS_MINVER= (>= 4:3.5.13) +endif BUILD_DBG_PACKAGE=y ifneq (nocheck,$(findstring nocheck,$(DEB_BUILD_OPTIONS))) BUILD_TEST_PACKAGE=y @@ -604,6 +611,7 @@ ENABLE_MYSQLNATIVE=n ENABLE_EVO2=n ENABLE_KDEAB=n + ENABLE_TDEAB=n ENABLE_REPORTDESIGN=n DEBHELPER_OPTIONS += -Nlibreoffice-base libreoffice-base-core -Nlibreoffice-base-drivers DEBHELPER_OPTIONS += -Nlibreoffice-evolution -Nlibreoffice-kab @@ -1293,6 +1301,23 @@ endif endif +ifeq "$(BUILD_TDE)" "n" + CONFIGURE_FLAGS+= --disable-tde + CONFIGURE_FLAGS+= --with-images="$(IMAGES)" +else + CONFIGURE_FLAGS+= --enable-tde + TDE_ICONSET_DEP=libreoffice$(VER)-style-crystal + BUILD_DEPS += , tdelibs14-trinity-dev + + DBG_DBG_SUGGESTS+= , tdelibs-trinity-dbg, libtqtinterface-dbg + + ifeq "$(ENABLE_TDEAB)" "y" + BUILD_DEPS += , tdepim-trinity-dev + else + CONFIGURE_FLAGS+= --disable-tdeab + endif +endif + ifeq "$(ENABLE_MYSQLNATIVE)" "y" CONFIGURE_FLAGS += --enable-ext-mariadb-connector ifneq "$(USE_MARIADB)" "y" @@ -1821,6 +1846,11 @@ ifeq "$(BUILD_KDE)" "y" cat debian/control.kde.in >> debian/control endif +ifeq "$(BUILD_TDE)" "y" + sed -e "s|libreofficeVER|libreoffice$(VER)|g" \ + >> debian/control < debian/control.trinity.in + perl -pi -e 's/ libreoffice$(VER)-gnome,/ libreoffice-gnome | libreoffice$(VER)-trinity,/' debian/control +endif ifeq "$(ENABLE_SDBC_POSTGRESQL)" "y" cat debian/control.postgresql.in >> debian/control endif @@ -1833,6 +1863,10 @@ ifeq "$(ENABLE_KDEAB)" "y" cat debian/control.kab.in >> debian/control endif +ifeq "$(ENABLE_TDEAB)" "y" + sed -e "s|libreofficeVER|libreoffice$(VER)|g" \ + >> debian/control < debian/control.tdeab.in +endif ifeq "$(BUILD_TEST_PACKAGE)" "y" ifneq "$(OOO_JAVA_ARCHS)" "" cat debian/control.subsequentcheckbase.in >> debian/control @@ -1920,6 +1954,9 @@ ifeq "$(BUILD_KDE)" "y" perl -pi -e 's/GConf backend$$/GConf backend\n * libreoffice-kde: KDE UI Plugin and KDE File Picker support/' debian/control endif +ifeq "$(BUILD_TDE)" "y" + perl -pi -e 's/GConf backend$$/GConf backend\n * libreoffice$(VER)-trinity: TDE UI Plugin and TDE File Picker support/' debian/control +endif ifeq "$(USE_DBUS)" "y" perl -pi -e 's/paperconf$$/paperconf\n * bluez: Bluetooth support for Impress (slideshow remote control/' debian/control @@ -2603,6 +2640,45 @@ | sed -e "s/@TYPE@/drawing/" \ > $(PKGDIR)-kde/usr/share/templates/soffice.odg.desktop endif + +ifeq "$(BUILD_TDE)" "y" + mkdir -p -m755 $(PKGDIR)-trinity/$(OODIR)/program + mv $(PKGDIR)-core/$(OODIR)/program/tdefilepicker \ + $(PKGDIR)-trinity/$(OODIR)/program + + # install files for TDEs "create new" ... + mkdir -p $(PKGDIR)-trinity/opt/trinity/share/templates/.source + for i in $(SOURCE_TREE)/extras/source/shellnew/*; do \ + cp $$i $(PKGDIR)-trinity/opt/trinity/share/templates/.source/`basename $$i`; \ + done + cat debian/templates/soffice-template.desktop.in \ + | sed -e "s/@APP@/Writer/" \ + | sed -e "s/@EXT@/odt/" \ + | sed -e "s/@TYPE@/text/" \ + > $(PKGDIR)-trinity/opt/trinity/share/templates/soffice.odt.desktop + cat debian/templates/soffice-template.desktop.in \ + | sed -e "s/@APP@/Calc/" \ + | sed -e "s/@EXT@/ods/" \ + | sed -e "s/@TYPE@/spreadsheet/" \ + > $(PKGDIR)-trinity/opt/trinity/share/templates/soffice.ods.desktop + cat debian/templates/soffice-template.desktop.in \ + | sed -e "s/@APP@/Impress/" \ + | sed -e "s/@EXT@/odp/" \ + | sed -e "s/@TYPE@/presentation/" \ + > $(PKGDIR)-trinity/opt/trinity/share/templates/soffice.odp.desktop + cat debian/templates/soffice-template.desktop.in \ + | sed -e "s/@APP@/Draw/" \ + | sed -e "s/@EXT@/odg/" \ + | sed -e "s/@TYPE@/drawing/" \ + > $(PKGDIR)-trinity/opt/trinity/share/templates/soffice.odg.desktop +endif +ifeq "$(ENABLE_TDEAB)" "y" + rm -rf $(PKGDIR)-tdeab-trinity + mkdir -p -m755 $(PKGDIR)-tdeab-trinity/$(OODIR)/program + for f in libtdeab*so; do \ + mv $(PKGDIR)-core/$(OODIR)/program/$$f $(PKGDIR)-tdeab-trinity/$(OODIR)/program || exit 1 ;\ + done +endif # split out gtk stuff rm -rf $(PKGDIR)-gtk @@ -3274,6 +3350,12 @@ # register technical.dic perl -pi -e 's/standard.dic;/standard.dic;technical.dic;/' $(PKGDIR)-common/$(OODIR)/share/registry/main.xcd +ifeq "$(BUILD_TDE)" "y" + # be sure we use the right moc, FIXME: Trinity uses its own moc + mkdir -p $(CURDIR)/debian/usr/bin + ln -sf /usr/bin/moc-qt$(KDE_VER) $(CURDIR)/debian/usr/bin/moc +endif + #ifeq "$(PACKAGE_SDK)" "y" # # install gengal stuff into -dev # mkdir -p $(PKGDIR)-dev/$(OODIR)/program @@ -3469,6 +3551,7 @@ -V'Binary-Version=$(BINARY_VERSION)' \ -V'ooo-officebean-dep=$(OOO_OFFICEBEAN_DEP)' \ -V'kde-iconset-dep=$(KDE_ICONSET_DEP)' \ + -V'tde-iconset-dep=$(TDE_ICONSET_DEP)' \ -V'lpsolve-dep=$(LPSOLVE_DEP)' \ -V'gstreamer-plugins-suggests=$(GSTREAMER_PLUGINS_SUGGESTS)' \ -V'libebook-dep=$(shell debian/scripts/get_libebook_dep.sh)' \ diff -ruN a/debian/scripts/gid2pkgdirs.sh b/debian/scripts/gid2pkgdirs.sh --- a/debian/scripts/gid2pkgdirs.sh 2015-04-25 16:33:35.000000000 +0000 +++ b/debian/scripts/gid2pkgdirs.sh 2015-11-14 17:25:07.096000000 +0000 @@ -102,6 +102,7 @@ create_package_directory gid_Module_Script_Provider_For_Python pkg/libreoffice-script-provider-python create_package_directory gid_Module_Optional_Gnome pkg/libreoffice-gnome create_package_directory gid_Module_Optional_Kde pkg/libreoffice-kde +create_package_directory gid_Module_Optional_Tde pkg/libreoffice-trinity create_package_directory gid_Module_Root_Files_2 pkg/libreoffice-common create_package_directory gid_Module_Root_Files_3 pkg/libreoffice-common create_package_directory gid_Module_Root_Files_4 pkg/libreoffice-common @@ -152,7 +153,7 @@ fi && ( cd pkg/libreoffice-common/$OOINSTBASE/program find -maxdepth 1 \ - -regex '\./\(.*\.so.*\|.*\.bin\|pagein\|nsplugin\|kdefilepicker\|msfontextract\|.*\.rdb\|javaldx\|oosplash\|uri-encode\|xpdfimport\|ui-previewer\)' \ + -regex '\./\(.*\.so.*\|.*\.bin\|pagein\|nsplugin\|kdefilepicker\|tdefilepicker\|msfontextract\|.*\.rdb\|javaldx\|oosplash\|uri-encode\|xpdfimport\|ui-previewer\)' \ -exec mv {} $OODESTDIR/pkg/libreoffice-core/$OOINSTBASE/program \; );