./packages/openofficeorg/2.3.1/unstable r994: make openoffice.org-writer conflict against -java-common (<< 1:2.3.1)
------------------------------------------------------------
revno: 994
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Fri 2008-01-25 10:12:20 +0100
message:
make openoffice.org-writer conflict against -java-common (<< 1:2.3.1)
modified:
changelog
control
control.in
=== modified file 'changelog'
--- a/changelog 2008-01-24 11:59:26 +0000
+++ b/changelog 2008-01-25 09:12:20 +0000
@@ -12,12 +12,14 @@
bogusly
* debian/control.in:
- another Replaces: (-core) missed the epoch, thanks Chris Cheney
+ - make openoffice.org-writer conflict against -java-common (<< 1:2.3.1)
+ (closes: #462477)
* merge from Ubuntu:
- debian/rules:
+ make -gcj depend on libhsqldb-java-gcj
+ some minor parallel build conditional improvements
- -- Rene Engelhard <rene@debian.org> Thu, 24 Jan 2008 12:59:09 +0100
+ -- Rene Engelhard <rene@debian.org> Fri, 25 Jan 2008 10:07:31 +0100
openoffice.org (1:2.3.1-3) unstable; urgency=low
=== modified file 'control'
--- a/control 2008-01-24 11:59:26 +0000
+++ b/control 2008-01-25 09:12:20 +0000
@@ -145,7 +145,7 @@
Depends: openoffice.org-core (= ${Source-Version}), openoffice.org-base-core (= ${Source-Version}), ${shlibs:Depends}, ${writer-pyuno-dep}
Recommends: ${ooo-binfilter-dep}, java-gcj-compat | sun-java5-jre | java2-runtime ${java-common-depends}
Replaces: openoffice.org (<< 1.9), openoffice.org-debian-files, openoffice.org2-writer (<< ${Source-Version}), openoffice.org-common (<< 1:2.3.1)
-Conflicts: openoffice.org-debian-files, openoffice.org2-writer (<< ${Source-Version}), openoffice.org-java-common (<= 2.2.0-4)
+Conflicts: openoffice.org-debian-files, openoffice.org2-writer (<< ${Source-Version}), openoffice.org-java-common (<< 1:2.3.1)
Provides: openoffice.org2-writer, writer2latex
Suggests: openoffice.org-gcj, openoffice.org-base
Description: OpenOffice.org office suite - word processor
=== modified file 'control.in'
--- a/control.in 2008-01-24 11:59:26 +0000
+++ b/control.in 2008-01-25 09:12:20 +0000
@@ -323,7 +323,7 @@
openoffice.org-common (<< 1:2.3.1)
Conflicts: openoffice.org-debian-files,
openoffice.org2-writer (<< ${Source-Version}),
- openoffice.org-java-common (<= 2.2.0-4)
+ openoffice.org-java-common (<< 1:2.3.1)
Provides: openoffice.org2-writer,
writer2latex
Suggests: openoffice.orgVER-gcj,
Reply to: