OpenOffice

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

  1. 3.2.0-lucid
  2. Merge into 3.2.0-lucid
Proposed by Michael Vogt
Status: Merged
Merge reported by: Michael Vogt
Merged at revision: not available
Proposed branch: lp:~mvo/openoffice/3.2.0-lucid
Merge into: lp:~openoffice-pkgs/openoffice/3.2.0-lucid
Diff against target: 156 lines (+77/-2)
8 files modified
changelog (+7/-0)
control.in (+2/-2)
openoffice.org-core.postinst.in (+15/-0)
openoffice.org-core.preinst.in (+18/-0)
openoffice.org-evolution.links (+1/-0)
openoffice.org-filter-binfilter.links (+1/-0)
rules (+3/-0)
shell-lib-components.sh (+30/-0)
To merge this branch: bzr merge lp:~mvo/openoffice/3.2.0-lucid
Reviewer Review Type Date Requested Status
Michael Vogt (community) Abstain
Review via email: mp+23875@code.launchpad.net

Description of the change

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.

To post a comment you must log in.
lp:~mvo/openoffice/3.2.0-lucid updated
1295. By Michael Vogt

shell-lib-components.sh: fix status check

1296. By Michael Vogt

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

Revision history for this message
Michael Vogt (mvo) wrote :

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

review: Abstain

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'changelog'
--- changelog 2010-04-14 22:39:12 +0000
+++ changelog 2010-04-22 07:39:23 +0000
@@ -1,3 +1,10 @@
1openoffice.org (1:3.2.0-7ubuntu2) UNRELEASED; urgency=low
2
3 * rework the way components are registered to avoid having to
4 use Pre-Dependencies on openoffice.org-core (LP: #566584)
5
6 -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 21 Apr 2010 09:11:37 +0200
7
1openoffice.org (1:3.2.0-7ubuntu1) lucid; urgency=low8openoffice.org (1:3.2.0-7ubuntu1) lucid; urgency=low
29
3 * Resynchronise with Debian (r1940). Remaining changes:10 * Resynchronise with Debian (r1940). Remaining changes:
411
=== 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 @@
669Package: openoffice.orgVER-evolution669Package: openoffice.orgVER-evolution
670Architecture: %OOO_ARCHS%670Architecture: %OOO_ARCHS%
671Section: gnome671Section: gnome
672Pre-Depends: openoffice.orgVER-common (>= 1:3.1.0-2), openoffice.orgVER-core (>= 1:3.1.0-2), debconf (>= 0.5) | debconf-2.0, procps672Pre-Depends: debconf (>= 0.5) | debconf-2.0, procps
673Depends: openoffice.orgVER-core (= ${binary:Version}),673Depends: openoffice.orgVER-core (= ${binary:Version}),
674 openoffice.orgVER-base,674 openoffice.orgVER-base,
675 ${shlibs:Depends},675 ${shlibs:Depends},
@@ -740,7 +740,7 @@
740Package: openoffice.orgVER-filter-binfilter740Package: openoffice.orgVER-filter-binfilter
741Section: misc741Section: misc
742Architecture: %OOO_BINFILTER_ARCHS%742Architecture: %OOO_BINFILTER_ARCHS%
743Pre-Depends: openoffice.orgVER-common (>= 1:3.1.0-2), openoffice.orgVER-core (>= 1:3.1.0-2), debconf (>= 0.5) | debconf-2.0, procps743Pre-Depends: debconf (>= 0.5) | debconf-2.0, procps
744Depends: openoffice.orgVER-core (= ${binary:Version}),744Depends: openoffice.orgVER-core (= ${binary:Version}),
745 ${shlibs:Depends},745 ${shlibs:Depends},
746 ${misc:Depends}746 ${misc:Depends}
747747
=== 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 @@
1#!/bin/sh
2
3set -e
4
5THIS_PACKAGE=openoffice.org-core
6THIS_SCRIPT=postinst
7
8#INCLUDE_SHELL_LIB#
9
10# (re)register components on all postinst targets
11register_all_components_to_services_rdb
12
13#DEBHELPER#
14
15exit 0
016
=== 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 @@
1#!/bin/sh
2
3set -e
4
5THIS_PACKAGE=openoffice.org-core
6THIS_SCRIPT=preinst
7
8#INCLUDE_SHELL_LIB#
9
10case "$1" in
11 upgrade)
12 revoke_all_components_from_services_rdb
13 ;;
14esac
15
16#DEBHELPER#
17
18exit 0
019
=== 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 @@
1usr/lib/openoffice/basis3.2/program/libevoablx.so usr/lib/openoffice/basis3.2/registered-components/libevoablx.so
0\ No newline at end of file2\ No newline at end of file
13
=== 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 @@
1usr/lib/openoffice/basis3.2/program/libbf_migratefilterlx.so usr/lib/openoffice/basis3.2/registered-components/libbf_migratefilterlx.so
0\ No newline at end of file2\ No newline at end of file
13
=== modified file 'rules'
--- rules 2010-04-16 17:08:02 +0000
+++ rules 2010-04-22 07:39:23 +0000
@@ -2329,6 +2329,9 @@
2329 fi; \2329 fi; \
2330 done2330 done
23312331
2332 # add registered-components dir
2333 mkdir -p $(PKGDIR)-core/$(OOBASISDIR)/registered-components
2334
2332ifeq "$(PKGSOURCE)" "openoffice.org$(VER)"2335ifeq "$(PKGSOURCE)" "openoffice.org$(VER)"
2333ifeq "$(ENABLE_JAVA)" "y"2336ifeq "$(ENABLE_JAVA)" "y"
2334 # move officebean.jar into -officebean (They will be moved out of -core2337 # move officebean.jar into -officebean (They will be moved out of -core
23352338
=== 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 @@
43 sleep 143 sleep 1
44}44}
4545
46revoke_all_components_from_services_rdb() {
47 for lib in /@OOBASISDIR@/registered-components/*.so; do
48 if [ -e "$lib" ]; then
49 revoke_from_services_rdb "$(readlink -f "$lib")"
50 fi
51 done
52}
53
54register_all_components_to_services_rdb() {
55 for lib in /@OOBASISDIR@/registered-components/*.so; do
56 if [ -e "$lib" ]; then
57 register_to_services_rdb "$(readlink -f "$lib")"
58 fi
59 done
60}
61
46revoke_from_services_rdb() {62revoke_from_services_rdb() {
63 if [ "$THIS_PACKAGE" != "openoffice.org-core" ]; then
64 status=$(dpkg-query -W -f='${status}' openoffice.org-core|cut -d ' ' -f3)
65 if [ "$status" != "installed" ]; then
66 echo "skipping revoke because of unconfigured openoffice.org-core"
67 return
68 fi
69 fi
47 handle_soffice_listeners stop70 handle_soffice_listeners stop
48 #check_for_running_ooo71 #check_for_running_ooo
49 rdb="`echo /@OOBASISDIR@/program | sed -e s/usr/var/`/services.rdb"72 rdb="`echo /@OOBASISDIR@/program | sed -e s/usr/var/`/services.rdb"
@@ -55,6 +78,13 @@
55}78}
5679
57register_to_services_rdb() {80register_to_services_rdb() {
81 if [ "$THIS_PACKAGE" != "openoffice.org-core" ]; then
82 status=$(dpkg-query -W -f='${status}' openoffice.org-core|cut -d ' ' -f3)
83 if [ "$status" != "installed" ]; then
84 echo "skipping register because of unconfigured openoffice.org-core"
85 return
86 fi
87 fi
58 handle_soffice_listeners stop88 handle_soffice_listeners stop
59 #check_for_running_ooo89 #check_for_running_ooo
60 rdb="`echo /@OOBASISDIR@/program | sed -e s/usr/var/`/services.rdb"90 rdb="`echo /@OOBASISDIR@/program | sed -e s/usr/var/`/services.rdb"

Subscribers

People subscribed via source and target branches

to all changes: