------------------------------------------------------------
revno: 1958
committer: Rene Engelhard <r...@debian.org>
branch nick: unstable
timestamp: Sun 2010-04-25 19:56:28 +0200
message:
merge from Ubuntu: change the way components like -evolution or
-filter-binfilter are registered so that we do not need to pre-depends on
openoffice.org-core anymore
added:
openoffice.org-evolution.links.in
openoffice.org-filter-binfilter.links.in
modified:
changelog
control
control.in
rules
shell-lib-components.sh
=== modified file 'changelog'
--- a/changelog 2010-04-25 17:50:21 +0000
+++ b/changelog 2010-04-25 17:56:28 +0000
@@ -10,8 +10,6 @@
* debian/rules:
- fix langpacks target to actually remove extra LICENSE* and README*
files again
- - run dpkg-checkbuilddeps in control: as we rely on build-deps being
- there in some rules (like the LDAP_LIB one)
- fix build with new dpkg 1.15.7
- fix es translation for SC_OPCODE_SUBSTITUTE, thanks Margarita Manterola
(closes: #578767)
@@ -20,6 +18,10 @@
* merge from Ubuntu:
- add ENABLE_SDBC_POSTGRESQL variable and disable the build of the
arch-dep extensions when we don't package them anyways
+ * merge from Ubuntu (thanks mvo):
+ - change the way components like -evolution or -filter-binfilter are
+ registered so that we do not need to pre-depends on
+ openoffice.org-core anymore
-- Rene Engelhard <r...@debian.org> Thu, 22 Apr 2010 20:26:06 +0200
=== modified file 'control'
--- a/control 2010-04-25 17:50:21 +0000
+++ b/control 2010-04-25 17:56:28 +0000
@@ -380,7 +380,7 @@
Package: openoffice.org-evolution
Architecture: i386 m68k mips mipsel powerpc s390 alpha amd64 armel hppa ia64
ppc64 s390x sparc
Section: gnome
-Pre-Depends: openoffice.org-common (>= 1:3.1.0-2), openoffice.org-core (>=
1:3.1.0-2), debconf (>= 0.5) | debconf-2.0, procps
+Pre-Depends: debconf (>= 0.5) | debconf-2.0, procps
Depends: openoffice.org-core (= ${binary:Version}), openoffice.org-base,
${shlibs:Depends}, ${libebook-dep}, ${misc:Depends}
Recommends: evolution
Conflicts: openoffice.org2-evolution (<< ${binary:Version}), ure (<<
1.5.1+OOo3.1.1-15)
@@ -440,7 +440,7 @@
Package: openoffice.org-filter-binfilter
Section: misc
Architecture: i386 powerpc s390 alpha amd64 hppa ia64 ppc64 s390x sparc
-Pre-Depends: openoffice.org-common (>= 1:3.1.0-2), openoffice.org-core (>=
1:3.1.0-2), debconf (>= 0.5) | debconf-2.0, procps
+Pre-Depends: debconf (>= 0.5) | debconf-2.0, procps
Depends: openoffice.org-core (= ${binary:Version}), ${shlibs:Depends},
${misc:Depends}
Replaces: openoffice.org2-core (<= 1.9.108-1), openoffice.org-math (<<
1.9.113-0pre1), openoffice.org-calc (<< 1.9.113-0pre1), openoffice.org-core (<<
1:3.1.1~rc1-2), openoffice.org2-filter-so52, openoffice.org-filter-so52
Provides: openoffice.org2-filter-so52, openoffice.org-filter-so52
=== modified file 'control.in'
--- a/control.in 2010-04-18 04:39:41 +0000
+++ b/control.in 2010-04-25 17:56:28 +0000
@@ -653,7 +653,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},
@@ -724,7 +724,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-evolution.links.in'
--- a/openoffice.org-evolution.links.in 1970-01-01 00:00:00 +0000
+++ b/openoffice.org-evolution.links.in 2010-04-25 17:56:28 +0000
@@ -0,0 +1,1 @@
+usr/lib/openoffice/basis3.2/program/libev...@libsuffix@.so
usr/lib/openoffice/basis3.2/registered-components/libev...@libsuffix@.so
\ No newline at end of file
=== added file 'openoffice.org-filter-binfilter.links.in'
--- a/openoffice.org-filter-binfilter.links.in 1970-01-01 00:00:00 +0000
+++ b/openoffice.org-filter-binfilter.links.in 2010-04-25 17:56:28 +0000
@@ -0,0 +1,1 @@
+usr/lib/openoffice/basis3.2/program/libbf_migratefil...@libsuffix@.so
usr/lib/openoffice/basis3.2/registered-components/libbf_migratefil...@libsuffix@.so
\ No newline at end of file
=== modified file 'rules'
--- a/rules 2010-04-25 17:50:21 +0000
+++ b/rules 2010-04-25 17:56:28 +0000
@@ -1587,8 +1587,6 @@
# Based on script by Martin Quinson <martin.quin...@tuxfamily.org>
control: debian/control
debian/control: $(wildcard debian/control*in)
$(OOO_BUILD_TREE)/bin/openoffice-xlate-lang debian/rules
- dpkg-checkbuilddeps
-
chmod 755 $(OOO_BUILD_TREE)/bin/openoffice-xlate-lang
sed -e "s#openoffice.orgVER#openoffice.org$(VER)#g" \
-e "s#broffice.orgVER#broffice.org$(VER)#g" \
@@ -2137,6 +2135,9 @@
fi; \
done
+ # add registered-components dir
+ mkdir -p $(PKGDIR)-core/$(OOBASISDIR)/registered-components
+
ifeq "$(ENABLE_JAVA)" "y"
# move officebean.jar into -officebean (They will be moved out of -core
# in the install-arch target). Do the /usr/share/java move here already
@@ -2246,6 +2247,14 @@
rm -f debian/*.{pre,post}{inst,rm}
+ # generate .link files from *.in
+ for PKG in $(PACKAGES); do \
+ LINKS=debian/$$PKG.links ; \
+ if [ -e $$LINKS.in ]; then \
+ sed -e "s/\...@libsuffix\@/$(LIBSUFFIX)/g" $$LINKS.in > $$LINKS ; \
+ fi; \
+ done
+
# generate maintainer scripts from *.in
for PKG in $(PACKAGES); do \
for FILE in postinst postrm preinst prerm; do \
=== modified file 'shell-lib-components.sh'
--- a/shell-lib-components.sh 2010-02-15 10:42:03 +0000
+++ b/shell-lib-components.sh 2010-04-25 17:56:28 +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"
