./packages/openofficeorg/3.2/experimental r1746: merge
------------------------------------------------------------
revno: 1746 [merge]
committer: Rene Engelhard <rene@debian.org>
branch nick: experimental
timestamp: Sat 2009-12-19 01:12:04 +0100
message:
merge
modified:
changelog
control
control.in
rules
=== modified file 'changelog'
--- a/changelog 2009-12-18 01:05:08 +0000
+++ b/changelog 2009-12-19 00:12:04 +0000
@@ -3,7 +3,7 @@
* OpenOffice.org 3.2.0 release candidate 1 (OOO320_m8)
* ooo-build
- - update (663472a5cf4c5c859ca4affb625ed688f4b01456)
+ - update (e1ff144afc1f9cb73b21ca7ccbd5f088f02faa15)
- makes "Always allow saving of document" configurable (closes: #478130)
- src: add OOO320 GSIs from ftp.linux.cz
@@ -18,17 +18,18 @@
* merge 1:3.1.1-9 to 1:3.1.1-11
- -- Rene Engelhard <rene@debian.org> Fri, 18 Dec 2009 02:02:06 +0100
+ -- Rene Engelhard <rene@debian.org> Sat, 19 Dec 2009 01:11:07 +0100
-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:
- bump ttf-opensymbol dep to (>= 1:3.0), we need it for some bullets
- (closes: #561182)
+ (closes: #561182)
+ - make -common depend on ure (hopefully closes: #544621)
* debian/rules:
- build-depend on g++-4.4 (>= 4.4.2-5) on armel because of various
wrong code generation fixes. Thanks Matthias Klose.
@@ -37,8 +38,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 01:01:48 +0000
+++ b/control 2009-12-19 00:12:04 +0000
@@ -115,7 +115,7 @@
Package: openoffice.org-common
Architecture: all
-Depends: openoffice.org-style-default | openoffice.org-style, ${misc:Depends}
+Depends: openoffice.org-style-default | openoffice.org-style, ${misc:Depends}, ure
Suggests: openoffice.org-style-industrial, openoffice.org-style-hicontrast, openoffice.org-style-tango, openoffice.org-style-crystal, openoffice.org-style-oxygen
Recommends: xfonts-mathml
Conflicts: openoffice.org-debian-files, openoffice.org-mimelnk, openoffice.org2-common, openclipart-openoffice.org (<= 0.17+dfsg-4), openoffice.org-l10n-en-us, openoffice.org-debian-menus, openoffice.org-base (<< ${base-version}), openoffice.org-writer (<< ${base-version}), openoffice.org-calc (<< ${base-version}), openoffice.org-impress (<< ${base-version}), openoffice.org-draw (<< ${base-version}), openoffice.org-math (<< ${base-version}), broffice.org (<< ${base-version}), openclipart-openoffice.org (<= 0.18+dfsg-7), dictionaries-common (<< 0.98.14), openoffice.org-core (<< 1:${basis-version}), openoffice.org-core (>= 1:${basis-version}.99)
@@ -224,7 +224,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-16 01:03:14 +0000
+++ b/control.in 2009-12-19 00:12:04 +0000
@@ -266,7 +266,8 @@
Package: openoffice.orgVER-common
Architecture: all
Depends: openoffice.orgVER-style-default | openoffice.orgVER-style,
- ${misc:Depends}
+ ${misc:Depends},
+ ure
Suggests: openoffice.orgVER-style-industrial,
openoffice.orgVER-style-hicontrast,
openoffice.orgVER-style-tango,
@@ -476,7 +477,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 01:05:08 +0000
+++ b/rules 2009-12-19 00:12:04 +0000
@@ -2361,6 +2361,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: