------------------------------------------------------------
revno: 874
committer: Rene Engelhard <[EMAIL PROTECTED]>
branch nick: debian
timestamp: Sun 2007-09-02 09:15:29 +0200
message:
temporarily disable cy
modified:
changelog
control
rules
=== modified file 'changelog'
--- a/changelog 2007-09-01 16:20:30 +0000
+++ b/changelog 2007-09-02 07:15:29 +0000
@@ -2,7 +2,7 @@
* OpenOffice.org 2.3.0rc1 (OOG680_m3)
* ooo-build:
- - update (r10186)
+ - update (r10187)
+ jvmfwk-gij-paths.diff: update for new gcj-4.2 packages
+ jawt-check-cleanup.diff: clenup jawt check to not expect -lgcj
(only needed with long obsolete libgcjawt). As we now only
@@ -23,8 +23,9 @@
- don't run dh_icons on etch backports
- remove PATH setting for icu tools, now handled by configure
- remove $(PATCHSET)64 handling, obsolete
+ - temporarily disable cy, as it breaks building sbasics help
- -- Rene Engelhard <[EMAIL PROTECTED]> Sat, 1 Sep 2007 18:17:53 +0200
+ -- Rene Engelhard <[EMAIL PROTECTED]> Sun, 2 Sep 2007 09:12:11 +0200
openoffice.org (1:2.3.0~oog680m2-1) experimental; urgency=medium
=== modified file 'control'
--- a/control 2007-08-31 20:09:13 +0000
+++ b/control 2007-09-02 07:15:29 +0000
@@ -728,33 +728,6 @@
install extra dictionaries/hyphenation patterns/thesauri independently of
the language packs.
-Package: openoffice.org-l10n-cy
-Architecture: all
-Depends: locales | belocs-locales-data | locales-all
-Recommends: openoffice.org-core (>> ${base-version}) | language-support-cy
-Provides: openoffice.org-l10n-${help-l10n-virtual-version},
openoffice.org2-l10n-cy
-Suggests: hunspell-dictionary-cy | myspell-dictionary-cy,
openoffice.org-hyphenation-cy, openoffice.org2-thesaurus-cy,
openoffice.org-help-cy
-Conflicts: openoffice.org-core (<< ${base-version}), openoffice.org-core (>=
${base-version}.1), openoffice.org2-l10n-cy
-Replaces: openoffice.org2-l10n-cy
-Description: Welsh 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
- Welsh.
- 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.
-
Package: openoffice.org-l10n-da
Architecture: all
Depends: locales | belocs-locales-data | locales-all
=== modified file 'rules'
--- a/rules 2007-09-01 16:20:30 +0000
+++ b/rules 2007-09-02 07:15:29 +0000
@@ -329,7 +329,7 @@
# 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 as-IN be-BY bg bn br bs ca cs cy da de dz el \
+ ISOS:=en-US af as-IN be-BY bg bn br bs ca cs 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 km ko ku lo lt lv mk ml-IN mr-IN nb ne nl nn nr ns or-IN pa-IN \
pl pt pt-BR ru rw sk sl sr-CS ss st sv \
@@ -338,7 +338,7 @@
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 \
+ LANGPACKISOS:=en-US af as-IN be-BY bg bn br bs ca cs 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 km ko ku lo lt lv mk ml-IN mr-IN nb ne nl nn nr ns or-IN pa-IN \
pl pt pt-BR ru rw sk sl sr-CS ss st sv \
@@ -830,7 +830,8 @@
-o -name '*.odp' -o -name "*.ods" -o -name '*.odt' \
-o -name '*.png' -o -name '*.ppt' -o -name '*.sx?' \
-o -name '*.wb2' -o -name '*.WB2' -o -name '*.xls' \
- -o -name '*.XLS' -o -name '*.xlsx' -o -name '*.xls.gz'
\) \
+ -o -name '*.XLS' -o -name '*.xlsx' -o -name '*.xls.gz' \
+ -o -name '*.xls.bz2' \) \
-exec rm {} \; ;\
fi
find ooo-build/scratch ooo-build/src -type f \
@@ -893,6 +894,7 @@
test/excel/*.xls \
test/excel/*.xlsx \
test/excel/*.xls.gz \
+ test/excel/*.xls.bz22 \
test/lotus/*.123 \
test/macro/*.ods \
test/macro/*.xls \
