------------------------------------------------------------
revno: 1711
committer: Rene Engelhard <[email protected]>
branch nick: debian
timestamp: Fri 2009-11-27 18:01:54 +0100
message:
add conflicts/replaces/provides for xx-IN -> xx move
modified:
changelog
control
rules
=== modified file 'changelog'
--- a/changelog 2009-11-26 20:11:30 +0000
+++ b/changelog 2009-11-27 17:01:54 +0000
@@ -3,7 +3,7 @@
* OpenOffice.org 3.2.0 release branch milestone 6
* ooo-build
- - update (23789644f337067b2c560d9bf35ca0ac56a11a65)
+ - update (b59aee154bde79f03ca8078c60345db444c2d1e9)
- cws-linuxhppa1.diff: backport hppa port (closes: #484116)
* debian/rules:
@@ -18,7 +18,7 @@
(except hi-IN and pa-IN)
* debian/scripts/vars.hppa: add
- -- Rene Engelhard <[email protected]> Mon, 23 Nov 2009 21:27:01 +0100
+ -- Rene Engelhard <[email protected]> Fri, 27 Nov 2009 10:00:38 +0100
openoffice.org (1:3.2.0~beta-2) experimental; urgency=low
=== modified file 'control'
--- a/control 2009-11-26 20:11:30 +0000
+++ b/control 2009-11-27 17:01:54 +0000
@@ -557,12 +557,12 @@
Package: openoffice.org-l10n-as
Section: localization
Architecture: all
-Depends: locales | belocs-locales-data | locales-all, ${misc:Depends}
+Depends: locales (>= 2.3.6.ds1-1) | locales-all (>= 2.3.6.ds1-1),
${misc:Depends}
Recommends: openoffice.org-core (>> ${base-version}) |
language-support-translations-as
-Provides: openoffice.org-l10n-${help-l10n-virtual-version},
openoffice.org2-l10n-as
+Provides: openoffice.org-l10n-${help-l10n-virtual-version},
openoffice.org2-l10n-as, openoffice.org-l10n-as-IN
Suggests: hunspell-dictionary-as | myspell-dictionary-as,
openoffice.org-hyphenation-as, openoffice.org2-thesaurus-as,
openoffice.org-help-as
-Conflicts: openoffice.org-core (<< ${base-version}), openoffice.org-core (>=
${base-version}.1), openoffice.org2-l10n-as
-Replaces: openoffice.org2-l10n-as
+Conflicts: openoffice.org-core (<< ${base-version}), openoffice.org-core (>=
${base-version}.1), openoffice.org2-l10n-as, openoffice.org-l10n-as-IN
+Replaces: openoffice.org2-l10n-as, openoffice.org-l10n-as-IN
Description: full-featured office productivity suite -- Assamese language
package
OpenOffice.org is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
@@ -1286,11 +1286,11 @@
Section: localization
Architecture: all
Depends: locales | belocs-locales-data | locales-all, ${misc:Depends}
-Recommends: openoffice.org-core (>> ${base-version}) |
language-support-translations-gu
-Provides: openoffice.org-l10n-${help-l10n-virtual-version},
openoffice.org2-l10n-gu
+Recommends: openoffice.org-core (>> ${base-version}) |
language-support-translations-gu , ttf-gujarati-fonts
+Provides: openoffice.org-l10n-${help-l10n-virtual-version},
openoffice.org2-l10n-gu, openoffice.org-l10n-gu-IN
Suggests: hunspell-dictionary-gu | myspell-dictionary-gu,
openoffice.org-hyphenation-gu, openoffice.org2-thesaurus-gu,
openoffice.org-help-gu
-Conflicts: openoffice.org-core (<< ${base-version}), openoffice.org-core (>=
${base-version}.1), openoffice.org2-l10n-gu
-Replaces: openoffice.org2-l10n-gu
+Conflicts: openoffice.org-core (<< ${base-version}), openoffice.org-core (>=
${base-version}.1), openoffice.org2-l10n-gu, openoffice.org-l10n-gu-IN
+Replaces: openoffice.org2-l10n-gu, openoffice.org-l10n-gu-IN
Description: full-featured office productivity suite -- Gujarati language
package
OpenOffice.org is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
@@ -1762,11 +1762,11 @@
Section: localization
Architecture: all
Depends: locales | belocs-locales-data | locales-all, ${misc:Depends}
-Recommends: openoffice.org-core (>> ${base-version}) |
language-support-translations-ml
-Provides: openoffice.org-l10n-${help-l10n-virtual-version},
openoffice.org2-l10n-ml
+Recommends: openoffice.org-core (>> ${base-version}) |
language-support-translations-ml , ttf-malayalam-fonts
+Provides: openoffice.org-l10n-${help-l10n-virtual-version},
openoffice.org2-l10n-ml, openoffice.org-l10n-ml-IN
Suggests: hunspell-dictionary-ml | myspell-dictionary-ml,
openoffice.org-hyphenation-ml, openoffice.org2-thesaurus-ml,
openoffice.org-help-ml
-Conflicts: openoffice.org-core (<< ${base-version}), openoffice.org-core (>=
${base-version}.1), openoffice.org2-l10n-ml
-Replaces: openoffice.org2-l10n-ml
+Conflicts: openoffice.org-core (<< ${base-version}), openoffice.org-core (>=
${base-version}.1), openoffice.org2-l10n-ml, openoffice.org-l10n-ml-IN
+Replaces: openoffice.org2-l10n-ml, openoffice.org-l10n-ml-IN
Description: full-featured office productivity suite -- Malayalam language
package
OpenOffice.org is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
@@ -1790,11 +1790,11 @@
Section: localization
Architecture: all
Depends: locales | belocs-locales-data | locales-all, ${misc:Depends}
-Recommends: openoffice.org-core (>> ${base-version}) |
language-support-translations-mr
-Provides: openoffice.org-l10n-${help-l10n-virtual-version},
openoffice.org2-l10n-mr
+Recommends: openoffice.org-core (>> ${base-version}) |
language-support-translations-mr , ttf-devanagari-fonts
+Provides: openoffice.org-l10n-${help-l10n-virtual-version},
openoffice.org2-l10n-mr, openoffice.org-l10n-mr-IN
Suggests: hunspell-dictionary-mr | myspell-dictionary-mr,
openoffice.org-hyphenation-mr, openoffice.org2-thesaurus-mr,
openoffice.org-help-mr
-Conflicts: openoffice.org-core (<< ${base-version}), openoffice.org-core (>=
${base-version}.1), openoffice.org2-l10n-mr
-Replaces: openoffice.org2-l10n-mr
+Conflicts: openoffice.org-core (<< ${base-version}), openoffice.org-core (>=
${base-version}.1), openoffice.org2-l10n-mr, openoffice.org-l10n-mr-IN
+Replaces: openoffice.org2-l10n-mr, openoffice.org-l10n-mr-IN
Description: full-featured office productivity suite -- Marathi language
package
OpenOffice.org is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
@@ -2013,12 +2013,12 @@
Package: openoffice.org-l10n-or
Section: localization
Architecture: all
-Depends: locales | belocs-locales-data | locales-all, ${misc:Depends}
-Recommends: openoffice.org-core (>> ${base-version}) |
language-support-translations-or
-Provides: openoffice.org-l10n-${help-l10n-virtual-version},
openoffice.org2-l10n-or
+Depends: locales (>= 2.3.6.ds1-1) | locales-all (>= 2.3.6.ds1-1),
${misc:Depends}
+Recommends: openoffice.org-core (>> ${base-version}) |
language-support-translations-or , ttf-oriya-fonts
+Provides: openoffice.org-l10n-${help-l10n-virtual-version},
openoffice.org2-l10n-or, openoffice.org-l10n-or-IN
Suggests: hunspell-dictionary-or | myspell-dictionary-or,
openoffice.org-hyphenation-or, openoffice.org2-thesaurus-or,
openoffice.org-help-or
-Conflicts: openoffice.org-core (<< ${base-version}), openoffice.org-core (>=
${base-version}.1), openoffice.org2-l10n-or
-Replaces: openoffice.org2-l10n-or
+Conflicts: openoffice.org-core (<< ${base-version}), openoffice.org-core (>=
${base-version}.1), openoffice.org2-l10n-or, openoffice.org-l10n-or-IN
+Replaces: openoffice.org2-l10n-or, openoffice.org-l10n-or-IN
Description: full-featured office productivity suite -- Oriya language package
OpenOffice.org is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
@@ -2434,11 +2434,11 @@
Section: localization
Architecture: all
Depends: locales | belocs-locales-data | locales-all, ${misc:Depends}
-Recommends: openoffice.org-core (>> ${base-version}) |
language-support-translations-ta
-Provides: openoffice.org-l10n-${help-l10n-virtual-version},
openoffice.org2-l10n-ta
+Recommends: openoffice.org-core (>> ${base-version}) |
language-support-translations-ta , ttf-tamil-fonts
+Provides: openoffice.org-l10n-${help-l10n-virtual-version},
openoffice.org2-l10n-ta, openoffice.org-l10n-ta-IN
Suggests: hunspell-dictionary-ta | myspell-dictionary-ta,
openoffice.org-hyphenation-ta, openoffice.org2-thesaurus-ta,
openoffice.org-help-ta
-Conflicts: openoffice.org-core (<< ${base-version}), openoffice.org-core (>=
${base-version}.1), openoffice.org2-l10n-ta
-Replaces: openoffice.org2-l10n-ta
+Conflicts: openoffice.org-core (<< ${base-version}), openoffice.org-core (>=
${base-version}.1), openoffice.org2-l10n-ta, openoffice.org-l10n-ta-IN
+Replaces: openoffice.org2-l10n-ta, openoffice.org-l10n-ta-IN
Description: full-featured office productivity suite -- Tamil language package
OpenOffice.org is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
@@ -2462,11 +2462,11 @@
Section: localization
Architecture: all
Depends: locales | belocs-locales-data | locales-all, ${misc:Depends}
-Recommends: openoffice.org-core (>> ${base-version}) |
language-support-translations-te
-Provides: openoffice.org-l10n-${help-l10n-virtual-version},
openoffice.org2-l10n-te
+Recommends: openoffice.org-core (>> ${base-version}) |
language-support-translations-te , ttf-telugu-fonts
+Provides: openoffice.org-l10n-${help-l10n-virtual-version},
openoffice.org2-l10n-te, openoffice.org-l10n-te-IN
Suggests: hunspell-dictionary-te | myspell-dictionary-te,
openoffice.org-hyphenation-te, openoffice.org2-thesaurus-te,
openoffice.org-help-te
-Conflicts: openoffice.org-core (<< ${base-version}), openoffice.org-core (>=
${base-version}.1), openoffice.org2-l10n-te
-Replaces: openoffice.org2-l10n-te
+Conflicts: openoffice.org-core (<< ${base-version}), openoffice.org-core (>=
${base-version}.1), openoffice.org2-l10n-te, openoffice.org-l10n-te-IN
+Replaces: openoffice.org2-l10n-te, openoffice.org-l10n-te-IN
Description: full-featured office productivity suite -- Telugu language package
OpenOffice.org is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
=== modified file 'rules'
--- a/rules 2009-11-26 20:11:30 +0000
+++ b/rules 2009-11-27 17:01:54 +0000
@@ -1606,6 +1606,14 @@
perl -pi -e 's/^Breaks:.*myspell.*\n//' debian/control
endif
+ # add conflicts/replaces/provides for xx-IN -> xx move
+ for o in as-IN gu-IN ml-IN mr-IN or-IN ta-IN te-IN; do \
+ n=`echo $$o | cut -d- -f1`; \
+ perl -pi -e "s/(Provides:.*openoffice.org2-l10n-$$n$$)/\1,
openoffice.org-l10n-$$o/" debian/control; \
+ perl -pi -e "s/(Conflicts:.*openoffice.org2-l10n-$$n$$)/\1,
openoffice.org-l10n-$$o/" debian/control; \
+ perl -pi -e "s/(Replaces:.*openoffice.org2-l10n-$$n$$)/\1,
openoffice.org-l10n-$$o/" debian/control; \
+ done
+
.DELETE_ON_ERROR: debian/control
build: build-arch build-indep
