------------------------------------------------------------
revno: 966
committer: Rene Engelhard <[EMAIL PROTECTED]>
branch nick: experimental
timestamp: Fri 2007-11-30 22:12:51 +0100
message:
more new dpkg-shlibdeps fixes: move *.so.* into -core
modified:
control
control.in
rules
=== modified file 'control'
--- a/control 2007-11-30 21:09:28 +0000
+++ b/control 2007-11-30 21:12:51 +0000
@@ -104,7 +104,7 @@
Depends: openoffice.org-common (>> ${base-version}), ttf-opensymbol,
${shlibs:Depends}, fontconfig, ${mozilla-nss-depends}
Conflicts: openoffice.org-thesaurus, openoffice.org-unbundled,
openoffice.org-l10n-1.9.108, openoffice.org-l10n-1.9.114,
openoffice.org-l10n-1.9.121, openoffice.org-1.9.125, oooqs-kde, ooqstart-gnome,
openoffice.org-help-de (<< 2.0), openoffice.org-help-en (<< 2.0),
openoffice.org-help-el (<< 2.0), openoffice.org-help-es (<< 2.0),
openoffice.org-help-fr (<< 2.0), openoffice.org-help-it (<< 2.0),
openoffice.org-help-ja (<< 2.0), openoffice.org-help-ko (<< 2.0),
openoffice.org-help-pt-br (<< 2.0), openoffice.org-help-sv (<< 2.0),
openoffice.org-help-tr (<< 2.0), openoffice.org-help-zh-cn (<< 2.0),
openoffice.org-help-zh-tw (<< 2.0), openoffice.org-help-2.0.0,
openoffice.org-help-2.0.1, openoffice.org-help-2.0.2,
openoffice.org-help-2.0.3, openoffice.org-bin, openoffice.org2-core,
openoffice.org-crashrep, openoffice.org2-hunspell, openoffice.org-hunspell,
openoffice.org-calc (<< ${Source-Version}), openoffice.org-writer (<<
${Source-Version}), openoffice.org-impress (<< ${Source-Version}),
openoffice.org-draw (<< ${Source-Version}), openoffice.org-base (<<
${Source-Version}), openoffice.org-gtk (<< ${Source-Version}),
openoffice.org-gnome (<< ${Source-Version}), openoffice.org-kde (<<
${Source-Version}), openoffice.org-evolution (<< ${Source-Version}),
openoffice.org-filter-so52 (<< ${Source-Version}), openoffice.org-officebean
(<< ${Source-Version}), openoffice.org-dev (<< ${Source-Version}), libcairo2 (=
1.4.8-1), libicu38 (= 3.8~d01-1)
Provides: openoffice.org-bundled, openoffice.org2-core, openoffice.org-java,
openoffice.org2-hunspell, openoffice.org-hunspell
-Replaces: openoffice.org-bin, openoffice.org (<< 1.9), openoffice.org-gtk (<<
2.0.3+2.0.4m179), openoffice.org2-core, openoffice.org-java,
openoffice.org2-hunspell, openoffice.org-hunspell, openoffice.org-common (<<
2.0.3+2.0.4m180), openoffice.org-calc (<< 2.2.1~oof680m15-2)
+Replaces: openoffice.org-bin, openoffice.org (<< 1.9), openoffice.org-gtk (<<
2.0.3+2.0.4m179), openoffice.org2-core, openoffice.org-java,
openoffice.org2-hunspell, openoffice.org-hunspell, openoffice.org-common (<<
2.3.1), openoffice.org-calc (<< 2.2.1~oof680m15-2)
Description: OpenOffice.org office suite architecture dependent files
OpenOffice.org is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
=== modified file 'control.in'
--- a/control.in 2007-11-20 12:40:15 +0000
+++ b/control.in 2007-11-30 21:12:51 +0000
@@ -240,7 +240,7 @@
openoffice.org-java,
openoffice.org2-hunspell,
openoffice.org-hunspell,
- openoffice.org-common (<< 2.0.3+2.0.4m180),
+ openoffice.org-common (<< 2.3.1),
openoffice.org-calc (<< 2.2.1~oof680m15-2)
Description: OpenOffice.org office suite architecture dependent files
OpenOffice.org is a full-featured office productivity suite that provides
=== modified file 'rules'
--- a/rules 2007-11-30 21:09:28 +0000
+++ b/rules 2007-11-30 21:12:51 +0000
@@ -1364,6 +1364,12 @@
fi
cd ooo-build ; PATH=$(BUILD_PATH)
LD_LIBRARY_PATH="/usr/lib/libfakeroot:$(BUILD_LD_LIBRARY_PATH)"
DESTDIR=$(CURDIR)/debian/tmp $(MAKE) install
+ # these have to go to -core, otherwise we get problems with the new
+ # dpkg-shibdeps...
+ for i in `find in
debian/tmp/pkg/openoffice.org-common/$(OODIR)/program/*.so.*`; do \
+ mv $$i `echo $$i | sed -e s/common/core/`; \
+ done
+
ifeq "$(HELPISOS)" ""
for i in common calc math draw writer impress base; do \
rm -rf debian/tmp/pkg/openoffice.org-$$i/$(OODIR)/help; \
