Merge lp:~mvo/openoffice/3.2.0-lucid into lp:~openoffice-pkgs/openoffice/3.2.0-lucid

[Michael Vogt]

Please review this merge. It removes the need to use pre-depends on openoffice.org-core for openoffice.org components like openoffice.org-evolution and openoffice.org-filter-binfilter.

[lp:~mvo/openoffice/3.2.0-lucid]

1295. By Michael Vogt on 2010-04-21

shell-lib-components.sh: fix status check

1296. By Michael Vogt on 2010-04-22

openoffice.org-core.postinst.in: re-register components on all postinst targets

[Michael Vogt (mvo)]

The branch is no longer up-to-date with the actual diff that was uploaded into the archive.

review: Abstain

=== modified file 'changelog'
--- changelog	2010-04-14 22:39:12 +0000
+++ changelog	2010-04-22 07:39:23 +0000
@@ -1,3 +1,10 @@
+openoffice.org (1:3.2.0-7ubuntu2) UNRELEASED; urgency=low
+
+  * rework the way components are registered to avoid having to
+    use Pre-Dependencies on openoffice.org-core (LP: #566584)
+
+ -- Michael Vogt <[e-mail]>  Wed, 21 Apr 2010 09:11:37 +0200
+
 openoffice.org (1:3.2.0-7ubuntu1) lucid; urgency=low
 
   * Resynchronise with Debian (r1940). Remaining changes:

=== modified file 'control.in'
--- control.in	2010-04-14 17:25:28 +0000
+++ control.in	2010-04-22 07:39:23 +0000
@@ -669,7 +669,7 @@
 Package: openoffice.orgVER-evolution
 Architecture: %OOO_ARCHS%
 Section: gnome
-Pre-Depends: openoffice.orgVER-common (>= 1:3.1.0-2), openoffice.orgVER-core (>= 1:3.1.0-2), debconf (>= 0.5) | debconf-2.0, procps
+Pre-Depends: debconf (>= 0.5) | debconf-2.0, procps
 Depends: openoffice.orgVER-core (= ${binary:Version}),
  openoffice.orgVER-base,
  ${shlibs:Depends},
@@ -740,7 +740,7 @@
 Package: openoffice.orgVER-filter-binfilter
 Section: misc
 Architecture: %OOO_BINFILTER_ARCHS%
-Pre-Depends: openoffice.orgVER-common (>= 1:3.1.0-2), openoffice.orgVER-core (>= 1:3.1.0-2), debconf (>= 0.5) | debconf-2.0, procps
+Pre-Depends: debconf (>= 0.5) | debconf-2.0, procps
 Depends: openoffice.orgVER-core (= ${binary:Version}),
  ${shlibs:Depends},
  ${misc:Depends}

=== added file 'openoffice.org-core.postinst.in'
--- openoffice.org-core.postinst.in	1970-01-01 00:00:00 +0000
+++ openoffice.org-core.postinst.in	2010-04-22 07:39:23 +0000
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+set -e
+
+THIS_PACKAGE=openoffice.org-core
+THIS_SCRIPT=postinst
+
+#INCLUDE_SHELL_LIB#
+
+# (re)register components on all postinst targets
+register_all_components_to_services_rdb
+
+#DEBHELPER#
+
+exit 0

=== added file 'openoffice.org-core.preinst.in'
--- openoffice.org-core.preinst.in	1970-01-01 00:00:00 +0000
+++ openoffice.org-core.preinst.in	2010-04-22 07:39:23 +0000
@@ -0,0 +1,18 @@
+#!/bin/sh
+
+set -e
+
+THIS_PACKAGE=openoffice.org-core
+THIS_SCRIPT=preinst
+
+#INCLUDE_SHELL_LIB#
+
+case "$1" in
+	upgrade)
+		revoke_all_components_from_services_rdb
+	;;
+esac
+
+#DEBHELPER#
+
+exit 0

=== added file 'openoffice.org-evolution.links'
--- openoffice.org-evolution.links	1970-01-01 00:00:00 +0000
+++ openoffice.org-evolution.links	2010-04-22 07:39:23 +0000
@@ -0,0 +1,1 @@
+usr/lib/openoffice/basis3.2/program/libevoablx.so usr/lib/openoffice/basis3.2/registered-components/libevoablx.so
\ No newline at end of file

=== added file 'openoffice.org-filter-binfilter.links'
--- openoffice.org-filter-binfilter.links	1970-01-01 00:00:00 +0000
+++ openoffice.org-filter-binfilter.links	2010-04-22 07:39:23 +0000
@@ -0,0 +1,1 @@
+usr/lib/openoffice/basis3.2/program/libbf_migratefilterlx.so usr/lib/openoffice/basis3.2/registered-components/libbf_migratefilterlx.so 
\ No newline at end of file

=== modified file 'rules'
--- rules	2010-04-16 17:08:02 +0000
+++ rules	2010-04-22 07:39:23 +0000
@@ -2329,6 +2329,9 @@
 		fi; \
 	done
 
+	# add registered-components dir
+	mkdir -p $(PKGDIR)-core/$(OOBASISDIR)/registered-components
+
 ifeq "$(PKGSOURCE)" "openoffice.org$(VER)"
 ifeq "$(ENABLE_JAVA)" "y"
 	# move officebean.jar into -officebean (They will be moved out of -core

=== modified file 'shell-lib-components.sh'
--- shell-lib-components.sh	2010-03-26 06:33:20 +0000
+++ shell-lib-components.sh	2010-04-22 07:39:23 +0000
@@ -43,7 +43,30 @@
 	sleep 1
 }
 
+revoke_all_components_from_services_rdb() {
+    for lib in /@OOBASISDIR@/registered-components/*.so; do
+	if [ -e "$lib" ]; then
+	    revoke_from_services_rdb "$(readlink -f "$lib")"
+	fi
+    done
+}
+
+register_all_components_to_services_rdb() {
+    for lib in /@OOBASISDIR@/registered-components/*.so; do
+	if [ -e "$lib" ]; then
+	    register_to_services_rdb "$(readlink -f "$lib")"
+	fi
+    done
+}
+
 revoke_from_services_rdb() {
+  if [ "$THIS_PACKAGE" != "openoffice.org-core" ]; then
+      status=$(dpkg-query -W -f='${status}' openoffice.org-core|cut -d ' ' -f3)
+      if [ "$status" != "installed" ]; then
+	  echo "skipping revoke because of unconfigured openoffice.org-core"
+	  return
+      fi
+  fi
   handle_soffice_listeners stop
   #check_for_running_ooo
   rdb="`echo /@OOBASISDIR@/program | sed -e s/usr/var/`/services.rdb"
@@ -55,6 +78,13 @@
 }
 
 register_to_services_rdb() {
+  if [ "$THIS_PACKAGE" != "openoffice.org-core" ]; then
+      status=$(dpkg-query -W -f='${status}' openoffice.org-core|cut -d ' ' -f3)
+      if [ "$status" != "installed" ]; then
+	  echo "skipping register because of unconfigured openoffice.org-core"
+	  return
+      fi
+  fi
   handle_soffice_listeners stop
   #check_for_running_ooo
   rdb="`echo /@OOBASISDIR@/program | sed -e s/usr/var/`/services.rdb"