------------------------------------------------------------
revno: 2108
committer: Rene Engelhard <r...@debian.org>
branch nick: debian
timestamp: Tue 2010-09-21 00:46:57 +0200
message:
  add sync_extensions() functions and use it in the trigger; it's what upstream 
does
modified:
  openoffice.org-common.postinst.in
  rules
  shell-lib-extensions.sh
=== modified file 'openoffice.org-common.postinst.in'
--- a/openoffice.org-common.postinst.in 2010-09-14 18:51:46 +0000
+++ b/openoffice.org-common.postinst.in 2010-09-20 22:46:57 +0000
@@ -9,7 +9,7 @@
                case "$triggername" in
                        # new "bundled" extensions (since 3.3)
                        "/usr/lib/openoffice/share/extensions")
-                         validate_extensions
+                         sync_extensions
                        ;;
                esac
        done

=== modified file 'rules'
--- a/rules     2010-09-16 21:55:59 +0000
+++ b/rules     2010-09-20 22:46:57 +0000
@@ -2359,7 +2359,7 @@
              echo "" >> $$MAINTSCRIPT; \
              if grep -q conffile $$MAINTSCRIPT.in; then \
                 cat debian/shell-lib-conffiles.sh >> $$MAINTSCRIPT; \
-             elif egrep -q "(add|remove|validate)_extension" $$MAINTSCRIPT.in; 
then \
+             elif 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 \
                 cat debian/shell-lib-components.sh >> $$MAINTSCRIPT; \

=== modified file 'shell-lib-extensions.sh'
--- a/shell-lib-extensions.sh   2010-09-14 18:51:46 +0000
+++ b/shell-lib-extensions.sh   2010-09-20 22:46:57 +0000
@@ -23,3 +23,14 @@
 validate_extensions() {
        /usr/lib/openoffice/program/unopkg validate -v --shared
 }
+
+sync_extensions() {
+  if [ -e /usr/lib/openoffice/share/prereg/bundled ] && readlink 
/usr/lib/openoffice/share/prereg/bundled 2>&1 >/dev/null; then
+    /usr/lib/openoffice/program/unopkg sync -v --shared \
+      
"-env:BUNDLED_EXTENSIONS_USER=file:///usr/lib/openoffice/share/prereg/bundled" \
+      "-env:UserInstallation=file://$INSTDIR" \
+      
"-env:UNO_JAVA_JFW_INSTALL_DATA=file://$d/share/config/javasettingsunopkginstall.xml"
 \
+      "-env:JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY=1"
+  fi
+}
+

Reply via email to