r788 ./packages/openofficeorg/2.2.1/unstable: reenable km, suggest openoffice.org-ctl-he, build-conflict against broken libxul-dev, update dict/hyph info
------------------------------------------------------------
revno: 788
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Fri 2007-07-27 12:50:19 +0200
message:
reenable km, suggest openoffice.org-ctl-he, build-conflict against broken libxul-dev, update dict/hyph info
modified:
README.Debian
changelog
control
control.in
rules
=== modified file 'README.Debian'
--- a/README.Debian 2007-04-24 14:02:57 +0000
+++ b/README.Debian 2007-07-27 10:50:19 +0000
@@ -108,12 +108,13 @@
Spellcheck dictionaries, Hyphenation patterns and Thesauri
----------------------------------------------------------
-Currently, there are dictionaries available for Bulgarian, Catalan, Croatian, Czech,
-Danish, Dutch, English (AUS/GB/US), Esperanto, Estonian, Finnish, French, Galician,
-German (DE/CH/AT), Greek, Hebrew, Hungarian, Irish (Gaeilge), Italian,
-Kurdish, Latvian, Lithuanian, Manx Gaelic, Norwegian Bokmal, Norwegian Nynorsk,
-Polish, Portuguese, Portuguese (Brazilian), Russian, Scots Gaelic, Slovak,
-Slovenian, Spanish, Swahili, Swedish, Thai, Ukrainian and Uzbek.
+Currently, there are dictionaries available for Afrikaans, Bulgarian, Catalan,
+Croatian, Czech, Danish, Dutch, English (AUS/GB/US), Esperanto, Estonian,
+Finnish, French, Galician, German (DE/CH/AT), Greek, Hebrew, Hungarian,
+Irish (Gaeilge), Italian, Kurdish, Latvian, Lithuanian, Manx Gaelic,
+Norwegian Bokmal, Norwegian Nynorsk, Polish, Portuguese,
+Portuguese (Brazilian), Russian, Scots Gaelic, Slovak, Slovenian, Spanish,
+Swahili, Swedish, Thai, Ukrainian and Uzbek.
Dictionaries are packaged as myspell-<lang> (or, for newer ones improved
for hunspell hunspell-<lang>).
@@ -122,7 +123,7 @@
Thesauri are packaged as openoffice.org-thesaurus-<lang>
Currently, there are hyphenation patterns available for Croatian, Estonian,
-German, Hungarian, Polish and Lithuanian.
+German, Hungarian, Italian, Polish and Lithuanian.
Hyphenation patterns are packaged as openoffice.org-hyphenation-<lang>.
Help packages
=== modified file 'changelog'
--- a/changelog 2007-07-26 13:48:23 +0000
+++ b/changelog 2007-07-27 10:50:19 +0000
@@ -6,8 +6,17 @@
- debian/rules:
+ fix some stuff for etch backports
+ suggest libc*-dbg
+ + reenable km again due to demand of the Khmer people...
+ * debian/control.in:
+ - add build-conflicts against
+ libxul-dev (= 1.8.0.13~pre070720-0etch1) - broken security update, see
+ #434844
+ * debian/README.Debian: update for myspell-af and
+ openoffice.org-hyphenation-it
+ * debian/rules:
+ - suggest openoffice.org-ctl-he at -l10n-he
- -- Rene Engelhard <rene@debian.org> Thu, 26 Jul 2007 15:44:40 +0200
+ -- Rene Engelhard <rene@debian.org> Fri, 27 Jul 2007 12:41:41 +0200
openoffice.org (2.2.1-6) unstable; urgency=low
=== modified file 'control'
--- a/control 2007-07-17 14:48:53 +0000
+++ b/control 2007-07-27 10:50:19 +0000
@@ -4,7 +4,7 @@
Maintainer: Debian OpenOffice Team <debian-openoffice@lists.debian.org>
Uploaders: Chris Halls <halls@debian.org>, Rene Engelhard <rene@debian.org>
Build-Depends: lsb-release, bzip2, bison (>= 1:1.875a-1) [i386 powerpc sparc amd64], flex [i386 powerpc sparc amd64], libpam0g-dev [i386 powerpc sparc amd64], libxaw7-dev [i386 powerpc sparc amd64], unzip [i386 powerpc sparc amd64], zip [i386 powerpc sparc amd64], autoconf [i386 powerpc sparc amd64], sharutils [i386 powerpc sparc amd64], pkg-config [i386 powerpc sparc amd64], xutils [i386 powerpc sparc amd64], libfontconfig1-dev [i386 powerpc sparc amd64], binutils (>= 2.14.90.0.6-3) [sparc], libc6 (>= 2.3.2-1) [powerpc], zlib1g-dev [i386 powerpc sparc amd64], libfreetype6-dev [i386 powerpc sparc amd64], libx11-dev [i386 powerpc sparc amd64], libsm-dev [i386 powerpc sparc amd64], libxt-dev [i386 powerpc sparc amd64], libxext-dev [i386 powerpc sparc amd64], libice-dev [i386 powerpc sparc amd64], libsane-dev [i386 powerpc sparc amd64], libxrender-dev [i386 powerpc sparc amd64], libcupsys2-dev [i386 powerpc sparc amd64], libarchive-zip-perl [i386 powerpc sparc amd64], libstartup-notification0-dev [i386 powerpc sparc amd64], libpng12-dev [i386 powerpc sparc amd64], libjpeg62-dev [i386 powerpc sparc amd64], libxml2-dev [i386 powerpc sparc amd64], dmake (>= 1:4.6) [i386 powerpc sparc amd64], libldap2-dev [i386 powerpc sparc amd64], libexpat1-dev [i386 powerpc sparc amd64], libgnomevfs2-dev [i386 powerpc sparc amd64], fastjar [i386 powerpc sparc amd64], libsndfile1-dev [i386 powerpc sparc amd64], xsltproc [i386 powerpc sparc amd64], imagemagick [i386 powerpc sparc amd64], fdupes [i386 powerpc sparc amd64], xml-core [i386 powerpc sparc amd64], libxkbfile-dev [i386 powerpc sparc amd64], libxinerama-dev [i386 powerpc sparc amd64], x11proto-render-dev [i386 powerpc sparc amd64], unixodbc-dev (>= 2.2.11) [i386 powerpc sparc amd64], libdb4.4-dev [i386 powerpc sparc amd64] , libcurl4-gnutls-dev [i386 powerpc sparc amd64] , python-central (>= 0.5) [i386 powerpc sparc amd64], debhelper (>= 5.0.37.2), python-dev (>= 2.4) [i386 powerpc sparc amd64] , dpkg-dev (>= 1.13.19) , java-gcj-compat-dev (>= 1.0.65-4) [i386 powerpc sparc amd64] , ant (>= 1.6.5) [i386 powerpc sparc amd64] , libxt-java (>= 0.20050823) [i386 powerpc sparc amd64] , libxerces2-java [i386 powerpc sparc amd64] , libxalan2-java (>= 2.6.0-1) [i386 powerpc sparc amd64] , libdb4.4-java [i386 powerpc sparc amd64] , mingw32 [i386 powerpc sparc amd64] , libxul-dev [i386 powerpc sparc amd64], libnss3-dev [i386 powerpc sparc amd64] , mono-mcs (>= 1.2.3) [i386 amd64], mono-gmcs (>= 1.2.3) [i386 amd64], libmono-dev (>= 1.2.3) [i386 amd64], mono-utils (>= 1.2.3) [i386 amd64], cli-common-dev (>= 0.4.4) [i386 amd64] , libhunspell-dev (>= 1.1.5-2) [i386 powerpc sparc amd64] , libaltlinuxhyph-dev (>= 0.1.1-11) [i386 powerpc sparc amd64] , libstlport4.6-dev (>= 4.6.2-3) [i386 powerpc sparc amd64] , portaudio19-dev [i386 powerpc sparc amd64] , libwpd8-dev (>= 0.8.3-3) [i386 powerpc sparc amd64] , libwps-dev [i386 powerpc sparc amd64] , libicu36-dev [i386 powerpc sparc amd64] , libxslt1-dev [i386 powerpc sparc amd64] , libcairo2-dev [i386 powerpc sparc amd64], libglitz-glx1-dev [i386 powerpc sparc amd64] , kdelibs4-dev (>= 4:3.4.3-2) [i386 powerpc sparc amd64] , libhsqldb-java (>= 1.8.0.0-2) [i386 powerpc sparc amd64] , bsh (>= 2.0b4-1) [i386 powerpc sparc amd64] , liblpsolve55-dev (>= 5.5.0.10-4) [i386 powerpc sparc amd64], lp-solve (>= 5.5.0.10-4) [i386 powerpc sparc amd64] , libsuitesparse-dev [i386 powerpc sparc amd64] , libdbus-glib-1-dev (>= 0.60) [i386 powerpc sparc amd64] , libgstreamer-plugins-base0.10-dev [i386 powerpc sparc amd64] , libneon25-dev [i386 powerpc sparc amd64] , libgtk2.0-dev (>= 2.10) [i386 powerpc sparc amd64]
-Build-Conflicts: libcairo2 (= 1.4.8-1)
+Build-Conflicts: libcairo2 (= 1.4.8-1), libxul-dev (= 1.8.0.13~pre070720-0etch1)
Standards-Version: 3.7.2
XS-Python-Version: current
@@ -1208,7 +1208,7 @@
Depends: locales | belocs-locales-data | locales-all
Recommends: openoffice.org-core (>> ${base-version}) | language-support-he , culmus
Provides: openoffice.org-l10n-${help-l10n-virtual-version}, openoffice.org2-l10n-he
-Suggests: hunspell-dictionary-he | myspell-dictionary-he, openoffice.org-hyphenation-he, openoffice.org2-thesaurus-he, openoffice.org-help-he
+Suggests: hunspell-dictionary-he | myspell-dictionary-he, openoffice.org-hyphenation-he, openoffice.org2-thesaurus-he, openoffice.org-help-he, openoffice.org-ctl-he
Conflicts: openoffice.org-core (<< ${base-version}), openoffice.org-core (>= ${base-version}.1), openoffice.org2-l10n-he
Replaces: openoffice.org2-l10n-he
Description: Hebrew language package for OpenOffice.org
@@ -1413,6 +1413,36 @@
For latest news on OpenOffice.org in Debian, see
http://openoffice.debian.net
+Package: openoffice.org-l10n-km
+Architecture: all
+Depends: locales (>= 2.3.5-12) | belocs-locales-data | locales-all
+Recommends: openoffice.org-core (>> ${base-version}) | language-support-km , ttf-khmeros
+Provides: openoffice.org-l10n-${help-l10n-virtual-version}, openoffice.org2-l10n-km
+Suggests: hunspell-dictionary-km | myspell-dictionary-km, openoffice.org-hyphenation-km, openoffice.org2-thesaurus-km, openoffice.org-help-km
+Conflicts: openoffice.org-core (<< ${base-version}), openoffice.org-core (>= ${base-version}.1), openoffice.org2-l10n-km
+Replaces: openoffice.org2-l10n-km
+Description: Khmer language package for OpenOffice.org
+ OpenOffice.org is a full-featured office productivity suite that provides
+ a near drop-in replacement for Microsoft(R) Office.
+ .
+ This package contains the localization of OpenOffice.org in
+ Khmer.
+ It contains the user interface, the templates and the autotext features.
+ (please note that not all this is available for all possible languages).
+ You can switch user interface language using the locales system.
+ .
+ Spelling dictionaries, hyphenation patterns, thesauri and help are not
+ included in this package. There are some available in separate packages
+ (myspell-*, openoffice.org-hyphenation-*, openoffice.org-thesaurus-*,
+ openoffice.org-help-*)
+ .
+ If you just want to be able to spellcheck etc. in other languages, you can
+ install extra dictionaries/hyphenation patterns/thesauri independently of
+ the language packs.
+ .
+ For latest news on OpenOffice.org in Debian, see
+ http://openoffice.debian.net
+
Package: openoffice.org-l10n-ko
Architecture: all
Depends: locales | belocs-locales-data | locales-all
@@ -2851,6 +2881,23 @@
For latest news on OpenOffice.org in Debian, see
http://openoffice.debian.net
+Package: openoffice.org-help-km
+Architecture: all
+Section: doc
+Recommends: openoffice.org-core (>> ${base-version}) | language-support-km
+Depends: openoffice.org-writer, openoffice.org-l10n-km
+Conflicts: openoffice.org-common (<= 2.0.0-1), openoffice.org-core (<< ${base-version})
+Provides: openoffice.org-help-${help-l10n-virtual-version}
+Description: Khmer help for OpenOffice.org
+ OpenOffice.org is a full-featured office productivity suite that provides
+ a near drop-in replacement for Microsoft(R) Office.
+ .
+ This package contains the help of OpenOffice.org in
+ Khmer.
+ .
+ For latest news on OpenOffice.org in Debian, see
+ http://openoffice.debian.net
+
Package: openoffice.org-help-ko
Architecture: all
Section: doc
=== modified file 'control.in'
--- a/control.in 2007-06-28 09:42:00 +0000
+++ b/control.in 2007-07-27 10:50:19 +0000
@@ -49,7 +49,7 @@
unixodbc-dev (>= 2.2.11) [%OOO_ARCHS%],
libdb4.4-dev [%OOO_ARCHS%]
%BUILD_DEPS%
-Build-Conflicts: libcairo2 (= 1.4.8-1)
+Build-Conflicts: libcairo2 (= 1.4.8-1), libxul-dev (= 1.8.0.13~pre070720-0etch1)
Standards-Version: 3.7.2
XS-Python-Version: current
=== modified file 'rules'
--- a/rules 2007-07-22 10:17:11 +0000
+++ b/rules 2007-07-27 10:50:19 +0000
@@ -299,16 +299,16 @@
#ISOS=$(shell ooo-build/bin/openoffice-xlate-lang -i all')
ISOS:=en-US af as-IN be-BY bg bn br bs ca cs cy da de dz el \
en-GB en-ZA eo es et fa fi fr ga gl gu-IN he hi-IN hr hu it ja \
- ka ko ku lo lt lv mk ml-IN nb ne nl nn nr ns or-IN pa-IN \
+ ka km ko ku lo lt lv mk ml-IN nb ne nl nn nr ns or-IN pa-IN \
pl pt pt-BR ru rw sk sl sr-CS ss st sv \
ta-IN te-IN tg th tn tr ts uk ve vi xh zh-CN zh-TW zu
#HELPISOS:=$(shell ooo-build/bin/openoffice-xlate-lang -i all')
- HELPISOS:=en-US cs da de dz en-GB es et fr gl hi-IN hu it ja ko nl \
+ HELPISOS:=en-US cs da de dz en-GB es et fr gl hi-IN hu it ja km ko nl \
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 as-IN be-BY bg bn br bs ca cs cy da de dz el \
en-GB en-ZA eo es et fa fi fr ga gl gu-IN he hi-IN hr hu it ja \
- ka ko ku lo lt lv mk ml-IN nb ne nl nn nr ns or-IN pa-IN \
+ ka km ko ku lo lt lv mk ml-IN nb ne nl nn nr ns or-IN pa-IN \
pl pt pt-BR ru rw sk sl sr-CS ss st sv \
ta-IN te-IN tg th tn tr ts uk ve vi xh zh-CN zh-TW zu
endif
@@ -984,6 +984,10 @@
perl -pi -e 's/Conflicts: openoffice.org-thesaurus/Conflicts: openoffice.org-thesaurus, ooqstart-gnome <= 0.8.3-8), oooqs-kde (<< 2.0.3-7)/' debian/control
endif
+ifeq (he,$(findstring he,$(LANGPACKISOS)))
+ perl -pi -e 's/openoffice.org-help-he$$/openoffice.org-help-he, openoffice.org-ctl-he/' debian/control
+endif
+
python debian/scripts/joinctrl.py < debian/control > debian/control.tmp
mv debian/control.tmp debian/control
Reply to: