------------------------------------------------------------
revno: 1710
committer: Rene Engelhard <r...@debian.org>
branch nick: experimental
timestamp: Thu 2009-11-26 21:11:30 +0100
message:
xx-IN was (except hi-IN and pa-IN moved to xx upstream...
modified:
changelog
control
control.in
rules
=== modified file 'changelog'
--- a/changelog 2009-11-26 20:02:33 +0000
+++ b/changelog 2009-11-26 20:11:30 +0000
@@ -14,6 +14,8 @@
- remove removed languages: lo
- fix install on no-Java builds
- add BUILD_HPPA conditional, don't enable it yet
+ * debian/control.in, debian/rules: adapt for upstream xx-IN -> xx rename
+ (except hi-IN and pa-IN)
* debian/scripts/vars.hppa: add
-- Rene Engelhard <r...@debian.org> Mon, 23 Nov 2009 21:27:01 +0100
=== modified file 'control'
--- a/control 2009-11-26 20:02:33 +0000
+++ b/control 2009-11-26 20:11:30 +0000
@@ -90,7 +90,7 @@
Package: openoffice.org-l10n-in
Section: localization
Architecture: all
-Depends: openoffice.org-l10n-as-in, openoffice.org-l10n-bn,
openoffice.org-l10n-gu-in, openoffice.org-l10n-hi-in,
openoffice.org-l10n-ml-in, openoffice.org-l10n-mr-in,
openoffice.org-l10n-or-in, openoffice.org-l10n-pa-in,
openoffice.org-l10n-ta-in, openoffice.org-l10n-te-in, ${misc:Depends}
+Depends: openoffice.org-l10n-as, openoffice.org-l10n-bn,
openoffice.org-l10n-gu, openoffice.org-l10n-hi-in, openoffice.org-l10n-ml,
openoffice.org-l10n-mr, openoffice.org-l10n-or, openoffice.org-l10n-pa,
openoffice.org-l10n-ta, openoffice.org-l10n-te, ${misc:Depends}
Recommends: ttf-indic-fonts
Description: full-featured office productivity suite -- Indic language packages
OpenOffice.org is a full-featured office productivity suite that provides
@@ -554,15 +554,15 @@
install extra dictionaries/hyphenation patterns/thesauri independently of
the language packs.
-Package: openoffice.org-l10n-as-in
+Package: openoffice.org-l10n-as
Section: localization
Architecture: all
-Depends: locales (>= 2.3.6.ds1-1) | locales-all (>= 2.3.6.ds1-1),
${misc:Depends}
+Depends: locales | belocs-locales-data | locales-all, ${misc:Depends}
Recommends: openoffice.org-core (>> ${base-version}) |
language-support-translations-as
-Provides: openoffice.org-l10n-${help-l10n-virtual-version},
openoffice.org2-l10n-as-in
-Suggests: hunspell-dictionary-as-in | myspell-dictionary-as-in,
openoffice.org-hyphenation-as-in, openoffice.org2-thesaurus-as-in,
openoffice.org-help-as-in
-Conflicts: openoffice.org-core (<< ${base-version}), openoffice.org-core (>=
${base-version}.1), openoffice.org2-l10n-as-in
-Replaces: openoffice.org2-l10n-as-in
+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
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.
@@ -1282,15 +1282,15 @@
install extra dictionaries/hyphenation patterns/thesauri independently of
the language packs.
-Package: openoffice.org-l10n-gu-in
+Package: openoffice.org-l10n-gu
Section: localization
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-in
-Suggests: hunspell-dictionary-gu-in | myspell-dictionary-gu-in,
openoffice.org-hyphenation-gu-in, openoffice.org2-thesaurus-gu-in,
openoffice.org-help-gu-in
-Conflicts: openoffice.org-core (<< ${base-version}), openoffice.org-core (>=
${base-version}.1), openoffice.org2-l10n-gu-in
-Replaces: openoffice.org2-l10n-gu-in
+Recommends: openoffice.org-core (>> ${base-version}) |
language-support-translations-gu
+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
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.
@@ -1758,15 +1758,15 @@
install extra dictionaries/hyphenation patterns/thesauri independently of
the language packs.
-Package: openoffice.org-l10n-ml-in
+Package: openoffice.org-l10n-ml
Section: localization
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-in
-Suggests: hunspell-dictionary-ml-in | myspell-dictionary-ml-in,
openoffice.org-hyphenation-ml-in, openoffice.org2-thesaurus-ml-in,
openoffice.org-help-ml-in
-Conflicts: openoffice.org-core (<< ${base-version}), openoffice.org-core (>=
${base-version}.1), openoffice.org2-l10n-ml-in
-Replaces: openoffice.org2-l10n-ml-in
+Recommends: openoffice.org-core (>> ${base-version}) |
language-support-translations-ml
+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
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.
@@ -1786,15 +1786,15 @@
install extra dictionaries/hyphenation patterns/thesauri independently of
the language packs.
-Package: openoffice.org-l10n-mr-in
+Package: openoffice.org-l10n-mr
Section: localization
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-in
-Suggests: hunspell-dictionary-mr-in | myspell-dictionary-mr-in,
openoffice.org-hyphenation-mr-in, openoffice.org2-thesaurus-mr-in,
openoffice.org-help-mr-in
-Conflicts: openoffice.org-core (<< ${base-version}), openoffice.org-core (>=
${base-version}.1), openoffice.org2-l10n-mr-in
-Replaces: openoffice.org2-l10n-mr-in
+Recommends: openoffice.org-core (>> ${base-version}) |
language-support-translations-mr
+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
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.
@@ -2010,15 +2010,15 @@
install extra dictionaries/hyphenation patterns/thesauri independently of
the language packs.
-Package: openoffice.org-l10n-or-in
+Package: openoffice.org-l10n-or
Section: localization
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-in
-Suggests: hunspell-dictionary-or-in | myspell-dictionary-or-in,
openoffice.org-hyphenation-or-in, openoffice.org2-thesaurus-or-in,
openoffice.org-help-or-in
-Conflicts: openoffice.org-core (<< ${base-version}), openoffice.org-core (>=
${base-version}.1), openoffice.org2-l10n-or-in
-Replaces: openoffice.org2-l10n-or-in
+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
+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
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.
@@ -2430,15 +2430,15 @@
install extra dictionaries/hyphenation patterns/thesauri independently of
the language packs.
-Package: openoffice.org-l10n-ta-in
+Package: openoffice.org-l10n-ta
Section: localization
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-in
-Suggests: hunspell-dictionary-ta-in | myspell-dictionary-ta-in,
openoffice.org-hyphenation-ta-in, openoffice.org2-thesaurus-ta-in,
openoffice.org-help-ta-in
-Conflicts: openoffice.org-core (<< ${base-version}), openoffice.org-core (>=
${base-version}.1), openoffice.org2-l10n-ta-in
-Replaces: openoffice.org2-l10n-ta-in
+Recommends: openoffice.org-core (>> ${base-version}) |
language-support-translations-ta
+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
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.
@@ -2458,15 +2458,15 @@
install extra dictionaries/hyphenation patterns/thesauri independently of
the language packs.
-Package: openoffice.org-l10n-te-in
+Package: openoffice.org-l10n-te
Section: localization
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-in
-Suggests: hunspell-dictionary-te-in | myspell-dictionary-te-in,
openoffice.org-hyphenation-te-in, openoffice.org2-thesaurus-te-in,
openoffice.org-help-te-in
-Conflicts: openoffice.org-core (<< ${base-version}), openoffice.org-core (>=
${base-version}.1), openoffice.org2-l10n-te-in
-Replaces: openoffice.org2-l10n-te-in
+Recommends: openoffice.org-core (>> ${base-version}) |
language-support-translations-te
+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
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 'control.in'
--- a/control.in 2009-11-17 01:05:57 +0000
+++ b/control.in 2009-11-26 20:11:30 +0000
@@ -168,7 +168,7 @@
Package: openoffice.orgVER-l10n-in
Section: localization
Architecture: all
-Depends: openoffice.orgVER-l10n-as-in, openoffice.orgVER-l10n-bn,
openoffice.orgVER-l10n-gu-in, openoffice.orgVER-l10n-hi-in,
openoffice.orgVER-l10n-ml-in, openoffice.orgVER-l10n-mr-in,
openoffice.orgVER-l10n-or-in, openoffice.orgVER-l10n-pa-in,
openoffice.orgVER-l10n-ta-in, openoffice.orgVER-l10n-te-in,
+Depends: openoffice.orgVER-l10n-as, openoffice.orgVER-l10n-bn,
openoffice.orgVER-l10n-gu, openoffice.orgVER-l10n-hi-in,
openoffice.orgVER-l10n-ml, openoffice.orgVER-l10n-mr,
openoffice.orgVER-l10n-or, openoffice.orgVER-l10n-pa,
openoffice.orgVER-l10n-ta, openoffice.orgVER-l10n-te,
${misc:Depends}
Recommends: ttf-indic-fonts
Description: full-featured office productivity suite -- Indic language packages
=== modified file 'rules'
--- a/rules 2009-11-26 20:08:03 +0000
+++ b/rules 2009-11-26 20:11:30 +0000
@@ -632,20 +632,20 @@
# one to that gid_Module_Root always is english and the other langpacks
# have gid_Module_Root.$iso
#ISOS=$(shell ooo-build/bin/openoffice-xlate-lang -i all')
- ISOS:=en-US af ar as-IN ast be-BY bg bn bo br bs ca cs cy da de dz el \
- en-GB en-ZA eo es et eu fa fi fr ga gl gu-IN he hi-IN hr hu id is it
ja \
- ka km ko ku lt lv mk mn ml-IN mr-IN nb ne nl nn nr ns om or-IN \
+ ISOS:=en-US af ar as ast be-BY bg bn bo br bs ca cs cy da de dz el \
+ en-GB en-ZA eo es et eu fa fi fr ga gl gu he hi-IN hr hu id is it ja \
+ ka km ko ku lt lv mk mn ml mr nb ne nl nn nr ns om or \
pa-IN pl pt pt-BR ro ru rw si sk sl sr ss st sv \
- ta-IN te-IN tg th tn tr ts ug uk uz ve vi xh zh-CN zh-TW zu
+ ta te tg th tn tr ts ug uk uz ve vi xh zh-CN zh-TW zu
#HELPISOS:=$(shell ooo-build/bin//openoffice-xlate-lang -i all')
HELPISOS:=en-US ca cs da de dz el en-GB es et eu fi fr gl hi-IN hu it \
ja km ko nl om pl pt pt-BR ru sl sv zh-CN zh-TW
#LANGPACKISOS:=$(shell ooo-build/bin/openoffice-xlate-lang -i all')
- LANGPACKISOS:=en-US af ar as-IN ast be-BY bg bn bo br bs ca cs cy da de
dz el \
- en-GB en-ZA eo es et eu fa fi fr ga gl gu-IN he hi-IN hr hu id is it
ja \
- ka km ko ku lt lv mk mn ml-IN mr-IN nb ne nl nn nr ns om or-IN \
+ LANGPACKISOS:=en-US af ar as ast be-BY bg bn bo br bs ca cs cy da de dz
el \
+ en-GB en-ZA eo es et eu fa fi fr ga gl gu he hi-IN hr hu id is it ja \
+ ka km ko ku lt lv mk mn ml mr nb ne nl nn nr ns om or \
pa-IN pl pt pt-BR ro ru rw si sk sl sr ss st sv \
- ta-IN te-IN tg th tn tr ts ug uk uz ve vi xh zh-CN zh-TW zu
+ ta te tg th tn tr ts ug uk uz ve vi xh zh-CN zh-TW zu
endif
else
ISOS=en-US
@@ -1415,10 +1415,10 @@
LCODE=`ooo-build/bin/openoffice-xlate-lang -i $$LNUM | tr A-Z a-z`;
\
CCODE=`echo $$LCODE | sed 's/-.*//'`; \
case "$$LCODE" in \
- bn|gu-in|pa-in|ml-in|or-in|te-in|ta-in) \
+ bn|gu|pa-in|ml|or|te|ta) \
FONT_SUGGESTS=", ttf-`echo $$LNAME | tr A-Z
a-z`-fonts"; \
;; \
- hi-in|ne|mr-in) \
+ hi-in|ne|mr) \
FONT_SUGGESTS=", ttf-devanagari-fonts"; \
;; \
he) \
@@ -1452,7 +1452,7 @@
sr) \
LOCALES_DEPENDS="locales (>= 2.3.6.ds1-5) |
belocs-locales-data | locales-all" \
;; \
- as-in|or-in|nr) \
+ as|or|nr) \
LOCALES_DEPENDS="locales (>= 2.3.6.ds1-1) | locales-all
(>= 2.3.6.ds1-1)" \
;; \
*) \
