./packages/openofficeorg/3.0.1/experimental r1414: make -core conflict against < OOo3 -java-common
------------------------------------------------------------
revno: 1414
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Wed 2009-02-25 20:58:54 +0100
message:
make -core conflict against < OOo3 -java-common
modified:
changelog
control
control.in
=== modified file 'changelog'
--- a/changelog 2009-02-24 23:04:47 +0000
+++ b/changelog 2009-02-25 19:58:54 +0000
@@ -2,8 +2,10 @@
* debian/rules
- MONO2=y
+ * debian/control.in:
+ - make -core conflict against < OOo3 -java-common (closes: #517001)
- -- Rene Engelhard <rene@debian.org> Tue, 24 Feb 2009 11:51:06 +0100
+ -- Rene Engelhard <rene@debian.org> Wed, 25 Feb 2009 20:55:46 +0100
openoffice.org (1:3.0.1-3) unstable; urgency=low
=== modified file 'control'
--- a/control 2009-02-24 23:04:47 +0000
+++ b/control 2009-02-25 19:58:54 +0000
@@ -16,7 +16,7 @@
Depends: openoffice.org-core (= ${Source-Version}), openoffice.org-writer, openoffice.org-calc, openoffice.org-impress, openoffice.org-draw, openoffice.org-math, openoffice.org-base, openoffice.org-report-builder-bin, ttf-dejavu, ${ooo-officebean-dep}, ${writer-w2l-dep}, openoffice.org-filter-mobiledev, ${lucene-depends}, ${java-common-depends}
Recommends: ${ooo-binfilter-dep}, ttf-liberation | msttcorefonts
Suggests: hunspell-dictionary, myspell-dictionary, openoffice.org-help-${help-l10n-virtual-version}, openoffice.org-l10n-${help-l10n-virtual-version}, menu, unixodbc, cups-bsd, libsane, openoffice.org-hyphenation, openoffice.org2-thesaurus, libxrender1, libgl1, openoffice.org-gnome | openoffice.org-kde, iceweasel | firefox | icedove | thunderbird | iceape-browser | mozilla-browser, ${java-runtime-depends}, openclipart-openoffice.org, pstoedit, graphicsmagick-imagemagick-compat | imagemagick, libpaper-utils, ${gstreamer-plugins-suggests}
-Conflicts: openoffice.org2 (<< ${Source-Version})
+Conflicts: openoffice.org2 (<< ${Source-Version}), openoffice.org-java-common (<< 1:3.0.0)
Replaces: openoffice.org2 (<< ${Source-Version}), openoffice.org-debian-files
Provides: openoffice.org2
Description: OpenOffice.org Office suite
=== modified file 'control.in'
--- a/control.in 2009-02-21 13:59:11 +0000
+++ b/control.in 2009-02-25 19:58:54 +0000
@@ -94,7 +94,7 @@
graphicsmagick-imagemagick-compat | imagemagick,
libpaper-utils,
${gstreamer-plugins-suggests}
-Conflicts: openoffice.org2 (<< ${Source-Version})
+Conflicts: openoffice.org2 (<< ${Source-Version}), openoffice.orgVER-java-common (<< 1:3.0.0)
Replaces: openoffice.org2 (<< ${Source-Version}), openoffice.org-debian-files
Provides: openoffice.org2
Description: OpenOffice.org Office suite
Reply to: