./packages/openofficeorg/3.1.1/unstable r1797: move libcalc??.so into -base
------------------------------------------------------------
revno: 1797
committer: Rene Engelhard <rene@debian.org>
branch nick: unstable
timestamp: Fri 2009-12-18 23:13:51 +0100
message:
move libcalc??.so into -base
modified:
changelog
control
control.in
rules
=== modified file 'changelog'
--- a/changelog 2009-12-18 15:24:14 +0000
+++ b/changelog 2009-12-18 22:13:51 +0000
@@ -1,7 +1,7 @@
-openoffice.org (1:3.1.1-11) UNRELEASED; urgency=low
+openoffice.org (1:3.1.1-11) unstable; urgency=low
* ooo-build:
- - update (9abd31dafcdca7bf73d84ae148fd2700bfb0726f)
+ - update (89b6191f14b42664b9c46395722ccecd562418c4)
- debian-opt.diff: build with -O2 instead of -Os. Fixes FTBFS on ppc
* debian/control.in:
@@ -16,8 +16,10 @@
- don't add LIBSUFFIX/PLATFORMID to the arch-indep packages' maintainer
scripts, as it will "only" be the system where the upload was built
on anyway, thanks Kurt Roeckx
+ - move libcalc??.so into -base as it actually is a db driver, not a
+ calc component. Makes Base start up without -calc installed now...
- -- Rene Engelhard <rene@debian.org> Fri, 18 Dec 2009 01:31:59 +0100
+ -- Rene Engelhard <rene@debian.org> Fri, 18 Dec 2009 23:07:39 +0100
openoffice.org (1:3.1.1-10) unstable; urgency=low
=== modified file 'control'
--- a/control 2009-12-18 15:24:14 +0000
+++ b/control 2009-12-18 22:13:51 +0000
@@ -221,7 +221,7 @@
Section: database
Depends: openoffice.org-core (= ${binary:Version}), openoffice.org-base-core (= ${binary:Version}), ${shlibs:Depends}, ${java-runtime-depends}, ${base-hsqldb-depends}, ${java-common-depends}, ${misc:Depends}
Suggests: unixodbc, libmyodbc | odbc-postgresql | libsqliteodbc | tdsodbc | mdbtools, libmysql-java | libpg-java | libjtds-java, openoffice.org-gcj, openoffice.org-report-builder
-Replaces: openoffice.org-core (<< 2.0.1), openoffice.org-common (<< 1.9.113-0pre1), openoffice.org-bin (<< 1.9), openoffice.org-debian-files, openoffice.org2-base (<< ${binary:Version}), openoffice.org-java, openoffice.org-java-common (= 1:2.3.1-2~bpo40+1), openoffice.org-java-common (= 1:2.4.0-4~bpo40+1), openoffice.org-java-common (= 1:2.4.1-3~bpo40+1), openoffice.org-java-common (= 2.2.0-6~bpo.1), openoffice.org-java-common (= 2.2.1-1~bpo.1), openoffice.org-java-common (= 2.2.1-9~bpo40+1)
+Replaces: openoffice.org-core (<< 2.0.1), openoffice.org-common (<< 1.9.113-0pre1), openoffice.org-bin (<< 1.9), openoffice.org-debian-files, openoffice.org2-base (<< ${binary:Version}), openoffice.org-java, openoffice.org-java-common (= 1:2.3.1-2~bpo40+1), openoffice.org-java-common (= 1:2.4.0-4~bpo40+1), openoffice.org-java-common (= 1:2.4.1-3~bpo40+1), openoffice.org-java-common (= 2.2.0-6~bpo.1), openoffice.org-java-common (= 2.2.1-1~bpo.1), openoffice.org-java-common (= 2.2.1-9~bpo40+1), openoffice.org-calc (<< 1:3.1.1-11)
Conflicts: openoffice.org-debian-files, openoffice.org2-base (<< ${binary:Version}), openoffice.org-common (= 2.0.4-4), libhsqldb-java (>= 1.8.1~)
Provides: openoffice.org2-base
Description: full-featured office productivity suite -- database
=== modified file 'control.in'
--- a/control.in 2009-12-18 15:24:14 +0000
+++ b/control.in 2009-12-18 22:13:51 +0000
@@ -473,7 +473,8 @@
openoffice.org-java-common (= 1:2.4.1-3~bpo40+1),
openoffice.org-java-common (= 2.2.0-6~bpo.1),
openoffice.org-java-common (= 2.2.1-1~bpo.1),
- openoffice.org-java-common (= 2.2.1-9~bpo40+1)
+ openoffice.org-java-common (= 2.2.1-9~bpo40+1),
+ openoffice.org-calc (<< 1:3.1.1-11)
Conflicts: openoffice.org-debian-files,
openoffice.org2-base (<< ${binary:Version}),
openoffice.org-common (= 2.0.4-4),
=== modified file 'rules'
--- a/rules 2009-12-18 00:58:53 +0000
+++ b/rules 2009-12-18 22:13:51 +0000
@@ -2302,6 +2302,8 @@
endif
mv $(PKGDIR)-core/$(OODIR)/program/libflat*so \
$(PKGDIR)-base/$(OODIR)/program; \
+ mv $(PKGDIR)-core/$(OODIR)/program/libcalc*so \
+ $(PKGDIR)-base/$(OODIR)/program; \
# move vba stuff into -calc, they are calc-only and linked to
# libsc*
Reply to: