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
1=== modified file 'changelog'
2--- changelog 2010-04-14 22:39:12 +0000
3+++ changelog 2010-04-22 07:39:23 +0000
4@@ -1,3 +1,10 @@
5+openoffice.org (1:3.2.0-7ubuntu2) UNRELEASED; urgency=low
6+
7+ * rework the way components are registered to avoid having to
8+ use Pre-Dependencies on openoffice.org-core (LP: #566584)
9+
10+ -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 21 Apr 2010 09:11:37 +0200
11+
12 openoffice.org (1:3.2.0-7ubuntu1) lucid; urgency=low
13
14 * Resynchronise with Debian (r1940). Remaining changes:
15
16=== modified file 'control.in'
17--- control.in 2010-04-14 17:25:28 +0000
18+++ control.in 2010-04-22 07:39:23 +0000
19@@ -669,7 +669,7 @@
20 Package: openoffice.orgVER-evolution
21 Architecture: %OOO_ARCHS%
22 Section: gnome
23-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
24+Pre-Depends: debconf (>= 0.5) | debconf-2.0, procps
25 Depends: openoffice.orgVER-core (= ${binary:Version}),
26 openoffice.orgVER-base,
27 ${shlibs:Depends},
28@@ -740,7 +740,7 @@
29 Package: openoffice.orgVER-filter-binfilter
30 Section: misc
31 Architecture: %OOO_BINFILTER_ARCHS%
32-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
33+Pre-Depends: debconf (>= 0.5) | debconf-2.0, procps
34 Depends: openoffice.orgVER-core (= ${binary:Version}),
35 ${shlibs:Depends},
36 ${misc:Depends}
37
38=== added file 'openoffice.org-core.postinst.in'
39--- openoffice.org-core.postinst.in 1970-01-01 00:00:00 +0000
40+++ openoffice.org-core.postinst.in 2010-04-22 07:39:23 +0000
41@@ -0,0 +1,15 @@
42+#!/bin/sh
43+
44+set -e
45+
46+THIS_PACKAGE=openoffice.org-core
47+THIS_SCRIPT=postinst
48+
49+#INCLUDE_SHELL_LIB#
50+
51+# (re)register components on all postinst targets
52+register_all_components_to_services_rdb
53+
54+#DEBHELPER#
55+
56+exit 0
57
58=== added file 'openoffice.org-core.preinst.in'
59--- openoffice.org-core.preinst.in 1970-01-01 00:00:00 +0000
60+++ openoffice.org-core.preinst.in 2010-04-22 07:39:23 +0000
61@@ -0,0 +1,18 @@
62+#!/bin/sh
63+
64+set -e
65+
66+THIS_PACKAGE=openoffice.org-core
67+THIS_SCRIPT=preinst
68+
69+#INCLUDE_SHELL_LIB#
70+
71+case "$1" in
72+ upgrade)
73+ revoke_all_components_from_services_rdb
74+ ;;
75+esac
76+
77+#DEBHELPER#
78+
79+exit 0
80
81=== added file 'openoffice.org-evolution.links'
82--- openoffice.org-evolution.links 1970-01-01 00:00:00 +0000
83+++ openoffice.org-evolution.links 2010-04-22 07:39:23 +0000
84@@ -0,0 +1,1 @@
85+usr/lib/openoffice/basis3.2/program/libevoablx.so usr/lib/openoffice/basis3.2/registered-components/libevoablx.so
86\ No newline at end of file
87
88=== added file 'openoffice.org-filter-binfilter.links'
89--- openoffice.org-filter-binfilter.links 1970-01-01 00:00:00 +0000
90+++ openoffice.org-filter-binfilter.links 2010-04-22 07:39:23 +0000
91@@ -0,0 +1,1 @@
92+usr/lib/openoffice/basis3.2/program/libbf_migratefilterlx.so usr/lib/openoffice/basis3.2/registered-components/libbf_migratefilterlx.so
93\ No newline at end of file
94
95=== modified file 'rules'
96--- rules 2010-04-16 17:08:02 +0000
97+++ rules 2010-04-22 07:39:23 +0000
98@@ -2329,6 +2329,9 @@
99 fi; \
100 done
101
102+ # add registered-components dir
103+ mkdir -p $(PKGDIR)-core/$(OOBASISDIR)/registered-components
104+
105 ifeq "$(PKGSOURCE)" "openoffice.org$(VER)"
106 ifeq "$(ENABLE_JAVA)" "y"
107 # move officebean.jar into -officebean (They will be moved out of -core
108
109=== modified file 'shell-lib-components.sh'
110--- shell-lib-components.sh 2010-03-26 06:33:20 +0000
111+++ shell-lib-components.sh 2010-04-22 07:39:23 +0000
112@@ -43,7 +43,30 @@
113 sleep 1
114 }
115
116+revoke_all_components_from_services_rdb() {
117+ for lib in /@OOBASISDIR@/registered-components/*.so; do
118+ if [ -e "$lib" ]; then
119+ revoke_from_services_rdb "$(readlink -f "$lib")"
120+ fi
121+ done
122+}
123+
124+register_all_components_to_services_rdb() {
125+ for lib in /@OOBASISDIR@/registered-components/*.so; do
126+ if [ -e "$lib" ]; then
127+ register_to_services_rdb "$(readlink -f "$lib")"
128+ fi
129+ done
130+}
131+
132 revoke_from_services_rdb() {
133+ if [ "$THIS_PACKAGE" != "openoffice.org-core" ]; then
134+ status=$(dpkg-query -W -f='${status}' openoffice.org-core|cut -d ' ' -f3)
135+ if [ "$status" != "installed" ]; then
136+ echo "skipping revoke because of unconfigured openoffice.org-core"
137+ return
138+ fi
139+ fi
140 handle_soffice_listeners stop
141 #check_for_running_ooo
142 rdb="`echo /@OOBASISDIR@/program | sed -e s/usr/var/`/services.rdb"
143@@ -55,6 +78,13 @@
144 }
145
146 register_to_services_rdb() {
147+ if [ "$THIS_PACKAGE" != "openoffice.org-core" ]; then
148+ status=$(dpkg-query -W -f='${status}' openoffice.org-core|cut -d ' ' -f3)
149+ if [ "$status" != "installed" ]; then
150+ echo "skipping register because of unconfigured openoffice.org-core"
151+ return
152+ fi
153+ fi
154 handle_soffice_listeners stop
155 #check_for_running_ooo
156 rdb="`echo /@OOBASISDIR@/program | sed -e s/usr/var/`/services.rdb"

Subscribers

People subscribed via source and target branches

to all changes: