r838 ./packages/openofficeorg/2.3/experimental: make -base suggest -report-builder and -report-builder enchance Base; update ooo-build
------------------------------------------------------------
revno: 838
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Wed 2007-08-08 17:35:26 +0200
message:
make -base suggest -report-builder and -report-builder enchance Base; update ooo-build
modified:
changelog
control
control.in
=== modified file 'changelog'
--- a/changelog 2007-08-08 11:21:18 +0000
+++ b/changelog 2007-08-08 15:35:26 +0000
@@ -2,9 +2,11 @@
* new upstream snapshot (SRC680_m225)
* ooo-build:
- - update (r10022)
+ - update (r10029)
* debian/control.in:
- build-conflict against gjdoc (= 0.7.8-2) [RE]
+ - make -base suggest -report-builder and -report-builder enchance
+ Base [RE]
* debian/rules:
- clean up multi-threaded build support [CC, RE]
- remove share/xdgs .desktop files (except qstart.desktop), not
@@ -26,7 +28,7 @@
* debian/rules, debian/control.in, debian/openoffice.org-report*:
component got renamed to sun-report-builder. sigh. adapt [RE]
- -- Rene Engelhard <rene@debian.org> Wed, 8 Aug 2007 00:21:30 +0200
+ -- Rene Engelhard <rene@debian.org> Wed, 8 Aug 2007 17:32:39 +0200
openoffice.org (2.3.0~src680m224-1) experimental; urgency=high
=== modified file 'control'
--- a/control 2007-08-08 11:21:18 +0000
+++ b/control 2007-08-08 15:35:26 +0000
@@ -205,7 +205,7 @@
Package: openoffice.org-base
Architecture: i386 powerpc sparc amd64 ppc64
Depends: openoffice.org-core (= ${Source-Version}), ${shlibs:Depends}, gij | java-gcj-compat | j2re1.4 | java2-runtime, ${base-hsqldb-depends}, ${java-common-depends}
-Suggests: unixodbc, libmyodbc | odbc-postgresql | libsqliteodbc | tdsodbc | mdbtools, libmysql-java | libpg-java | libsapdbc-java, openoffice.org-gcj
+Suggests: unixodbc, libmyodbc | odbc-postgresql | libsqliteodbc | tdsodbc | mdbtools, libmysql-java | libpg-java | libsapdbc-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 (<< ${Source-Version}), openoffice.org-java
Conflicts: openoffice.org-debian-files, openoffice.org2-base (<< ${Source-Version}), openoffice.org-common (= 2.0.4-4)
Provides: openoffice.org2-base
@@ -476,6 +476,7 @@
Conflicts: openoffice.org-reportdesigner
Replaces: openoffice.org-reportdesigner
Provides: openoffice.org-reportdesigner
+Enhances: openoffice.org-base
Description: OpenOffice.org Report Builder extension
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-08-08 11:21:18 +0000
+++ b/control.in 2007-08-08 15:35:26 +0000
@@ -416,7 +416,8 @@
Suggests: unixodbc,
libmyodbc | odbc-postgresql | libsqliteodbc | tdsodbc | mdbtools,
libmysql-java | libpg-java | libsapdbc-java,
- openoffice.orgVER-gcj
+ openoffice.orgVER-gcj,
+ openoffice.orgVER-report-builder
Replaces: openoffice.orgVER-core (<< 2.0.1),
openoffice.orgVER-common (<< 1.9.113-0pre1),
openoffice.org-bin (<< 1.9),
@@ -719,6 +720,7 @@
Conflicts: openoffice.org-reportdesigner
Replaces: openoffice.org-reportdesigner
Provides: openoffice.org-reportdesigner
+Enhances: openoffice.orgVER-base
Description: OpenOffice.org Report Builder extension
OpenOffice.org is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
Reply to: