------------------------------------------------------------
revno: 1686
committer: Rene Engelhard <r...@debian.org>
branch nick: unstable
timestamp: Fri 2009-10-02 02:14:30 +0200
message:
fix lang= again *sigh*; use new external dict dirs
modified:
changelog
control
control.in
rules
=== modified file 'changelog'
--- a/changelog 2009-09-30 15:26:05 +0000
+++ b/changelog 2009-10-02 00:14:30 +0000
@@ -20,7 +20,10 @@
not installed
- remove bogus (.*på engelsk) from GSI_da to fix some functions
(closes: #548608)
- - fix build with > 2 languages in lang=
+ - fix lang= handling for DEB_BUILD_OPTIONS
+ - point --with-external-{dict,hyph,thes}-dir to the new locations
+ * debian/control.in: break dict/hyphen patterns/thesauri packages
+ with the old location
* debian/control.mysql.in: remove bogus conflicts, add Homepage:
* debian/shell-lib.sh:
- check whether OOo is running before (de-)registering extensions or
=== modified file 'control'
--- a/control 2009-09-30 15:26:05 +0000
+++ b/control 2009-10-02 00:14:30 +0000
@@ -100,6 +100,7 @@
Architecture: i386 powerpc mips mipsel armel s390 m68k amd64 ia64 ppc64 s390x
Depends: openoffice.org-common (>> ${base-version}), ttf-opensymbol,
${shlibs:Depends}, fontconfig, ${mozilla-nss-depends}, ${misc:Depends}
Conflicts: openoffice.org-thesaurus, openoffice.org-l10n-1.9.108,
openoffice.org-l10n-1.9.114, openoffice.org-l10n-1.9.121,
openoffice.org-1.9.125, oooqs-kde, ooqstart-gnome, openoffice.org-help-de (<<
2.0), openoffice.org-help-en (<< 2.0), openoffice.org-help-el (<< 2.0),
openoffice.org-help-es (<< 2.0), openoffice.org-help-fr (<< 2.0),
openoffice.org-help-it (<< 2.0), openoffice.org-help-ja (<< 2.0),
openoffice.org-help-ko (<< 2.0), openoffice.org-help-pt-br (<< 2.0),
openoffice.org-help-sv (<< 2.0), openoffice.org-help-tr (<< 2.0),
openoffice.org-help-zh-cn (<< 2.0), openoffice.org-help-zh-tw (<< 2.0),
openoffice.org-help-2.0.0, openoffice.org-help-2.0.1,
openoffice.org-help-2.0.2, openoffice.org-help-2.0.3, openoffice.org-bin,
openoffice.org2-core, openoffice.org-crashrep, openoffice.org2-hunspell,
openoffice.org-hunspell, openoffice.org-core (<< ${binary:Version}),
openoffice.org-calc (<< ${binary:Version}), openoffice.org-writer (<<
${binary:Version}), openoffice.org-impress (<< ${binary:Version}),
openoffice.org-draw (<< ${binary:Version}), openoffice.org-base (<<
${binary:Version}), openoffice.org-gtk (<< ${binary:Version}),
openoffice.org-gnome (<< ${binary:Version}), openoffice.org-kde (<<
${binary:Version}), openoffice.org-evolution (<< ${binary:Version}),
openoffice.org-filter-so52 (<< ${binary:Version}), openoffice.org-officebean
(<< ${binary:Version}), openoffice.org-dev (<< ${binary:Version}), libcairo2 (=
1.4.8-1), libicu38 (= 3.8~d01-1), cli-uno-bridge (<< 1:3.0.0~dev300m22),
openoffice.org-qa-ui-tests (<< ${base-version}), openoffice.org-qa-ui-tests (>=
${base-version}.1), cacao-oj6-jre, mozilla-plugin-vlc (<< 1.0)
+Breaks: myspell-ru (<< 0.99g5-8.1), myspell-lv (<< 0.7.3-3.1), myspell-et (<<
1:20030606-12.1), myspell-fi (<< 0.7-17.2), myspell-cs-cz, myspell-el-gr (<<
0.3-1.1), myspell-nn (<< 2.0.10-3.1), myspell-nb (<< 2.0.10-3.1), hunspell-ar
(<< 0.0.0+20080110-1.1), myspell-hu (<< 0.99.4-1.2), hunspell-gl-es (<<
2.2a-6), myspell-gv (<< 0.50-8), myspell-en-au (<< 2.1-5), myspell-fa (<<
0.20070816-2), hunspell-uz (<< 0.6-3.1), hunspell-ko (<< 0.3.3-1), hunspell-se
(<< 1.0~beta6.20081222-1.1), hunspell-de-med (<< 20090825-1), hunspell-en-us
(<< 20070829-3), myspell-sv-se (<< 1.3.8-6-2.2), myspell-sk (<< 0.5.5a-2.1),
myspell-fo (<< 0.2.36-3), myspell-nl (<< 1:1.10-3), myspell-pt-br (<<
2009.03.30-1.1), myspell-pl (<< 20090830-1), myspell-pt-pt (<< 20090309-1.1),
myspell-ga (<< 2.0-19), myspell-gd (<< 0.50-7), myspell-ku (<< 0.20.0-1.1),
myspell-hr (<< 20060617-2), myspell-fr-gut (<< 1:1.0-26.1), myspell-eo (<<
2.1.2000.02.25-41), myspell-de-de-oldspell (<< 1:2-25.1), myspell-da (<<
1.6.18-1.1), myspell-es (<< 1.10-7), myspell-de-at (<< 20071211-2),
myspell-de-ch (<< 20071211-2), myspell-de-de (<< 20071211-2), hunspell-de-at
(<< 20071211-2), hunspell-de-ch (<< 20071211-2), hunspell-de-de (<<
20071211-2), myspell-ca (<< 0.6-8), myspell-tl (<< 0.4-0-5), myspell-ne (<<
1.0-4.1), myspell-fr (<< 1.4-25), myspell-hy (<< 0.10.1-1.1), myspell-en-us (<<
1:3.1.0-3), myspell-en-gb (<< 1:3.1.0-3), myspell-en-za (<< 1:3.1.0-3),
myspell-af (<< 1:3.1.0-3), myspell-it (<< 1:3.1.0-3), myspell-sw (<<
1:3.1.0-3), myspell-th (<< 1:3.1.0-3), hunspell-en-ca (<< 1:3.1.0-3),
hunspell-ne (<< 1:3.1.0-3), hunspell-da (<< 1:3.1.0-3), hunspell-fr (<<
1:3.1.0-3), hunspell-vi (<< 1:3.1.0-3), hunspell-hu (<< 1:3.1.0-3), hunspell-sr
(<< 1:3.1.0-3), hunspell-sh (<< 1:3.1.0-3), myspell-lv (<< 0.7.3-3.1),
myspell-et (<< 1:20030606-12.1), myspell-nn (<< 2.0.10-3.1), myspell-nb (<<
2.0.10-3.1), openoffice.org-hyphenation-hr (<< 20060617-2),
openoffice.org-hyphenation-pl (<< 1:3.0a-3), openoffice.org-hyphenation-sh (<<
1:3.1.0-3), openoffice.org-hyphenation-sr (<< 1:3.1.0-3),
openoffice.org-hyphenation-de (<< 1:3.1.0-3), openoffice.org-hyphenation-hu (<<
1:3.1.0-3), openoffice.org-hyphenation-it (<< 1:3.1.0-3),
openoffice.org-hyphenation-sl (<< 1:3.1.0-3), openoffice.org-hyphenation-af (<<
1:3.1.0-3), openoffice.org-hyphenation-zu (<< 1:3.1.0-3),
openoffice.org-hyphenation-fr (<< 1:3.1.0-3), openoffice.org-thesaurus-it (<<
2.0.7.gh.deb1-1.1), openoffice.org-thesaurus-en-au (<< 2.1-5),
openoffice.org-thesaurus-pl (<< 1.5-3), openoffice.org-thesaurus-en-us (<<
1:3.1.0-3), openoffice.org-thesaurus-cs (<< 1:3.1.0-3),
openoffice.org-thesaurus-sk (<< 1:3.1.0-3), openoffice.org-thesaurus-ru (<<
1:3.1.0-3), openoffice.org-thesaurus-ne (<< 1:3.1.0-3),
openoffice.org-thesaurus-hu (<< 1:3.1.0-3), openoffice.org-thesaurus-fr (<<
1:3.1.0-3)
Provides: openoffice.org-bundled, openoffice.org2-core, openoffice.org-java,
openoffice.org2-hunspell, openoffice.org-hunspell
Replaces: openoffice.org-bin, openoffice.org (<< 1.9), openoffice.org-gtk (<<
2.0.3+2.0.4m179), openoffice.org2-core, openoffice.org-java,
openoffice.org2-hunspell, openoffice.org-hunspell, openoffice.org-common (<<
1:3.0.1~rc1-2), openoffice.org-calc (<< 2.2.1~oof680m15-2),
openoffice.org-headless (<< 1:3.0.0~dev300m26), openoffice.org-filter-binfilter
(<< 1:3.1.0-5)
Description: full-featured office productivity suite -- arch-dependent files
=== modified file 'control.in'
--- a/control.in 2009-09-29 11:08:34 +0000
+++ b/control.in 2009-10-02 00:14:30 +0000
@@ -233,6 +233,7 @@
openoffice.org-qa-ui-tests (>= ${base-version}.1),
cacao-oj6-jre,
mozilla-plugin-vlc (<< 1.0)
+Breaks: myspell-ru (<< 0.99g5-8.1), myspell-lv (<< 0.7.3-3.1), myspell-et (<<
1:20030606-12.1), myspell-fi (<< 0.7-17.2), myspell-cs-cz, myspell-el-gr (<<
0.3-1.1), myspell-nn (<< 2.0.10-3.1), myspell-nb (<< 2.0.10-3.1), hunspell-ar
(<< 0.0.0+20080110-1.1), myspell-hu (<< 0.99.4-1.2), hunspell-gl-es (<<
2.2a-6), myspell-gv (<< 0.50-8), myspell-en-au (<< 2.1-5), myspell-fa (<<
0.20070816-2), hunspell-uz (<< 0.6-3.1), hunspell-ko (<< 0.3.3-1), hunspell-se
(<< 1.0~beta6.20081222-1.1), hunspell-de-med (<< 20090825-1), hunspell-en-us
(<< 20070829-3), myspell-sv-se (<< 1.3.8-6-2.2), myspell-sk (<< 0.5.5a-2.1),
myspell-fo (<< 0.2.36-3), myspell-nl (<< 1:1.10-3), myspell-pt-br (<<
2009.03.30-1.1), myspell-pl (<< 20090830-1), myspell-pt-pt (<< 20090309-1.1),
myspell-ga (<< 2.0-19), myspell-gd (<< 0.50-7), myspell-ku (<< 0.20.0-1.1),
myspell-hr (<< 20060617-2), myspell-fr-gut (<< 1:1.0-26.1), myspell-eo (<<
2.1.2000.02.25-41), myspell-de-de-oldspell (<< 1:2-25.1), myspell-da (<<
1.6.18-1.1), myspell-es (<< 1.10-7), myspell-de-at (<< 20071211-2),
myspell-de-ch (<< 20071211-2), myspell-de-de (<< 20071211-2), hunspell-de-at
(<< 20071211-2), hunspell-de-ch (<< 20071211-2), hunspell-de-de (<<
20071211-2), myspell-ca (<< 0.6-8), myspell-tl (<< 0.4-0-5), myspell-ne (<<
1.0-4.1), myspell-fr (<< 1.4-25), myspell-hy (<< 0.10.1-1.1), myspell-en-us (<<
1:3.1.0-3), myspell-en-gb (<< 1:3.1.0-3), myspell-en-za (<< 1:3.1.0-3),
myspell-af (<< 1:3.1.0-3), myspell-it (<< 1:3.1.0-3), myspell-sw (<<
1:3.1.0-3), myspell-th (<< 1:3.1.0-3), hunspell-en-ca (<< 1:3.1.0-3),
hunspell-ne (<< 1:3.1.0-3), hunspell-da (<< 1:3.1.0-3), hunspell-fr (<<
1:3.1.0-3), hunspell-vi (<< 1:3.1.0-3), hunspell-hu (<< 1:3.1.0-3), hunspell-sr
(<< 1:3.1.0-3), hunspell-sh (<< 1:3.1.0-3), myspell-lv (<< 0.7.3-3.1),
myspell-et (<< 1:20030606-12.1), myspell-nn (<< 2.0.10-3.1), myspell-nb (<<
2.0.10-3.1), openoffice.org-hyphenation-hr (<< 20060617-2),
openoffice.org-hyphenation-pl (<< 1:3.0a-3), openoffice.org-hyphenation-sh (<<
1:3.1.0-3), openoffice.org-hyphenation-sr (<< 1:3.1.0-3),
openoffice.org-hyphenation-de (<< 1:3.1.0-3), openoffice.org-hyphenation-hu (<<
1:3.1.0-3), openoffice.org-hyphenation-it (<< 1:3.1.0-3),
openoffice.org-hyphenation-sl (<< 1:3.1.0-3), openoffice.org-hyphenation-af (<<
1:3.1.0-3), openoffice.org-hyphenation-zu (<< 1:3.1.0-3),
openoffice.org-hyphenation-fr (<< 1:3.1.0-3), openoffice.org-thesaurus-it (<<
2.0.7.gh.deb1-1.1), openoffice.org-thesaurus-en-au (<< 2.1-5),
openoffice.org-thesaurus-pl (<< 1.5-3), openoffice.org-thesaurus-en-us (<<
1:3.1.0-3), openoffice.org-thesaurus-cs (<< 1:3.1.0-3),
openoffice.org-thesaurus-sk (<< 1:3.1.0-3), openoffice.org-thesaurus-ru (<<
1:3.1.0-3), openoffice.org-thesaurus-ne (<< 1:3.1.0-3),
openoffice.org-thesaurus-hu (<< 1:3.1.0-3), openoffice.org-thesaurus-fr (<<
1:3.1.0-3)
Provides: openoffice.orgVER-bundled,
openoffice.org2-core,
openoffice.org-java,
=== modified file 'rules'
--- a/rules 2009-09-30 15:26:05 +0000
+++ b/rules 2009-10-02 00:14:30 +0000
@@ -245,6 +245,9 @@
ENABLE_MYSQLNATIVE=y
USE_SYSTEM_MYSQLCLIENT=y
USE_SYSTEM_MYSQLCPPCONN=y
+DICT_DIR=/usr/share/hunspell
+HYPH_DIR=/usr/share/hyphen
+THES_DIR=/usr/share/mythes
# Default flags to pass to configure of ooo-build
CONFIGURE_FLAGS= --disable-post-install-scripts \
@@ -262,9 +265,6 @@
--libdir=/usr/lib \
--host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
--with-system-dicts \
- --with-external-dict-dir=/usr/share/myspell/dicts \
- --with-external-hyph-dir=/usr/share/myspell/dicts \
- --with-external-thes-dir=/usr/share/myspell/dicts \
--with-additional-sections="$(ADDITIONAL_SECTIONS)"
ifneq "$(BUILD_ONLY_EN_US)" "y"
@@ -323,6 +323,9 @@
ifneq (,$(findstring kfreebsd,$(ARCH)))
JDK=java-gcj-compat-dev
endif
+ DICT_DIR=/usr/share/myspell/dicts
+ HYPH_DIR=/usr/share/myspell/dicts
+ THES_DIR=/usr/share/myspell/dicts
endif
#############
@@ -610,9 +613,9 @@
ifneq "$(BUILD_ONLY_EN_US)" "y"
ifeq (lang=,$(findstring lang=,$(DEB_BUILD_OPTIONS)))
- ISOS=$(shell echo "$(DEB_BUILD_OPTIONS) " | sed -n
's/^.*lang=\([^\s]*\)\s.*/\1/p' | awk '{ print $$1 }' | sed -e 's/,/ /g')
- HELPISOS=$(shell echo "$(DEB_BUILD_OPTIONS) " | sed -n
's/^.*lang=\([^\s]*\)\s.*/\1/p' | awk '{ print $$1 }' | sed -e 's/,/ /g')
- LANGPACKISOS=$(shell echo "$(DEB_BUILD_OPTIONS) " | sed -n
's/^.*lang=\([^\s]*\)\s.*/\1/p' | awk '{ print $$1 }' | sed -e 's/,/ /g')
+ ISOS=$(shell echo "$(DEB_BUILD_OPTIONS) " | sed -n
's/^.*lang=\([^\s].*\)\s.*/\1/p' | awk '{ print $$1 }' | sed -e 's/,/ /g')
+ HELPISOS=$(shell echo "$(DEB_BUILD_OPTIONS) " | sed -n
's/^.*lang=\([^\s].*\)\s.*/\1/p' | awk '{ print $$1 }' | sed -e 's/,/ /g')
+ LANGPACKISOS=$(shell echo "$(DEB_BUILD_OPTIONS) " | sed -n
's/^.*lang=\([^\s].*\)\s.*/\1/p' | awk '{ print $$1 }' | sed -e 's/,/ /g')
else
# Note that the first one here *has to be* en-US. the first one gets
# gid_Module_Root as filelist later and the rest gid_Module_Root.$iso
@@ -814,6 +817,7 @@
BUILD_DEPS += , libhunspell-dev $(HUNSPELL_MIN_VER)
CONFIGURE_FLAGS+= --with-system-hunspell
endif
+ CONFIGURE_FLAGS += --with-external-dict-dir=$(DICT_DIR)
ifeq "$(SYSTEM_ALTLINUXHYPH)" "y"
ifeq "$(USE_LIBHYPHEN)" "y"
@@ -823,6 +827,7 @@
endif
CONFIGURE_FLAGS += --with-system-altlinuxhyph
endif
+ CONFIGURE_FLAGS += --with-external-hyph-dir=$(HYPH_DIR)
ifeq "$(USE_AGG)" "y"
CONFIGURE_FLAGS+= --with-agg
@@ -889,6 +894,7 @@
CONFIGURE_FLAGS += --with-system-libwpg
endif
endif
+ CONFIGURE_FLAGS += --with-external-thes-dir=$(THES_DIR)
ifeq "$(USE_SYSTEM_ICU)" "y"
BUILD_DEPS += , libicu-dev $(ICU_MINVER)
@@ -1553,6 +1559,10 @@
perl -pi -e 's/GConf backend$$/GConf backend\n *
openoffice.org$(VER)-kde: KDE UI Plugin and KDE File Picker support/'
debian/control
endif
+ifneq "$(DICT_DIR)" "/usr/share/hunspell"
+ perl -pi -e 's/^Breaks:.*myspell*\n//' debian/control
+endif
+
.DELETE_ON_ERROR: debian/control
build: build-arch build-indep
