------------------------------------------------------------
revno: 1913
committer: Rene Engelhard <[email protected]>
branch nick: unstable
timestamp: Tue 2010-04-06 22:25:16 +0200
message:
fix rule for replacing the old -in packages to not add it in uppercase
modified:
changelog
control
rules
=== modified file 'changelog'
--- a/changelog 2010-04-06 15:42:25 +0000
+++ b/changelog 2010-04-06 20:25:16 +0000
@@ -6,10 +6,12 @@
actually gets added for i386...
- add -F0 to QUILT_OPTIONS
- re-enable arch-dep extensions for m68k
+ - fix rule for replacing the old -in packages to not add it in
+ uppercase (closes: #576721)
* debian/rules, debian/control*in: remove %OOO_ARCH_DEP_EXTENSIONS_ARCHS%
again
- -- Rene Engelhard <[email protected]> Tue, 06 Apr 2010 10:07:23 +0200
+ -- Rene Engelhard <[email protected]> Tue, 06 Apr 2010 22:21:58 +0200
openoffice.org (1:3.2.0-5) unstable; urgency=low
=== modified file 'control'
--- a/control 2010-04-06 15:42:25 +0000
+++ b/control 2010-04-06 20:25:16 +0000
@@ -561,10 +561,10 @@
Architecture: all
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, openoffice.org-l10n-as-IN
+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, openoffice.org-l10n-as-IN
-Replaces: openoffice.org2-l10n-as, openoffice.org-l10n-as-IN
+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: 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.
@@ -1261,10 +1261,10 @@
Architecture: all
Depends: locales | belocs-locales-data | locales-all, ${misc:Depends}
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
+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, openoffice.org-l10n-gu-IN
-Replaces: openoffice.org2-l10n-gu, openoffice.org-l10n-gu-IN
+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: 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.
@@ -1709,10 +1709,10 @@
Architecture: all
Depends: locales | belocs-locales-data | locales-all, ${misc:Depends}
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
+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, openoffice.org-l10n-ml-IN
-Replaces: openoffice.org2-l10n-ml, openoffice.org-l10n-ml-IN
+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: 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.
@@ -1737,10 +1737,10 @@
Architecture: all
Depends: locales | belocs-locales-data | locales-all, ${misc:Depends}
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
+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, openoffice.org-l10n-mr-IN
-Replaces: openoffice.org2-l10n-mr, openoffice.org-l10n-mr-IN
+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: 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.
@@ -1989,10 +1989,10 @@
Architecture: all
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
+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, openoffice.org-l10n-or-IN
-Replaces: openoffice.org2-l10n-or, openoffice.org-l10n-or-IN
+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: 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.
@@ -2409,10 +2409,10 @@
Architecture: all
Depends: locales | belocs-locales-data | locales-all, ${misc:Depends}
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
+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, openoffice.org-l10n-ta-IN
-Replaces: openoffice.org2-l10n-ta, openoffice.org-l10n-ta-IN
+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: 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.
@@ -2437,10 +2437,10 @@
Architecture: all
Depends: locales | belocs-locales-data | locales-all, ${misc:Depends}
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
+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, openoffice.org-l10n-te-IN
-Replaces: openoffice.org2-l10n-te, openoffice.org-l10n-te-IN
+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: 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-06 15:42:25 +0000
+++ b/rules 2010-04-06 20:25:16 +0000
@@ -1741,9 +1741,10 @@
# 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; \
+ os=`echo $$o | tr A-Z a-z`; \
+ perl -pi -e "s/(Provides:.*openoffice.org2-l10n-$$n$$)/\1,
openoffice.org-l10n-$$os/" debian/control; \
+ perl -pi -e "s/(Conflicts:.*openoffice.org2-l10n-$$n$$)/\1,
openoffice.org-l10n-$$os/" debian/control; \
+ perl -pi -e "s/(Replaces:.*openoffice.org2-l10n-$$n$$)/\1,
openoffice.org-l10n-$$os/" debian/control; \
done
.DELETE_ON_ERROR: debian/control
