[SCM] LibreOffice packaging repository branch, debian-experimental-3.4.0, updated. libreoffice_3.3.3-1-82-g711c1a2
The following commit has been merged in the debian-experimental-3.4.0 branch:
commit e371effa754803753327892a0fdacdda4daaba2a
Author: Rene Engelhard <rene@debian.org>
Date: Wed Jun 22 22:24:00 2011 +0000
adapt for passive component registration
diff --git a/changelog b/changelog
index 4aa77c0..d877066 100644
--- a/changelog
+++ b/changelog
@@ -12,10 +12,9 @@ libreoffice (1:3.4.0-1) UNRELEASED; urgency=low
- build-depend on libgraphite2-dev instead of libgraphite-dev
- update for new extension and mingw configure switches
- temporarily build only for en-US
- - temporarily disable -evolution and -filter-binfilter until we get
- the (de-)registering of them fixed
- temprarily don't install gengal, not built anymore since the switch to
GNU Make...
+ - install .component files to registered-components
* debian/control.sdk.in, debian/rules:
- stop building with STLport on i386, just create a symlink in ure.
Should suffice for compat with binary-only OOo extensions
@@ -26,8 +25,12 @@ libreoffice (1:3.4.0-1) UNRELEASED; urgency=low
* debian/rules, debian/patches/packcomponents-remove-split-components.diff:
remove evoab, binfilter and kdeab deregistering into patch patching
the new packcomponents
+ * debian/shell-lib-components.sh: add new update_services_rdb() merging "default"
+ services.rdb and the .component files from registered-components
+ * debian/libreoffice-common.triggers.in, libreoffice-common.postinst.in:
+ new trigger running update_services_rdb
- -- Rene Engelhard <rene@debian.org> Wed, 15 Jun 2011 00:45:49 +0200
+ -- Rene Engelhard <rene@debian.org> Wed, 22 Jun 2011 22:21:55 +0000
libreoffice (1:3.3.3-1) unstable; urgency=medium
diff --git a/control b/control
index 8e9e3d3..502e249 100644
--- a/control
+++ b/control
@@ -3,7 +3,7 @@ Section: editors
Priority: optional
Maintainer: Debian LibreOffice Maintainers <debian-openoffice@lists.debian.org>
Uploaders: Rene Engelhard <rene@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, libpq-dev, po-debconf, bc, wget | curl, gcc-4.6 [hppa ia64 kfreebsd-i386 kfreebsd-amd64 mips mipsel], g++-4.6 [hppa ia64 kfreebsd-i386 kfreebsd-amd64 mips mipsel], dpkg-dev (>= 1.15.1), libgl1-mesa-dev [!armel !mips !mipsel], libglu1-mesa-dev [!armel !mips !mipsel], libpoppler-dev (>= 0.8.0), libgraphite2-dev (>= 0.9.3), libtextcat-dev (>= 2.2-8), libcurl4-gnutls-dev, libssl-dev, libdb-dev, python (>= 2.6.6-3+squeeze4), python-dev, debhe
lper (>= 7.2.3~), epm, libcppunit-dev (>= 1.12), tcsh, openjdk-6-jdk [alpha amd64 armel armhf i386 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), gcc-mingw32, mingw32-runtime, 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, xulrunner-dev, libnss3-dev (>= 3.12.3), dmake
(>= 1:4.11), mono-devel (>= 2.4.2.3) [amd64 i386 ia64 kfreebsd-amd64 kfreebsd-i386], libmono-dev (>= 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-dev (>= 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, kdelibs5-dev (>= 4:4.3.4), libqt4-dev (>= 4.5), libmysqlclient-dev, libmysqlcppconn-dev (>= 1.1.0~r791), libxrandr-dev, liblucene2-java (>= 2.3.2), 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, libpq-dev, po-debconf, bc, wget | curl, gcc-4.6 [hppa ia64 kfreebsd-i386 kfreebsd-amd64 mips mipsel], g++-4.6 [hppa ia64 kfreebsd-i386 kfreebsd-amd64 mips mipsel], dpkg-dev (>= 1.15.1), libgl1-mesa-dev [!armel !mips !mipsel], libglu1-mesa-dev [!armel !mips !mipsel], libpoppler-dev (>= 0.8.0), libgraphite2-dev (>= 0.9.3), libtextcat-dev (>= 2.2-8), libcurl4-gnutls-dev, libssl-dev, libdb-dev, python (>= 2.6.6-3+squeeze4), python-dev, debhe
lper (>= 7.2.3~), libcppunit-dev (>= 1.12), tcsh, openjdk-6-jdk [alpha amd64 armel armhf i386 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), gcc-mingw32, mingw32-runtime, 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, xulrunner-dev, libnss3-dev (>= 3.12.3), dmake (>= 1
:4.11), mono-devel (>= 2.4.2.3) [amd64 i386 ia64 kfreebsd-amd64 kfreebsd-i386], libmono-dev (>= 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-dev (>= 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, kdelibs5-dev (>= 4:4.3.4), libqt4-dev (>= 4.5), libmysqlclient-dev, libmysqlcppconn-dev (>= 1.1.0~r791), libebook1.2-dev [!armel], libxrandr-dev, liblucene2-java (>= 2.3.2), 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, l
ibneon27-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, fontforge
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, libmono-dev (= 1.2.6+dfsg-1), libmono-dev (= 1.2.6+dfsg-2), libmono-dev (= 1.2.6+dfsg-3), libmono-dev (= 1.2.6+dfsg-4), libmono-dev (= 2.4+dfsg-2) [sparc], 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 mips mipsel], ant (= 1.8.0-2) [hppa ia64 kfreebsd-i386 kfreebsd-amd64 mips mipsel], ant (= 1.8.0-3) [hppa ia64 kfreebsd-i386 kfreebsd-amd64 mips mipsel], base-files (= 6.0), base-files (= 6.0squeeze1), libhsqldb-java (>= 1.8.1~), libstlport4.6-dev
Standards-Version: 3.9.1
@@ -832,3 +832,33 @@ Description: MySQL Connector extension for LibreOffice
The MySQL Connector extension allows one to use the MySQL database from
LibreOffice without any wrapper layer such as ODBC or JDBC.
+Package: libreoffice-evolution
+Architecture: alpha amd64 armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386
+Section: gnome
+Depends: libreoffice-core (= ${binary:Version}), libreoffice-common (>= 1:3.4.0~), libreoffice-base, ${shlibs:Depends}, ${libebook-dep}, ${misc:Depends}
+Recommends: evolution
+Conflicts: ure (<< 1.5.1+OOo3.1.1-15)
+Description: office productivity suite -- Evolution addressbook 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 Evolution address books.
+ You need to install evolution separately.
+
+Package: libreoffice-filter-binfilter
+Section: misc
+Architecture: alpha amd64 hppa i386 ia64 powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386
+Depends: libreoffice-core (= ${binary:Version}), libreoffice-common (>= 1:3.4.0~), ${shlibs:Depends}, ${misc:Depends}
+Conflicts: ure (<< 1.5.1+OOo3.1.1-15)
+Description: office productivity suite -- legacy filters (e.g. StarOffice 5.2)
+ LibreOffice is a full-featured office productivity suite that provides
+ a near drop-in replacement for Microsoft(R) Office.
+ .
+ This package contains the "binfilters", legacy filters for
+ - the old StarOffice 5.2 formats
+ - StarWriter 1.0/2.0
+ - StarWriter/DOS
+ - *Writer* filters for
+ + Excel
+ + Lotus
+
diff --git a/control.binfilter.in b/control.binfilter.in
index 8945190..6151afe 100644
--- a/control.binfilter.in
+++ b/control.binfilter.in
@@ -2,6 +2,7 @@ Package: libreofficeVER-filter-binfilter
Section: misc
Architecture: %OOO_BINFILTER_ARCHS%
Depends: libreofficeVER-core (= ${binary:Version}),
+ libreofficeVER-common (>= 1:3.4.0~),
${shlibs:Depends},
${misc:Depends}
Conflicts: ure (<< 1.5.1+OOo3.1.1-15)
diff --git a/control.evolution.in b/control.evolution.in
index 5b50dee..36bfd29 100644
--- a/control.evolution.in
+++ b/control.evolution.in
@@ -2,6 +2,7 @@ Package: libreofficeVER-evolution
Architecture: %OOO_BASE_ARCHS%
Section: gnome
Depends: libreofficeVER-core (= ${binary:Version}),
+ libreofficeVER-common (>= 1:3.4.0~),
libreofficeVER-base,
${shlibs:Depends},
${libebook-dep},
diff --git a/control.kab.in b/control.kab.in
index 3fd6de7..6c47879 100644
--- a/control.kab.in
+++ b/control.kab.in
@@ -1,6 +1,7 @@
Package: libreofficeVER-kab
Architecture: %OOO_BASE_ARCHS%
Depends: libreofficeVER-core (= ${binary:Version}),
+ libreofficeVER-common (>= 1:3.4.0~),
${shlibs:Depends},
${misc:Depends}
Recommends: kaddressbook
diff --git a/libreoffice-common.postinst.in b/libreoffice-common.postinst.in
index 5e34758..56b9edc 100644
--- a/libreoffice-common.postinst.in
+++ b/libreoffice-common.postinst.in
@@ -8,9 +8,12 @@ if [ "$1" = "triggered" ]; then
for triggername in $2; do
case "$triggername" in
# new "bundled" extensions (since 3.3)
- "/usr/lib/libreoffice/share/extensions")
+ "/@OOBRANDDIR@/share/extensions")
sync_extensions
;;
+ "/@OOBASISDIR@/registered-components")
+ update_services_rdb
+ ;;
esac
done
fi
@@ -35,6 +38,9 @@ if [ "$1" = "configure" ]; then
if dpkg --compare-versions "$2" lt "1:3.3.0-3"; then
sync_extensions
fi
+ if dpkg --compare-versions "$2" lt "1:3.4.0-1"; then
+ update_services_rdb
+ fi
fi
#DEBHELPER#
diff --git a/libreoffice-common.triggers.in b/libreoffice-common.triggers.in
index 88a8d37..d3b7839 100644
--- a/libreoffice-common.triggers.in
+++ b/libreoffice-common.triggers.in
@@ -1 +1,2 @@
interest /@OOBRANDDIR@/share/extensions
+interest /@OOBASISDIR@/registered-components
diff --git a/libreoffice-core.lintian-overrides.in b/libreoffice-core.lintian-overrides.in
index 101f4ae..e204fc0 100644
--- a/libreoffice-core.lintian-overrides.in
+++ b/libreoffice-core.lintian-overrides.in
@@ -1,3 +1,2 @@
libreoffice-core: binary-or-shlib-defines-rpath
-libreoffice-core: file-missing-in-md5sums var/lib/libreoffice/basis@BASIS_VERSION@/program/services.rdb
libreoffice-core: postinst-uses-db-input
diff --git a/libreoffice-core.postinst.in b/libreoffice-core.postinst.in
deleted file mode 100644
index f741d02..0000000
--- a/libreoffice-core.postinst.in
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-
-set -e
-
-THIS_PACKAGE=libreoffice-core
-THIS_SCRIPT=postinst
-
-#INCLUDE_SHELL_LIB#
-
-# (re)register components on all postinst targets
-register_all_components_to_services_rdb
-
-#DEBHELPER#
-
-exit 0
diff --git a/libreoffice-core.preinst.in b/libreoffice-core.preinst.in
deleted file mode 100644
index 97e911a..0000000
--- a/libreoffice-core.preinst.in
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/sh
-
-set -e
-
-THIS_PACKAGE=libreoffice-core
-THIS_SCRIPT=preinst
-
-#INCLUDE_SHELL_LIB#
-
-case "$1" in
- upgrade)
- revoke_all_components_from_services_rdb
- ;;
-esac
-
-#DEBHELPER#
-
-exit 0
diff --git a/libreoffice-evolution.bug-script.in b/libreoffice-evolution.bug-script.in
deleted file mode 100755
index 914acfc..0000000
--- a/libreoffice-evolution.bug-script.in
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-/usr/lib/ure/bin/regview /var/lib/openoffice/basis@BASIS_VERSION@/program/services.rdb | grep evoab >&3
diff --git a/libreoffice-evolution.postinst.in b/libreoffice-evolution.postinst.in
deleted file mode 100755
index 1ec835d..0000000
--- a/libreoffice-evolution.postinst.in
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-
-set -e
-
-#INCLUDE_SHELL_LIB#
-
-if [ "$1" = "configure" -o "$1" = "upgrade" ]; then
- register_to_services_rdb /@OOBASISDIR@/program/libevoab$LIBSUFFIX.so
-fi
-
-#DEBHELPER#
-
-exit 0
diff --git a/libreoffice-evolution.preinst.in b/libreoffice-evolution.preinst.in
deleted file mode 100755
index 8fb12d7..0000000
--- a/libreoffice-evolution.preinst.in
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-
-set -e
-
-#INCLUDE_SHELL_LIB#
-
-case "$1" in
- upgrade)
- revoke_from_services_rdb /@OOBASISDIR@/program/libevoab$LIBSUFFIX.so
- ;;
-esac
-
-#DEBHELPER#
-
-exit 0
diff --git a/libreoffice-evolution.prerm.in b/libreoffice-evolution.prerm.in
deleted file mode 100755
index a9b3141..0000000
--- a/libreoffice-evolution.prerm.in
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-
-set -e
-
-#INCLUDE_SHELL_LIB#
-
-case "$1" in
- remove)
- revoke_from_services_rdb /@OOBASISDIR@/program/libevoab$LIBSUFFIX.so
- ;;
-esac
-
-#DEBHELPER#
-
-exit 0
diff --git a/libreoffice-filter-binfilter.bug-script.in b/libreoffice-filter-binfilter.bug-script.in
deleted file mode 100755
index c80f58e..0000000
--- a/libreoffice-filter-binfilter.bug-script.in
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-/usr/lib/ure/bin/regview /var/lib/openoffice/basis@BASIS_VERSION@/program/services.rdb | grep bf_ >&3
diff --git a/libreoffice-filter-binfilter.postinst.in b/libreoffice-filter-binfilter.postinst.in
deleted file mode 100755
index a875f14..0000000
--- a/libreoffice-filter-binfilter.postinst.in
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-
-set -e
-
-#INCLUDE_SHELL_LIB#
-
-if [ "$1" = "configure" -o "$1" = "upgrade" ]; then
- register_to_services_rdb /@OOBASISDIR@/program/libbf_migratefilter$LIBSUFFIX.so
- register_to_services_rdb /@OOBASISDIR@/program/libbindet$LIBSUFFIX.so
-fi
-
-#DEBHELPER#
-
-exit 0
diff --git a/libreoffice-filter-binfilter.preinst.in b/libreoffice-filter-binfilter.preinst.in
deleted file mode 100755
index 23f99a9..0000000
--- a/libreoffice-filter-binfilter.preinst.in
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh
-
-set -e
-
-#INCLUDE_SHELL_LIB#
-
-case "$1" in
- upgrade)
- revoke_from_services_rdb /@OOBASISDIR@/program/libbf_migratefilter$LIBSUFFIX.so
- revoke_from_services_rdb /@OOBASISDIR@/program/libbindet$LIBSUFFIX.so
- ;;
-esac
-
-#DEBHELPER#
-
-exit 0
diff --git a/libreoffice-filter-binfilter.prerm.in b/libreoffice-filter-binfilter.prerm.in
deleted file mode 100755
index f110877..0000000
--- a/libreoffice-filter-binfilter.prerm.in
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh
-
-set -e
-
-#INCLUDE_SHELL_LIB#
-
-case "$1" in
- remove)
- revoke_from_services_rdb /@OOBASISDIR@/program/libbf_migratefilter$LIBSUFFIX.so
- revoke_from_services_rdb /@OOBASISDIR@/program/libbindet$LIBSUFFIX.so
- ;;
-esac
-
-#DEBHELPER#
-
-exit 0
diff --git a/libreoffice-kab.bug-script.in b/libreoffice-kab.bug-script.in
deleted file mode 100755
index 2267e94..0000000
--- a/libreoffice-kab.bug-script.in
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-/usr/lib/ure/bin/regview /var/lib/openoffice/basis@BASIS_VERSION@/program/services.rdb | grep kab >&3
diff --git a/libreoffice-kab.preinst.in b/libreoffice-kab.preinst.in
deleted file mode 100755
index 8dff457..0000000
--- a/libreoffice-kab.preinst.in
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-
-set -e
-
-#INCLUDE_SHELL_LIB#
-
-case "$1" in
- upgrade)
- revoke_from_services_rdb /@OOBASISDIR@/program/libkab1.so
- ;;
-esac
-
-#DEBHELPER#
-
-exit 0
diff --git a/rules b/rules
index dcb51bf..6ee20ac 100755
--- a/rules
+++ b/rules
@@ -126,7 +126,7 @@ PACKAGE_TTF_OPENSYMBOL=y
ifeq (,$(filter $(ARCH), powerpc powerpcspe ppc64))
BUILD_JARS_NATIVE=y
endif
-BUILD_BINFILTERS=n
+BUILD_BINFILTERS=y
BUILD_ONLY_EN_US=y
ENABLE_JAVA=y
ifeq "$(ENABLE_JAVA)" "y"
@@ -247,7 +247,7 @@ ENABLE_MINIMIZER=y
ENABLE_PRESENTER_CONSOLE=y
ENABLE_PDFIMPORT=y
BUILD_GTK=y
-ENABLE_EVO2=n
+ENABLE_EVO2=y
ENABLE_GVFS=y
ENABLE_GCONF=y
# broken!
@@ -1847,9 +1847,6 @@ ifeq (sk,$(findstring sk,$(HELPISOS)))
$(PKGDIR)-help-sk/$(shell echo $(OOBASISDIR) | sed -e s/lib/share/)/help/sk
endif
- # add registered-components dir
- mkdir -p $(PKGDIR)-core/$(OOBASISDIR)/registered-components
-
ifeq "$(ENABLE_JAVA)" "y"
# move officebean.jar into -officebean (They will be moved out of -core
# in the install-arch target). Do the /usr/share move here already
@@ -1979,7 +1976,8 @@ $(STAMP_DIR)/maintscripts: $(wildcard debian/shell-lib*Env*.sh) $(wildcard debia
echo "" >> $$MAINTSCRIPT; \
if egrep -q "(add|remove|validate|sync)_extension" $$MAINTSCRIPT.in; then \
cat debian/shell-lib-extensions.sh >> $$MAINTSCRIPT; \
- elif grep -q services_rdb $$MAINTSCRIPT.in; then \
+ fi; \
+ if grep -q services_rdb $$MAINTSCRIPT.in; then \
cat debian/shell-lib-components.sh >> $$MAINTSCRIPT; \
fi; \
sed -n '/^#INCLUDE_SHELL_LIB#$$/,$$p' < $$MAINTSCRIPT.in | sed -e '/^#INCLUDE_SHELL_LIB#$$/d' >> $$MAINTSCRIPT; \
@@ -2196,6 +2194,9 @@ ifeq "$(ENABLE_KDEAB)" "y"
for f in libkab*so; do \
mv $(PKGDIR)-core/$(OODIR)/program/$$f $(PKGDIR)-kab/$(OODIR)/program || exit 1 ;\
done
+ mkdir -p $(PKGDIR)-kab/$(OODIR)/registered-components
+ install -m644 $(SOURCE_TREE)/solver/$(shell . $(SOURCE_TREE)/*Env*.sh; echo $$UPD/$$OUTPATH$$PROEXT)/xml/kab1.component \
+ $(PKGDIR)-kab/$(OODIR)/registered-components/kab1.component
endif
# move the GNOME stuff which are *not* in gid_Module_Optional_Gnome
@@ -2234,6 +2235,17 @@ endif
ifeq "$(ENABLE_EVO2)" "y"
mkdir -p -m755 $(PKGDIR)-evolution/$(OODIR)/program
mv $(PKGDIR)-core/$(OODIR)/program/libevoab*.so $(PKGDIR)-evolution/$(OODIR)/program
+ mkdir -p $(PKGDIR)-evolution/$(OODIR)/registered-components
+ install -m644 $(SOURCE_TREE)/solver/$(shell . $(SOURCE_TREE)/*Env*.sh; echo $$UPD/$$OUTPATH$$PROEXT)/xml/evoab.component \
+ $(PKGDIR)-evolution/$(OODIR)/registered-components/evoab.component
+endif
+
+ifeq "$(BUILD_BINFILTERS)" "y"
+ mkdir -p $(PKGDIR)-filter-binfilter/$(OODIR)/registered-components
+ for i in bf_migratefilter bindet; do \
+ install -m644 $(SOURCE_TREE)/solver/$(shell . $(SOURCE_TREE)/*Env*.sh; echo $$UPD/$$OUTPATH$$PROEXT)/xml/$$i.component \
+ $(PKGDIR)-filter-binfilter/$(OODIR)/registered-components/$$i.component; \
+ done
endif
ifeq "$(PACKAGE_NPSOPLUGIN)" "y"
@@ -2612,10 +2624,12 @@ ifeq "$(ENABLE_PDFIMPORT)" "y"
rm -f $(PKGDIR)-pdfimport/$(OOBRANDDIR)/share/extensions/pdfimport/registration/LICENSE
endif
- # move services.rdb to /var/lib/openoffice
- mkdir -p $(PKGDIR)-core/var/lib/$(OODIRNAME)/basis$(OOVER)/program
+ # move "default" services.rdb to a hidden file
mv $(PKGDIR)-core/usr/lib/$(OODIRNAME)/basis$(OOVER)/program/services.rdb \
- $(PKGDIR)-core/var/lib/$(OODIRNAME)/basis$(OOVER)/program/services.rdb
+ $(PKGDIR)-core/usr/lib/$(OODIRNAME)/basis$(OOVER)/program/.services.rdb
+ # create dir for services.rdb which is read. like when we merged
+ # additional/optional components
+ mkdir -p $(PKGDIR)-core/var/lib/$(OODIRNAME)/basis$(OOVER)/program
ln -s /var/lib/$(OODIRNAME)/basis$(OOVER)/program/services.rdb \
$(PKGDIR)-core/usr/lib/$(OODIRNAME)/basis$(OOVER)/program/services.rdb
@@ -3277,7 +3291,7 @@ endif
dh_gencontrol -pure -pure-dbg -puno-libs3 -puno-libs3-dbg -- \
-V"ure:Version=`echo $(BINARY_VERSION) | cut -d: -f2`" \
-v"`echo $(BINARY_VERSION) | cut -d: -f2`"
- dh_md5sums -s -X$(shell echo $(OOBASISDIR) | sed -e s/usr/var/)/program/services.rdb
+ dh_md5sums -s
dh_builddeb -s $(DEBHELPER_OPTIONS) $(BUILDDEB_OPTIONS)
touch $@
diff --git a/shell-lib-components.sh b/shell-lib-components.sh
index e8ce676..06f4816 100644
--- a/shell-lib-components.sh
+++ b/shell-lib-components.sh
@@ -40,3 +40,23 @@ register_to_services_rdb() {
rdb="`echo /@OOBASISDIR@/program | sed -e s/usr/var/`/services.rdb"
/usr/lib/ure/bin/regcomp -register -r $rdb -br $rdb -c file://$1
}
+
+update_services_rdb() {
+ echo "Updating services.rdb..."
+ rdb="`echo /@OOBASISDIR@/program | sed -e s/usr/var/`/services.rdb"
+ if [ -d /@OOBASISDIR@/registered-components ]; then
+ cat /@OOBASISDIR@/program/.services.rdb \
+ | sed -e "s#</components>##" \
+ > $rdb
+ for c in /@OOBASISDIR@/registered-components/*.component; do \
+ tail -n 1 $c \
+ | sed -e 's#<component xmlns="http://openoffice.org/2010/uno-components"#<component#'\
+ >> $rdb; \
+ done
+ perl -pi -e "s/\n//" $rdb
+ sed -i 's#$#</components>#' $rdb
+ else
+ cp /@OOBASISDIR@/program/.services.rdb $rdb
+ fi
+ echo "done."
+}
--
LibreOffice packaging repository
Reply to: