------------------------------------------------------------ revno: 1718 committer: Rene Engelhard <r...@debian.org> branch nick: debian timestamp: Sat 2009-10-24 22:03:17 +0200 message: add conflict against (<< <minor version of lucene OOo was built with) modified: changelog control control.help.in rules
=== modified file 'changelog' --- a/changelog 2009-10-24 13:45:08 +0000 +++ b/changelog 2009-10-24 20:03:17 +0000 @@ -7,8 +7,12 @@ (closes: #548767) * debian/templates: apply changes from debian-l10n-english review * debian/po: debconf-updatepo; update de.po + * debian/rules: + - add conflict against (<< <minor version of lucene OOo was built with) + for -help-en-us as newer versions necessarily don't create indexes a old + version can read... - -- Rene Engelhard <r...@debian.org> Wed, 21 Oct 2009 20:25:54 +0200 + -- Rene Engelhard <r...@debian.org> Sat, 24 Oct 2009 22:00:46 +0200 openoffice.org (1:3.1.1-5) unstable; urgency=low
=== modified file 'control' --- a/control 2009-10-16 21:35:07 +0000 +++ b/control 2009-10-24 20:03:17 +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 (<= 2.0.0-1), openoffice.org-core (<< ${base-version}) +Conflicts: openoffice.org-common (<< 1:3.2.0~beta-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 (<= 2.0.0-1), openoffice.org-core (<< ${base-version}) +Conflicts: openoffice.org-common (<< 1:3.2.0~beta-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 (<= 2.0.0-1), openoffice.org-core (<< ${base-version}) +Conflicts: openoffice.org-common (<< 1:3.2.0~beta-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 (<= 2.0.0-1), openoffice.org-core (<< ${base-version}) +Conflicts: openoffice.org-common (<< 1:3.2.0~beta-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 (<= 2.0.0-1), openoffice.org-core (<< ${base-version}) +Conflicts: openoffice.org-common (<< 1:3.2.0~beta-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 (<= 2.0.0-1), openoffice.org-core (<< ${base-version}) +Conflicts: openoffice.org-common (<< 1:3.2.0~beta-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 (<= 2.0.0-1), openoffice.org-core (<< ${base-version}) +Conflicts: openoffice.org-common (<< 1:3.2.0~beta-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 (<= 2.0.0-1), openoffice.org-core (<< ${base-version}) +Conflicts: openoffice.org-common (<< 1:3.2.0~beta-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 (<= 2.0.0-1), openoffice.org-core (<< ${base-version}) +Conflicts: openoffice.org-common (<< 1:3.2.0~beta-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 (<= 2.0.0-1), openoffice.org-core (<< ${base-version}) +Conflicts: openoffice.org-common (<< 1:3.2.0~beta-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 (<= 2.0.0-1), openoffice.org-core (<< ${base-version}) +Conflicts: openoffice.org-common (<< 1:3.2.0~beta-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 (<= 2.0.0-1), openoffice.org-core (<< ${base-version}) +Conflicts: openoffice.org-common (<< 1:3.2.0~beta-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 (<= 2.0.0-1), openoffice.org-core (<< ${base-version}) +Conflicts: openoffice.org-common (<< 1:3.2.0~beta-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 (<= 2.0.0-1), openoffice.org-core (<< ${base-version}) +Conflicts: openoffice.org-common (<< 1:3.2.0~beta-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 (<= 2.0.0-1), openoffice.org-core (<< ${base-version}) +Conflicts: openoffice.org-common (<< 1:3.2.0~beta-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 (<= 2.0.0-1), openoffice.org-core (<< ${base-version}) +Conflicts: openoffice.org-common (<< 1:3.2.0~beta-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 (<= 2.0.0-1), openoffice.org-core (<< ${base-version}) +Conflicts: openoffice.org-common (<< 1:3.2.0~beta-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 (<= 2.0.0-1), openoffice.org-core (<< ${base-version}) +Conflicts: openoffice.org-common (<< 1:3.2.0~beta-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 (<= 2.0.0-1), openoffice.org-core (<< ${base-version}) +Conflicts: openoffice.org-common (<< 1:3.2.0~beta-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 (<= 2.0.0-1), openoffice.org-core (<< ${base-version}) +Conflicts: openoffice.org-common (<< 1:3.2.0~beta-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 (<= 2.0.0-1), openoffice.org-core (<< ${base-version}) +Conflicts: openoffice.org-common (<< 1:3.2.0~beta-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 (<= 2.0.0-1), openoffice.org-core (<< ${base-version}) +Conflicts: openoffice.org-common (<< 1:3.2.0~beta-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 (<= 2.0.0-1), openoffice.org-core (<< ${base-version}) +Conflicts: openoffice.org-common (<< 1:3.2.0~beta-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 (<= 2.0.0-1), openoffice.org-core (<< ${base-version}) +Conflicts: openoffice.org-common (<< 1:3.2.0~beta-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 (<= 2.0.0-1), openoffice.org-core (<< ${base-version}) +Conflicts: openoffice.org-common (<< 1:3.2.0~beta-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 (<= 2.0.0-1), openoffice.org-core (<< ${base-version}) +Conflicts: openoffice.org-common (<< 1:3.2.0~beta-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 (<= 2.0.0-1), openoffice.org-core (<< ${base-version}) +Conflicts: openoffice.org-common (<< 1:3.2.0~beta-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 (<= 2.0.0-1), openoffice.org-core (<< ${base-version}) +Conflicts: openoffice.org-common (<< 1:3.2.0~beta-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 (<= 2.0.0-1), openoffice.org-core (<< ${base-version}) +Conflicts: openoffice.org-common (<< 1:3.2.0~beta-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-04-27 13:34:49 +0000 +++ b/control.help.in 2009-10-24 20:03:17 +0000 @@ -4,8 +4,9 @@ Recommends: openoffice.orgVER-core (>> ${base-version}) | language-support-translatio...@ccode@, ${lucene-depends}, ${java-common-depends} Depends: openoffice.orgVER-writer | language-support-translatio...@ccode@, openoffice.orgver-l1...@lcode@, ${misc:Depends} -Conflicts: openoffice.org-common (<= 2.0.0-1), - openoffice.org-core (<< ${base-version}) +Conflicts: openoffice.org-common (<< 1:3.2.0~beta-1), + openoffice.org-core (<< ${base-version}), + ${lucene-conflicts} Provides: openoffice.org-help-${help-l10n-virtual-version} Description: full-featured office productivity suite -- @LNAME@ help OpenOffice.org is a full-featured office productivity suite that provides === modified file 'rules' --- a/rules 2009-10-17 12:11:01 +0000 +++ b/rules 2009-10-24 20:03:17 +0000 @@ -1007,6 +1007,8 @@ ifeq "$(USE_SYSTEM_LUCENE)" "y" BUILD_DEPS += , liblucene2-java (>= 2.3.2) [$(OOO_JAVA_ARCHS)] LUCENE_DEPENDS = liblucene2-java (>= 2.3.2) + # safety measure; e.g. lucene 2.9 index cannot be handled by lucene 2.4 + LUCENE_CONFLICTS = liblucene2-java (<< $(shell dpkg -l liblucene2-java | grep ^ii | awk '{ print $$3 }' | cut -d. -f1,2)~) CONFIGURE_FLAGS += --with-system-lucene --with-lucene-core-jar=/usr/share/java/lucene-core.jar --with-lucene-analyzers-jar=/usr/share/java/lucene-analyzers.jar endif ifeq "$(USE_SYSTEM_HSQLDB)" "y" @@ -3431,6 +3433,7 @@ -V'java-common-depends=$(JAVA_COMMON_DEPENDS)' \ -V'java-common-java-depends=$(JAVA_COMMON_JAVA_DEPENDS)' \ -V'lucene-depends=$(LUCENE_DEPENDS)' \ + -V'lucene-conflicts=$(LUCENE_CONFLICTS)' \ -V'Binary-Version=$(BINARY_VERSION)' \ -V'ooo-binfilter-dep=$(OOO_BINFILTER_DEP)' \ -V'dbg-dbg-suggests=$(DBG_DBG_SUGGESTS)' \