./packages/openofficeorg/3.2/experimental r1682: merge
------------------------------------------------------------
revno: 1682 [merge]
committer: Rene Engelhard <rene@debian.org>
branch nick: experimental
timestamp: Sun 2009-10-25 00:02:42 +0200
message:
merge
modified:
changelog
control
control.in
=== modified file 'changelog'
--- a/changelog 2009-10-24 20:56:58 +0000
+++ b/changelog 2009-10-24 22:02:42 +0000
@@ -65,7 +65,7 @@
for -help-en-us as newer versions necessarily don't create indexes a old
version can read...
* debian/control.in:
- - conflict against libhsqldb-java (>= 1.9~)
+ - conflict against libhsqldb-java (>= 1.8.1~)
-- Rene Engelhard <rene@debian.org> Sat, 24 Oct 2009 22:29:13 +0200
=== modified file 'control'
--- a/control 2009-10-24 20:56:58 +0000
+++ b/control 2009-10-24 22:02:42 +0000
@@ -224,7 +224,7 @@
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)
-Conflicts: openoffice.org-debian-files, openoffice.org2-base (<< ${binary:Version}), openoffice.org-common (= 2.0.4-4), libhsqldb-java (>= 1.9~)
+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
OpenOffice.org is a full-featured office productivity suite that provides
=== modified file 'control.in'
--- a/control.in 2009-10-24 20:56:58 +0000
+++ b/control.in 2009-10-24 22:02:42 +0000
@@ -477,7 +477,7 @@
Conflicts: openoffice.org-debian-files,
openoffice.org2-base (<< ${binary:Version}),
openoffice.org-common (= 2.0.4-4),
- libhsqldb-java (>= 1.9~)
+ libhsqldb-java (>= 1.8.1~)
Provides: openoffice.org2-base
Description: full-featured office productivity suite -- database
OpenOffice.org is a full-featured office productivity suite that provides
Reply to: