r969 ./packages/openofficeorg/2.3.1/experimental: + - put libdba680l?.so into a -base-core package. Make -base, -writer and
------------------------------------------------------------
revno: 969
committer: Rene Engelhard <rene@debian.org>
branch nick: experimental
timestamp: Sun 2007-12-02 23:00:12 +0100
message:
+ - put libdba680l?.so into a -base-core package. Make -base, -writer and
+ -calc depend on it (closes: #381083)
modified:
changelog
control.in
rules
=== modified file 'changelog'
--- a/changelog 2007-11-30 22:34:56 +0000
+++ b/changelog 2007-12-02 22:00:12 +0000
@@ -14,7 +14,7 @@
* debian/control.ogltrans.in, debian/rules,
debian/openoffice.org-ogltrans*:
- package the new "OpenGL rendered transitions" UNO package as
- openoffice.org-ogltrans when ENABLE_OPENGL=y. Add OOO_ARCHS to
+ openoffice.org-ogltrans when ENABLE_OPENGL=y.
* debian/rules:
- add $(OOO_ARCHS) to the mesa builddeps
- fix build with new dpkg-dev
@@ -24,6 +24,9 @@
* debian/rules, debian/aotcompile-256M-default.diff: work around
java-gcj-compat-devs defaults causing (at least) the i386 buildd
to OOMing while building the native jars
+ * debian/control.in, debian/rules:
+ - put libdba680l?.so into a -base-core package. Make -base, -writer and
+ -calc depend on it (closes: #381083)
-- Rene Engelhard <rene@debian.org> Mon, 26 Nov 2007 11:35:07 +0100
=== modified file 'control.in'
--- a/control.in 2007-11-30 21:12:51 +0000
+++ b/control.in 2007-12-02 22:00:12 +0000
@@ -312,6 +312,7 @@
Package: openoffice.orgVER-writer
Architecture: %OOO_ARCHS%
Depends: openoffice.orgVER-core (= ${Source-Version}),
+ openoffice.orgVER-base-core (= ${Source-Version}),
${shlibs:Depends},
${writer-pyuno-dep}
Recommends: ${ooo-binfilter-dep}, java-gcj-compat | sun-java5-jre | java2-runtime ${java-common-depends}
@@ -335,6 +336,7 @@
Package: openoffice.orgVER-calc
Architecture: %OOO_ARCHS%
Depends: openoffice.orgVER-core (= ${Source-Version}),
+ openoffice.orgVER-base-core (= ${Source-Version}),
${shlibs:Depends},
${lpsolve-dep}
Replaces: openoffice.org2-core (<< 1.9.113-0pre1),
@@ -406,9 +408,25 @@
.
This package contains the equation editor component for OpenOffice.org.
+Package: openoffice.orgVER-base-core
+Architecture: %OOO_ARCHS%
+Depends: ${shlibs:Depends}
+Replaces: openoffice.org-base (<< 2.3.1)
+Suggests: openoffice.orgVER-base
+Description: OpenOffice.org office suite -- libdba
+ OpenOffice.org is a full-featured office productivity suite that provides
+ a near drop-in replacement for Microsoft(R) Office.
+ .
+ This package contains libdba, a common library of the OpenOffice.org
+ suite used by Base, Writer and Calc.
+ .
+ If you need full Base functionality (or actual database drivers), please
+ install openoffice.orgVER-base.
+
Package: openoffice.orgVER-base
Architecture: %OOO_ARCHS%
Depends: openoffice.orgVER-core (= ${Source-Version}),
+ openoffice.orgVER-base-core (= ${Source-Version}),
${shlibs:Depends},
java-gcj-compat | sun-java5-jre | java2-runtime,
${base-hsqldb-depends},
=== modified file 'rules'
--- a/rules 2007-11-30 21:12:51 +0000
+++ b/rules 2007-12-02 22:00:12 +0000
@@ -1724,6 +1724,11 @@
mkdir -p -m755 $(PKGDIR)-base/$(OODIR)/program
mv $(PKGDIR)-core/$(OODIR)/program/libdba* \
$(PKGDIR)-base/$(OODIR)/program
+ # except for libdba680l?.so itself
+ rm -rf $(PKGDIR)-base-core
+ mkdir -p $(PKGDIR)-base-core/$(OODIR)/program
+ mv $(PKGDIR)-base/$(OODIR)/program/libdba680l?.so \
+ $(PKGDIR)-base-core/$(OODIR)/program
for i in odbcbase2 dbpool2 jdbc2 odbc2 sdbc2 mysql2 adabas2; do \
mv $(PKGDIR)-core/$(OODIR)/program/lib$$i* \
$(PKGDIR)-base/$(OODIR)/program; \
Reply to: