The following commit has been merged in the master branch:
commit 8dbb4ae06bbcba9ebbbc27953defb9b005312ff0
Author: Rene Engelhard <r...@debian.org>
Date: Thu Apr 5 14:13:27 2012 +0200
use --bundled instead of --shared
diff --git a/changelog b/changelog
index edb30c0..02e482f 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,11 @@
+libreoffice (1:3.5.2-2) UNRELEASED; urgency=low
+
+ * debian/shell-lib-extensions.sh, debian/*bug-script.in:
+ use --bundled instead of --shared; that's what we do and without bundled
+ we don't get the info with unopkg list
+
+ -- Rene Engelhard <r...@debian.org> Thu, 05 Apr 2012 14:12:44 +0200
+
libreoffice (1:3.5.2-1) unstable; urgency=low
* LibreOffice 3.5.2 final (same as rc2)
diff --git a/libreoffice-core.bug-script.in b/libreoffice-core.bug-script.in
index b68e535..36f9940 100755
--- a/libreoffice-core.bug-script.in
+++ b/libreoffice-core.bug-script.in
@@ -1,5 +1,6 @@
#!/bin/sh
-# list all installed extensions. --shared and non-shared
+# list all installed extensions. --bundled, --shared and non-shared
+/usr/lib/libreoffice/program/unopkg list --bundled >&3
/usr/lib/libreoffice/program/unopkg list --shared >&3
/usr/lib/libreoffice/program/unopkg list >&3
diff --git a/libreoffice-mysql-connector.bug-script.in
b/libreoffice-mysql-connector.bug-script.in
index 8317012..fb22371 100755
--- a/libreoffice-mysql-connector.bug-script.in
+++ b/libreoffice-mysql-connector.bug-script.in
@@ -1,2 +1,2 @@
#!/bin/sh
-/usr/lib/libreoffice/program/unopkg list --shared
com.sun.star.mysql-connector-ooo-$PLATFORMID >&3
+/usr/lib/libreoffice/program/unopkg list --bundled
com.sun.star.mysql-connector-ooo-$PLATFORMID >&3
diff --git a/libreoffice-pdfimport.bug-script.in
b/libreoffice-pdfimport.bug-script.in
index 668eb27..a0ff2ef 100755
--- a/libreoffice-pdfimport.bug-script.in
+++ b/libreoffice-pdfimport.bug-script.in
@@ -1,2 +1,2 @@
#!/bin/sh
-/usr/lib/libreoffice/program/unopkg list --shared
com.sun.star.PDFImport-@PLATFORMID@ >&3
+/usr/lib/libreoffice/program/unopkg list --bundled
com.sun.star.PDFImport-@PLATFORMID@ >&3
diff --git a/libreoffice-presentation-minimizer.bug-script.in
b/libreoffice-presentation-minimizer.bug-script.in
index 04f96fa..86dcddb 100755
--- a/libreoffice-presentation-minimizer.bug-script.in
+++ b/libreoffice-presentation-minimizer.bug-script.in
@@ -1,2 +1,2 @@
#!/bin/sh
-/usr/lib/libreoffice/program/unopkg list --shared
com.sun.star.PresentationMinimizer-@PLATFORMID@ >&3
+/usr/lib/libreoffice/program/unopkg list --bundled
com.sun.star.PresentationMinimizer-@PLATFORMID@ >&3
diff --git a/libreoffice-presenter-console.bug-script.in
b/libreoffice-presenter-console.bug-script.in
index 8f39bef..2b560f9 100755
--- a/libreoffice-presenter-console.bug-script.in
+++ b/libreoffice-presenter-console.bug-script.in
@@ -1,2 +1,2 @@
#!/bin/sh
-/usr/lib/libreoffice/program/unopkg list --shared
com.sun.PresenterScreen-@PLATFORMID@ >&3
+/usr/lib/libreoffice/program/unopkg list --bundled
com.sun.PresenterScreen-@PLATFORMID@ >&3
diff --git a/libreoffice-report-builder.bug-script.in
b/libreoffice-report-builder.bug-script.in
index bf6136f..54ad587 100755
--- a/libreoffice-report-builder.bug-script.in
+++ b/libreoffice-report-builder.bug-script.in
@@ -1,2 +1,2 @@
#!/bin/sh
-/usr/lib/libreoffice/program/unopkg list --shared com.sun.reportdesigner >&3
+/usr/lib/libreoffice/program/unopkg list --bundled com.sun.reportdesigner >&3
diff --git a/libreoffice-wiki-publisher.bug-script.in
b/libreoffice-wiki-publisher.bug-script.in
index cffff94..9497e5c 100755
--- a/libreoffice-wiki-publisher.bug-script.in
+++ b/libreoffice-wiki-publisher.bug-script.in
@@ -1,2 +1,2 @@
#!/bin/sh
-/usr/lib/libreoffice/program/unopkg list --shared com.sun.wiki-publisher >&3
+/usr/lib/libreoffice/program/unopkg list --bundled com.sun.wiki-publisher >&3
diff --git a/shell-lib-extensions.sh b/shell-lib-extensions.sh
index 72277ec..074ac5c 100644
--- a/shell-lib-extensions.sh
+++ b/shell-lib-extensions.sh
@@ -1,5 +1,5 @@
validate_extensions() {
- /usr/lib/libreoffice/program/unopkg validate -v --shared
+ /usr/lib/libreoffice/program/unopkg validate -v --bundled
}
sync_extensions() {
@@ -11,7 +11,7 @@ sync_extensions() {
d=/usr/lib/libreoffice
fi
if [ -e /usr/lib/libreoffice/share/prereg/bundled ] && readlink
/usr/lib/libreoffice/share/prereg/bundled 2>&1 >/dev/null; then
- /usr/lib/libreoffice/program/unopkg sync -v --shared \
+ /usr/lib/libreoffice/program/unopkg sync -v --bundled \
"-env:BUNDLED_EXTENSIONS_USER=file:///usr/lib/libreoffice/share/prereg/bundled"
\
"-env:UserInstallation=file://$INSTDIR" \
"-env:UNO_JAVA_JFW_INSTALL_DATA=file://$d/share/config/javasettingsunopkginstall.xml"
\
--
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/e1sfrtv-0006i0...@vasks.debian.org
