------------------------------------------------------------
revno: 1934
committer: Rene Engelhard <r...@debian.org>
branch nick: debian
timestamp: Mon 2010-04-12 23:18:40 +0200
message:
+ * debian/rules, debian/control.lenny_squeeze_transitional.in: add
+ transitional packages for xx-IN -> xx move as Conflicts/Provides/Replaces
+ alone doesn't seem to work
modified:
changelog
control
rules
=== modified file 'changelog'
--- a/changelog 2010-04-12 15:02:26 +0000
+++ b/changelog 2010-04-12 21:18:40 +0000
@@ -30,8 +30,11 @@
work around APT bug (thanks Ubuntu..).
Do the same for -filter-binfilter to make it have orrect Pre-Depends:
again
+ * debian/rules, debian/control.lenny_squeeze_transitional.in: add
+ transitional packages for xx-IN -> xx move as Conflicts/Provides/Replaces
+ alone doesn't seem to work
- -- Rene Engelhard <r...@debian.org> Mon, 12 Apr 2010 16:52:49 +0200
+ -- Rene Engelhard <r...@debian.org> Mon, 12 Apr 2010 23:13:07 +0200
openoffice.org (1:3.2.0-6) unstable; urgency=low
=== modified file 'control'
--- a/control 2010-04-12 00:18:14 +0000
+++ b/control 2010-04-12 21:18:40 +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
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
+Replaces: openoffice.org2-l10n-as
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
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
+Replaces: openoffice.org2-l10n-gu
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
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
+Replaces: openoffice.org2-l10n-ml
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
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
+Replaces: openoffice.org2-l10n-mr
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
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
+Replaces: openoffice.org2-l10n-or
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
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
+Replaces: openoffice.org2-l10n-ta
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
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
+Replaces: openoffice.org2-l10n-te
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.
@@ -3711,3 +3711,66 @@
The MySQL Connector extension allows to use the MySQL database from
OpenOffice.org without any wrapper layer such as ODBC or JDBC.
+Package: openoffice.org-l10n-as-in
+Architecture: all
+Depends: openoffice.org-l10n-as
+Description: transitional package to openoffice.org-l10n-as
+ This package is a transitional package for upgrading to the new
+ openoffice.org-l10n-as.
+ .
+ It can be safely removed when openoffice.org-l10n-as is installed.
+
+Package: openoffice.org-l10n-hu-in
+Architecture: all
+Depends: openoffice.org-l10n-gu
+Description: transitional package to openoffice.org-l10n-gu
+ This package is a transitional package for upgrading to the new
+ openoffice.org-l10n-sgu.
+ .
+ It can be safely removed when openoffice.org-l10n-gu is installed.
+
+Package: openoffice.org-l10n-ml-in
+Architecture: all
+Depends: openoffice.org-l10n-ml
+Description: transitional package to openoffice.org-l10n-ml
+ This package is a transitional package for upgrading to the new
+ openoffice.org-l10n-ml.
+ .
+ It can be safely removed when openoffice.org-l10n-ml is installed.
+
+Package: openoffice.org-l10n-mr-in
+Architecture: all
+Depends: openoffice.org-l10n-mr
+Description: transitional package to openoffice.org-l10n-mr
+ This package is a transitional package for upgrading to the new
+ openoffice.org-l10n-mr.
+ .
+ It can be safely removed when openoffice.org-l10n-mr is installed.
+
+Package: openoffice.org-l10n-or-in
+Architecture: all
+Depends: openoffice.org-l10n-or
+Description: transitional package to openoffice.org-l10n-or
+ This package is a transitional package for upgrading to the new
+ openoffice.org-l10n-or.
+ .
+ It can be safely removed when openoffice.org-l10n-or is installed.
+
+Package: openoffice.org-l10n-ta-in
+Architecture: all
+Depends: openoffice.org-l10n-ta
+Description: transitional package to openoffice.org-l10n-ta
+ This package is a transitional package for upgrading to the new
+ openoffice.org-l10n-ta.
+ .
+ It can be safely removed when openoffice.org-l10n-ta is installed.
+
+Package: openoffice.org-l10n-te-in
+Architecture: all
+Depends: openoffice.org-l10n-te
+Description: transitional package to openoffice.org-l10n-te
+ This package is a transitional package for upgrading to the new
+ openoffice.org-l10n-te.
+ .
+ It can be safely removed when openoffice.org-l10n-te is installed.
+
=== modified file 'rules'
--- a/rules 2010-04-12 15:02:26 +0000
+++ b/rules 2010-04-12 21:18:40 +0000
@@ -1690,6 +1690,15 @@
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; \
+ 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
@@ -1753,15 +1762,6 @@
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`; \
- 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
build: build-arch build-indep
