------------------------------------------------------------
revno: 1941
committer: Rene Engelhard <r...@debian.org>
branch nick: unstable
timestamp: Wed 2010-04-14 22:19:44 +0200
message:
add Replaces: to l10n-xx for l10n-xx-in (for safety, seems to work otherwise
as the filenames change)
modified:
changelog
control
rules
=== modified file 'changelog'
--- a/changelog 2010-04-14 17:33:15 +0000
+++ b/changelog 2010-04-14 20:19:44 +0000
@@ -32,7 +32,7 @@
transitional packages for xx-IN -> xx move as Conflicts/Provides/Replaces
alone doesn't seem to work
- -- Rene Engelhard <r...@debian.org> Wed, 14 Apr 2010 19:31:44 +0200
+ -- Rene Engelhard <r...@debian.org> Wed, 14 Apr 2010 22:18:51 +0200
openoffice.org (1:3.2.0-6) unstable; urgency=low
=== modified file 'control'
--- a/control 2010-04-14 17:19:22 +0000
+++ b/control 2010-04-14 20:19:44 +0000
@@ -564,7 +564,7 @@
Provides: openoffice.org-l10n-${help-l10n-virtual-version},
openoffice.org2-l10n-as
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
+Replaces: openoffice.org2-l10n-as, openoffice.org-l10n-as-in
Description: 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.
@@ -1264,7 +1264,7 @@
Provides: openoffice.org-l10n-${help-l10n-virtual-version},
openoffice.org2-l10n-gu
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
+Replaces: openoffice.org2-l10n-gu, openoffice.org-l10n-gu-in
Description: 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.
@@ -1712,7 +1712,7 @@
Provides: openoffice.org-l10n-${help-l10n-virtual-version},
openoffice.org2-l10n-ml
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
+Replaces: openoffice.org2-l10n-ml, openoffice.org-l10n-ml-in
Description: 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.
@@ -1740,7 +1740,7 @@
Provides: openoffice.org-l10n-${help-l10n-virtual-version},
openoffice.org2-l10n-mr
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
+Replaces: openoffice.org2-l10n-mr, openoffice.org-l10n-mr-in
Description: 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.
@@ -1992,7 +1992,7 @@
Provides: openoffice.org-l10n-${help-l10n-virtual-version},
openoffice.org2-l10n-or
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
+Replaces: openoffice.org2-l10n-or, openoffice.org-l10n-or-in
Description: 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.
@@ -2412,7 +2412,7 @@
Provides: openoffice.org-l10n-${help-l10n-virtual-version},
openoffice.org2-l10n-ta
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
+Replaces: openoffice.org2-l10n-ta, openoffice.org-l10n-ta-in
Description: 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.
@@ -2440,7 +2440,7 @@
Provides: openoffice.org-l10n-${help-l10n-virtual-version},
openoffice.org2-l10n-te
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
+Replaces: openoffice.org2-l10n-te, openoffice.org-l10n-te-in
Description: 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 2010-04-14 17:19:22 +0000
+++ b/rules 2010-04-14 20:19:44 +0000
@@ -1694,15 +1694,13 @@
sed -e "s|openoffice.orgVER|openoffice.org$(VER)|g" \
>> debian/control < debian/control.mysql.in
endif
-ifeq "$(DIST)" "Debian"
sed -e "s|openoffice.orgVER|openoffice.org$(VER)|g" \
>> debian/control < debian/control.lenny_squeeze_transitional.in
for o in as-IN gu-IN ml-IN mr-IN or-IN ta-IN te-IN; do \
n=`echo $$o | cut -d- -f1`; \
os=`echo $$o | tr A-Z a-z`; \
- perl -pi -e 's/\n/, openoffice.org-l10n-$${os}\n/ if
/^Replaces:.*l10n-$${n}$$/' debian/control; \
+ perl -pi -e "s/(Replaces:.*openoffice.org2-l10n-$${n}$$)/\1,
openoffice.org-l10n-$${os}/" debian/control; \
done
-endif
perl -pi -e "s,%OOO_ARCHS%,$(OOO_ARCHS),g" debian/control
perl -pi -e "s,%OOO_JAVA_ARCHS%,$(OOO_JAVA_ARCHS),g" debian/control
