./packages/openofficeorg/3.1.1/unstable r1742: hmm, this Conflicts: shouldn't be here...
------------------------------------------------------------
revno: 1742
committer: Rene Engelhard <rene@debian.org>
branch nick: unstable
timestamp: Sat 2009-10-31 19:15:24 +0100
message:
hmm, this Conflicts: shouldn't be here...
modified:
changelog
control
control.help.in
=== modified file 'changelog'
--- a/changelog 2009-10-31 17:59:22 +0000
+++ b/changelog 2009-10-31 18:15:24 +0000
@@ -35,7 +35,7 @@
* debian/po:
- update ru.po, tr.po
- -- Rene Engelhard <rene@debian.org> Sat, 31 Oct 2009 18:57:35 +0100
+ -- Rene Engelhard <rene@debian.org> Sat, 31 Oct 2009 19:15:10 +0100
openoffice.org (1:3.1.1-5) unstable; urgency=low
=== modified file 'control'
--- a/control 2009-10-24 22:01:52 +0000
+++ b/control 2009-10-31 18:15:24 +0000
@@ -2713,7 +2713,7 @@
Section: doc
Recommends: openoffice.org-core (>> ${base-version}) | language-support-translations-en, ${lucene-depends}, ${java-common-depends}
Depends: openoffice.org-writer | language-support-translations-en, ${misc:Depends}
-Conflicts: openoffice.org-common (<< 1:3.2.0~beta-1), openoffice.org-core (<< ${base-version}), ${lucene-conflicts}
+Conflicts: openoffice.org-common (<= 2.0.0-1), openoffice.org-core (<< ${base-version}), ${lucene-conflicts}
Provides: openoffice.org-help-${help-l10n-virtual-version}
Description: full-featured office productivity suite -- English_american help
OpenOffice.org is a full-featured office productivity suite that provides
@@ -2727,7 +2727,7 @@
Section: doc
Recommends: openoffice.org-core (>> ${base-version}) | language-support-translations-ca, ${lucene-depends}, ${java-common-depends}
Depends: openoffice.org-writer | language-support-translations-ca, openoffice.org-l10n-ca, ${misc:Depends}
-Conflicts: openoffice.org-common (<< 1:3.2.0~beta-1), openoffice.org-core (<< ${base-version}), ${lucene-conflicts}
+Conflicts: openoffice.org-common (<= 2.0.0-1), openoffice.org-core (<< ${base-version}), ${lucene-conflicts}
Provides: openoffice.org-help-${help-l10n-virtual-version}
Description: full-featured office productivity suite -- Catalan help
OpenOffice.org is a full-featured office productivity suite that provides
@@ -2741,7 +2741,7 @@
Section: doc
Recommends: openoffice.org-core (>> ${base-version}) | language-support-translations-cs, ${lucene-depends}, ${java-common-depends}
Depends: openoffice.org-writer | language-support-translations-cs, openoffice.org-l10n-cs, ${misc:Depends}
-Conflicts: openoffice.org-common (<< 1:3.2.0~beta-1), openoffice.org-core (<< ${base-version}), ${lucene-conflicts}
+Conflicts: openoffice.org-common (<= 2.0.0-1), openoffice.org-core (<< ${base-version}), ${lucene-conflicts}
Provides: openoffice.org-help-${help-l10n-virtual-version}
Description: full-featured office productivity suite -- Czech help
OpenOffice.org is a full-featured office productivity suite that provides
@@ -2755,7 +2755,7 @@
Section: doc
Recommends: openoffice.org-core (>> ${base-version}) | language-support-translations-da, ${lucene-depends}, ${java-common-depends}
Depends: openoffice.org-writer | language-support-translations-da, openoffice.org-l10n-da, ${misc:Depends}
-Conflicts: openoffice.org-common (<< 1:3.2.0~beta-1), openoffice.org-core (<< ${base-version}), ${lucene-conflicts}
+Conflicts: openoffice.org-common (<= 2.0.0-1), openoffice.org-core (<< ${base-version}), ${lucene-conflicts}
Provides: openoffice.org-help-${help-l10n-virtual-version}
Description: full-featured office productivity suite -- Danish help
OpenOffice.org is a full-featured office productivity suite that provides
@@ -2769,7 +2769,7 @@
Section: doc
Recommends: openoffice.org-core (>> ${base-version}) | language-support-translations-de, ${lucene-depends}, ${java-common-depends}
Depends: openoffice.org-writer | language-support-translations-de, openoffice.org-l10n-de, ${misc:Depends}
-Conflicts: openoffice.org-common (<< 1:3.2.0~beta-1), openoffice.org-core (<< ${base-version}), ${lucene-conflicts}
+Conflicts: openoffice.org-common (<= 2.0.0-1), openoffice.org-core (<< ${base-version}), ${lucene-conflicts}
Provides: openoffice.org-help-${help-l10n-virtual-version}
Description: full-featured office productivity suite -- German help
OpenOffice.org is a full-featured office productivity suite that provides
@@ -2783,7 +2783,7 @@
Section: doc
Recommends: openoffice.org-core (>> ${base-version}) | language-support-translations-dz, ${lucene-depends}, ${java-common-depends}
Depends: openoffice.org-writer | language-support-translations-dz, openoffice.org-l10n-dz, ${misc:Depends}
-Conflicts: openoffice.org-common (<< 1:3.2.0~beta-1), openoffice.org-core (<< ${base-version}), ${lucene-conflicts}
+Conflicts: openoffice.org-common (<= 2.0.0-1), openoffice.org-core (<< ${base-version}), ${lucene-conflicts}
Provides: openoffice.org-help-${help-l10n-virtual-version}
Description: full-featured office productivity suite -- Dzongkha help
OpenOffice.org is a full-featured office productivity suite that provides
@@ -2797,7 +2797,7 @@
Section: doc
Recommends: openoffice.org-core (>> ${base-version}) | language-support-translations-el, ${lucene-depends}, ${java-common-depends}
Depends: openoffice.org-writer | language-support-translations-el, openoffice.org-l10n-el, ${misc:Depends}
-Conflicts: openoffice.org-common (<< 1:3.2.0~beta-1), openoffice.org-core (<< ${base-version}), ${lucene-conflicts}
+Conflicts: openoffice.org-common (<= 2.0.0-1), openoffice.org-core (<< ${base-version}), ${lucene-conflicts}
Provides: openoffice.org-help-${help-l10n-virtual-version}
Description: full-featured office productivity suite -- Greek help
OpenOffice.org is a full-featured office productivity suite that provides
@@ -2811,7 +2811,7 @@
Section: doc
Recommends: openoffice.org-core (>> ${base-version}) | language-support-translations-en, ${lucene-depends}, ${java-common-depends}
Depends: openoffice.org-writer | language-support-translations-en, openoffice.org-l10n-en-gb, ${misc:Depends}
-Conflicts: openoffice.org-common (<< 1:3.2.0~beta-1), openoffice.org-core (<< ${base-version}), ${lucene-conflicts}
+Conflicts: openoffice.org-common (<= 2.0.0-1), openoffice.org-core (<< ${base-version}), ${lucene-conflicts}
Provides: openoffice.org-help-${help-l10n-virtual-version}
Description: full-featured office productivity suite -- English_british help
OpenOffice.org is a full-featured office productivity suite that provides
@@ -2825,7 +2825,7 @@
Section: doc
Recommends: openoffice.org-core (>> ${base-version}) | language-support-translations-es, ${lucene-depends}, ${java-common-depends}
Depends: openoffice.org-writer | language-support-translations-es, openoffice.org-l10n-es, ${misc:Depends}
-Conflicts: openoffice.org-common (<< 1:3.2.0~beta-1), openoffice.org-core (<< ${base-version}), ${lucene-conflicts}
+Conflicts: openoffice.org-common (<= 2.0.0-1), openoffice.org-core (<< ${base-version}), ${lucene-conflicts}
Provides: openoffice.org-help-${help-l10n-virtual-version}
Description: full-featured office productivity suite -- Spanish help
OpenOffice.org is a full-featured office productivity suite that provides
@@ -2839,7 +2839,7 @@
Section: doc
Recommends: openoffice.org-core (>> ${base-version}) | language-support-translations-et, ${lucene-depends}, ${java-common-depends}
Depends: openoffice.org-writer | language-support-translations-et, openoffice.org-l10n-et, ${misc:Depends}
-Conflicts: openoffice.org-common (<< 1:3.2.0~beta-1), openoffice.org-core (<< ${base-version}), ${lucene-conflicts}
+Conflicts: openoffice.org-common (<= 2.0.0-1), openoffice.org-core (<< ${base-version}), ${lucene-conflicts}
Provides: openoffice.org-help-${help-l10n-virtual-version}
Description: full-featured office productivity suite -- Estonian help
OpenOffice.org is a full-featured office productivity suite that provides
@@ -2853,7 +2853,7 @@
Section: doc
Recommends: openoffice.org-core (>> ${base-version}) | language-support-translations-eu, ${lucene-depends}, ${java-common-depends}
Depends: openoffice.org-writer | language-support-translations-eu, openoffice.org-l10n-eu, ${misc:Depends}
-Conflicts: openoffice.org-common (<< 1:3.2.0~beta-1), openoffice.org-core (<< ${base-version}), ${lucene-conflicts}
+Conflicts: openoffice.org-common (<= 2.0.0-1), openoffice.org-core (<< ${base-version}), ${lucene-conflicts}
Provides: openoffice.org-help-${help-l10n-virtual-version}
Description: full-featured office productivity suite -- Basque help
OpenOffice.org is a full-featured office productivity suite that provides
@@ -2867,7 +2867,7 @@
Section: doc
Recommends: openoffice.org-core (>> ${base-version}) | language-support-translations-fi, ${lucene-depends}, ${java-common-depends}
Depends: openoffice.org-writer | language-support-translations-fi, openoffice.org-l10n-fi, ${misc:Depends}
-Conflicts: openoffice.org-common (<< 1:3.2.0~beta-1), openoffice.org-core (<< ${base-version}), ${lucene-conflicts}
+Conflicts: openoffice.org-common (<= 2.0.0-1), openoffice.org-core (<< ${base-version}), ${lucene-conflicts}
Provides: openoffice.org-help-${help-l10n-virtual-version}
Description: full-featured office productivity suite -- Finnish help
OpenOffice.org is a full-featured office productivity suite that provides
@@ -2881,7 +2881,7 @@
Section: doc
Recommends: openoffice.org-core (>> ${base-version}) | language-support-translations-fr, ${lucene-depends}, ${java-common-depends}
Depends: openoffice.org-writer | language-support-translations-fr, openoffice.org-l10n-fr, ${misc:Depends}
-Conflicts: openoffice.org-common (<< 1:3.2.0~beta-1), openoffice.org-core (<< ${base-version}), ${lucene-conflicts}
+Conflicts: openoffice.org-common (<= 2.0.0-1), openoffice.org-core (<< ${base-version}), ${lucene-conflicts}
Provides: openoffice.org-help-${help-l10n-virtual-version}
Description: full-featured office productivity suite -- French help
OpenOffice.org is a full-featured office productivity suite that provides
@@ -2895,7 +2895,7 @@
Section: doc
Recommends: openoffice.org-core (>> ${base-version}) | language-support-translations-gl, ${lucene-depends}, ${java-common-depends}
Depends: openoffice.org-writer | language-support-translations-gl, openoffice.org-l10n-gl, ${misc:Depends}
-Conflicts: openoffice.org-common (<< 1:3.2.0~beta-1), openoffice.org-core (<< ${base-version}), ${lucene-conflicts}
+Conflicts: openoffice.org-common (<= 2.0.0-1), openoffice.org-core (<< ${base-version}), ${lucene-conflicts}
Provides: openoffice.org-help-${help-l10n-virtual-version}
Description: full-featured office productivity suite -- Galician help
OpenOffice.org is a full-featured office productivity suite that provides
@@ -2909,7 +2909,7 @@
Section: doc
Recommends: openoffice.org-core (>> ${base-version}) | language-support-translations-hi, ${lucene-depends}, ${java-common-depends}
Depends: openoffice.org-writer | language-support-translations-hi, openoffice.org-l10n-hi-in, ${misc:Depends}
-Conflicts: openoffice.org-common (<< 1:3.2.0~beta-1), openoffice.org-core (<< ${base-version}), ${lucene-conflicts}
+Conflicts: openoffice.org-common (<= 2.0.0-1), openoffice.org-core (<< ${base-version}), ${lucene-conflicts}
Provides: openoffice.org-help-${help-l10n-virtual-version}
Description: full-featured office productivity suite -- Hindi help
OpenOffice.org is a full-featured office productivity suite that provides
@@ -2923,7 +2923,7 @@
Section: doc
Recommends: openoffice.org-core (>> ${base-version}) | language-support-translations-hu, ${lucene-depends}, ${java-common-depends}
Depends: openoffice.org-writer | language-support-translations-hu, openoffice.org-l10n-hu, ${misc:Depends}
-Conflicts: openoffice.org-common (<< 1:3.2.0~beta-1), openoffice.org-core (<< ${base-version}), ${lucene-conflicts}
+Conflicts: openoffice.org-common (<= 2.0.0-1), openoffice.org-core (<< ${base-version}), ${lucene-conflicts}
Provides: openoffice.org-help-${help-l10n-virtual-version}
Description: full-featured office productivity suite -- Hungarian help
OpenOffice.org is a full-featured office productivity suite that provides
@@ -2937,7 +2937,7 @@
Section: doc
Recommends: openoffice.org-core (>> ${base-version}) | language-support-translations-it, ${lucene-depends}, ${java-common-depends}
Depends: openoffice.org-writer | language-support-translations-it, openoffice.org-l10n-it, ${misc:Depends}
-Conflicts: openoffice.org-common (<< 1:3.2.0~beta-1), openoffice.org-core (<< ${base-version}), ${lucene-conflicts}
+Conflicts: openoffice.org-common (<= 2.0.0-1), openoffice.org-core (<< ${base-version}), ${lucene-conflicts}
Provides: openoffice.org-help-${help-l10n-virtual-version}
Description: full-featured office productivity suite -- Italian help
OpenOffice.org is a full-featured office productivity suite that provides
@@ -2951,7 +2951,7 @@
Section: doc
Recommends: openoffice.org-core (>> ${base-version}) | language-support-translations-ja, ${lucene-depends}, ${java-common-depends}
Depends: openoffice.org-writer | language-support-translations-ja, openoffice.org-l10n-ja, ${misc:Depends}
-Conflicts: openoffice.org-common (<< 1:3.2.0~beta-1), openoffice.org-core (<< ${base-version}), ${lucene-conflicts}
+Conflicts: openoffice.org-common (<= 2.0.0-1), openoffice.org-core (<< ${base-version}), ${lucene-conflicts}
Provides: openoffice.org-help-${help-l10n-virtual-version}
Description: full-featured office productivity suite -- Japanese help
OpenOffice.org is a full-featured office productivity suite that provides
@@ -2965,7 +2965,7 @@
Section: doc
Recommends: openoffice.org-core (>> ${base-version}) | language-support-translations-km, ${lucene-depends}, ${java-common-depends}
Depends: openoffice.org-writer | language-support-translations-km, openoffice.org-l10n-km, ${misc:Depends}
-Conflicts: openoffice.org-common (<< 1:3.2.0~beta-1), openoffice.org-core (<< ${base-version}), ${lucene-conflicts}
+Conflicts: openoffice.org-common (<= 2.0.0-1), openoffice.org-core (<< ${base-version}), ${lucene-conflicts}
Provides: openoffice.org-help-${help-l10n-virtual-version}
Description: full-featured office productivity suite -- Khmer help
OpenOffice.org is a full-featured office productivity suite that provides
@@ -2979,7 +2979,7 @@
Section: doc
Recommends: openoffice.org-core (>> ${base-version}) | language-support-translations-ko, ${lucene-depends}, ${java-common-depends}
Depends: openoffice.org-writer | language-support-translations-ko, openoffice.org-l10n-ko, ${misc:Depends}
-Conflicts: openoffice.org-common (<< 1:3.2.0~beta-1), openoffice.org-core (<< ${base-version}), ${lucene-conflicts}
+Conflicts: openoffice.org-common (<= 2.0.0-1), openoffice.org-core (<< ${base-version}), ${lucene-conflicts}
Provides: openoffice.org-help-${help-l10n-virtual-version}
Description: full-featured office productivity suite -- Korean help
OpenOffice.org is a full-featured office productivity suite that provides
@@ -2993,7 +2993,7 @@
Section: doc
Recommends: openoffice.org-core (>> ${base-version}) | language-support-translations-nl, ${lucene-depends}, ${java-common-depends}
Depends: openoffice.org-writer | language-support-translations-nl, openoffice.org-l10n-nl, ${misc:Depends}
-Conflicts: openoffice.org-common (<< 1:3.2.0~beta-1), openoffice.org-core (<< ${base-version}), ${lucene-conflicts}
+Conflicts: openoffice.org-common (<= 2.0.0-1), openoffice.org-core (<< ${base-version}), ${lucene-conflicts}
Provides: openoffice.org-help-${help-l10n-virtual-version}
Description: full-featured office productivity suite -- Dutch help
OpenOffice.org is a full-featured office productivity suite that provides
@@ -3007,7 +3007,7 @@
Section: doc
Recommends: openoffice.org-core (>> ${base-version}) | language-support-translations-pl, ${lucene-depends}, ${java-common-depends}
Depends: openoffice.org-writer | language-support-translations-pl, openoffice.org-l10n-pl, ${misc:Depends}
-Conflicts: openoffice.org-common (<< 1:3.2.0~beta-1), openoffice.org-core (<< ${base-version}), ${lucene-conflicts}
+Conflicts: openoffice.org-common (<= 2.0.0-1), openoffice.org-core (<< ${base-version}), ${lucene-conflicts}
Provides: openoffice.org-help-${help-l10n-virtual-version}
Description: full-featured office productivity suite -- Polish help
OpenOffice.org is a full-featured office productivity suite that provides
@@ -3021,7 +3021,7 @@
Section: doc
Recommends: openoffice.org-core (>> ${base-version}) | language-support-translations-pt, ${lucene-depends}, ${java-common-depends}
Depends: openoffice.org-writer | language-support-translations-pt, openoffice.org-l10n-pt, ${misc:Depends}
-Conflicts: openoffice.org-common (<< 1:3.2.0~beta-1), openoffice.org-core (<< ${base-version}), ${lucene-conflicts}
+Conflicts: openoffice.org-common (<= 2.0.0-1), openoffice.org-core (<< ${base-version}), ${lucene-conflicts}
Provides: openoffice.org-help-${help-l10n-virtual-version}
Description: full-featured office productivity suite -- Portuguese help
OpenOffice.org is a full-featured office productivity suite that provides
@@ -3035,7 +3035,7 @@
Section: doc
Recommends: openoffice.org-core (>> ${base-version}) | language-support-translations-pt, ${lucene-depends}, ${java-common-depends}
Depends: openoffice.org-writer | language-support-translations-pt, openoffice.org-l10n-pt-br, ${misc:Depends}
-Conflicts: openoffice.org-common (<< 1:3.2.0~beta-1), openoffice.org-core (<< ${base-version}), ${lucene-conflicts}
+Conflicts: openoffice.org-common (<= 2.0.0-1), openoffice.org-core (<< ${base-version}), ${lucene-conflicts}
Provides: openoffice.org-help-${help-l10n-virtual-version}
Description: full-featured office productivity suite -- Portuguese_brazilian help
OpenOffice.org is a full-featured office productivity suite that provides
@@ -3049,7 +3049,7 @@
Section: doc
Recommends: openoffice.org-core (>> ${base-version}) | language-support-translations-ru, ${lucene-depends}, ${java-common-depends}
Depends: openoffice.org-writer | language-support-translations-ru, openoffice.org-l10n-ru, ${misc:Depends}
-Conflicts: openoffice.org-common (<< 1:3.2.0~beta-1), openoffice.org-core (<< ${base-version}), ${lucene-conflicts}
+Conflicts: openoffice.org-common (<= 2.0.0-1), openoffice.org-core (<< ${base-version}), ${lucene-conflicts}
Provides: openoffice.org-help-${help-l10n-virtual-version}
Description: full-featured office productivity suite -- Russian help
OpenOffice.org is a full-featured office productivity suite that provides
@@ -3063,7 +3063,7 @@
Section: doc
Recommends: openoffice.org-core (>> ${base-version}) | language-support-translations-sl, ${lucene-depends}, ${java-common-depends}
Depends: openoffice.org-writer | language-support-translations-sl, openoffice.org-l10n-sl, ${misc:Depends}
-Conflicts: openoffice.org-common (<< 1:3.2.0~beta-1), openoffice.org-core (<< ${base-version}), ${lucene-conflicts}
+Conflicts: openoffice.org-common (<= 2.0.0-1), openoffice.org-core (<< ${base-version}), ${lucene-conflicts}
Provides: openoffice.org-help-${help-l10n-virtual-version}
Description: full-featured office productivity suite -- Slovenian help
OpenOffice.org is a full-featured office productivity suite that provides
@@ -3077,7 +3077,7 @@
Section: doc
Recommends: openoffice.org-core (>> ${base-version}) | language-support-translations-sv, ${lucene-depends}, ${java-common-depends}
Depends: openoffice.org-writer | language-support-translations-sv, openoffice.org-l10n-sv, ${misc:Depends}
-Conflicts: openoffice.org-common (<< 1:3.2.0~beta-1), openoffice.org-core (<< ${base-version}), ${lucene-conflicts}
+Conflicts: openoffice.org-common (<= 2.0.0-1), openoffice.org-core (<< ${base-version}), ${lucene-conflicts}
Provides: openoffice.org-help-${help-l10n-virtual-version}
Description: full-featured office productivity suite -- Swedish help
OpenOffice.org is a full-featured office productivity suite that provides
@@ -3091,7 +3091,7 @@
Section: doc
Recommends: openoffice.org-core (>> ${base-version}) | language-support-translations-zh, ${lucene-depends}, ${java-common-depends}
Depends: openoffice.org-writer | language-support-translations-zh, openoffice.org-l10n-zh-cn, ${misc:Depends}
-Conflicts: openoffice.org-common (<< 1:3.2.0~beta-1), openoffice.org-core (<< ${base-version}), ${lucene-conflicts}
+Conflicts: openoffice.org-common (<= 2.0.0-1), openoffice.org-core (<< ${base-version}), ${lucene-conflicts}
Provides: openoffice.org-help-${help-l10n-virtual-version}
Description: full-featured office productivity suite -- Chinese_simplified help
OpenOffice.org is a full-featured office productivity suite that provides
@@ -3105,7 +3105,7 @@
Section: doc
Recommends: openoffice.org-core (>> ${base-version}) | language-support-translations-zh, ${lucene-depends}, ${java-common-depends}
Depends: openoffice.org-writer | language-support-translations-zh, openoffice.org-l10n-zh-tw, ${misc:Depends}
-Conflicts: openoffice.org-common (<< 1:3.2.0~beta-1), openoffice.org-core (<< ${base-version}), ${lucene-conflicts}
+Conflicts: openoffice.org-common (<= 2.0.0-1), openoffice.org-core (<< ${base-version}), ${lucene-conflicts}
Provides: openoffice.org-help-${help-l10n-virtual-version}
Description: full-featured office productivity suite -- Chinese_traditional help
OpenOffice.org is a full-featured office productivity suite that provides
=== modified file 'control.help.in'
--- a/control.help.in 2009-10-24 20:03:17 +0000
+++ b/control.help.in 2009-10-31 18:15:24 +0000
@@ -4,7 +4,7 @@
Recommends: openoffice.orgVER-core (>> ${base-version}) | language-support-translations-@CCODE@, ${lucene-depends}, ${java-common-depends}
Depends: openoffice.orgVER-writer | language-support-translations-@CCODE@, openoffice.orgVER-l10n-@LCODE@,
${misc:Depends}
-Conflicts: openoffice.org-common (<< 1:3.2.0~beta-1),
+Conflicts: openoffice.org-common (<= 2.0.0-1),
openoffice.org-core (<< ${base-version}),
${lucene-conflicts}
Provides: openoffice.org-help-${help-l10n-virtual-version}
Reply to: