./packages/openofficeorg/2.4.1/experimental r1104: merge
------------------------------------------------------------
revno: 1104
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Thu 2008-05-15 00:27:11 +0200
message:
merge
modified:
changelog
control
control.in
------------------------------------------------------------
revno: 1097.1.5
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Thu 2008-05-15 00:25:12 +0200
message:
libsapdbc-java was removed, stop suggesting it
modified:
changelog
control
control.in
=== modified file 'changelog'
--- a/changelog 2008-05-13 19:48:51 +0000
+++ b/changelog 2008-05-14 22:27:11 +0000
@@ -2,15 +2,17 @@
* ooo-build:
- use ooo-build-2-4-1 branch
- - update (r12536)
+ - update (r12554)
+ * debian/control.in:
+ - libsapdbc-java was removed, stop suggesting it
- -- Rene Engelhard <rene@debian.org> Tue, 13 May 2008 21:46:46 +0200
+ -- Rene Engelhard <rene@debian.org> Thu, 15 May 2008 00:26:40 +0200
openoffice.org (1:2.4.1~ooh680m14-1) experimental; urgency=low
* OpenOffice.org 2.4.1 snapshot OHO680_m14
* ooo-build:
- - update (r12510)
+ - update (r12554)
* debian/rules:
- update for new xulrunner 1.9 packaging using iceape-dev.
Use MOZILLA=iceape (closes: #480813)
@@ -24,7 +26,7 @@
* debian/control.in, debian/rules:
- fix Vcs-Svn:, make it a generated field
- -- Rene Engelhard <rene@debian.org> Mon, 12 May 2008 11:38:39 +0200
+ -- Rene Engelhard <rene@debian.org> Thu, 15 May 2008 00:23:58 +0200
openoffice.org (1:2.4.0-6) unstable; urgency=low
=== modified file 'control'
--- a/control 2008-05-12 10:03:03 +0000
+++ b/control 2008-05-14 22:27:11 +0000
@@ -222,7 +222,7 @@
Package: openoffice.org-base
Architecture: i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64
Depends: openoffice.org-core (= ${Source-Version}), openoffice.org-base-core (= ${Source-Version}), ${shlibs:Depends}, ${java-runtime-depends}, ${base-hsqldb-depends}, ${java-common-depends}
-Suggests: unixodbc, libmyodbc | odbc-postgresql | libsqliteodbc | tdsodbc | mdbtools, libmysql-java | libpg-java | libsapdbc-java, openoffice.org-gcj, openoffice.org-report-builder
+Suggests: unixodbc, libmyodbc | odbc-postgresql | libsqliteodbc | tdsodbc | mdbtools, libmysql-java | libpg-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
@@ -243,11 +243,10 @@
- SQLite
- MS SQL / Sybase SQL
- *.mdb (JET / MS Access)
- * libmysql-java | libpg-java | libsapdbc-java: JDBC Drivers
+ * libmysql-java | libpg-java: JDBC Drivers
for:
- MySQL
- PostgreSQL
- - MaxDB
Package: openoffice.org-style-crystal
Architecture: all
=== modified file 'control.in'
--- a/control.in 2008-05-05 00:37:12 +0000
+++ b/control.in 2008-05-14 22:25:12 +0000
@@ -435,7 +435,7 @@
${java-common-depends}
Suggests: unixodbc,
libmyodbc | odbc-postgresql | libsqliteodbc | tdsodbc | mdbtools,
- libmysql-java | libpg-java | libsapdbc-java,
+ libmysql-java | libpg-java,
openoffice.orgVER-gcj,
openoffice.orgVER-report-builder
Replaces: openoffice.orgVER-core (<< 2.0.1),
@@ -465,11 +465,10 @@
- SQLite
- MS SQL / Sybase SQL
- *.mdb (JET / MS Access)
- * libmysql-java | libpg-java | libsapdbc-java: JDBC Drivers
+ * libmysql-java | libpg-java: JDBC Drivers
for:
- MySQL
- PostgreSQL
- - MaxDB
Package: openoffice.orgVER-style-crystal
Architecture: all
Reply to: