------------------------------------------------------------
revno: 962
committer: Rene Engelhard <[EMAIL PROTECTED]>
branch nick: debian
timestamp: Fri 2007-11-23 16:12:26 +0100
message:
reenable cy langpack, more new dpkg-shlibdeps stuff
modified:
changelog
control
rules
=== modified file 'changelog'
--- a/changelog 2007-11-22 21:51:42 +0000
+++ b/changelog 2007-11-23 15:12:26 +0000
@@ -18,8 +18,9 @@
* debian/rules:
- add $(OOO_ARCHS) to the mesa builddeps
- fix build with new dpkg-dev
+ - reenable cy langpack
- -- Rene Engelhard <[EMAIL PROTECTED]> Thu, 22 Nov 2007 22:50:57 +0100
+ -- Rene Engelhard <[EMAIL PROTECTED]> Thu, 22 Nov 2007 23:59:17 +0100
openoffice.org (1:2.3.1~rc1-1) experimental; urgency=high
=== modified file 'control'
--- a/control 2007-11-22 10:48:13 +0000
+++ b/control 2007-11-23 15:12:26 +0000
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian OpenOffice Team <debian-openoffice@lists.debian.org>
Uploaders: Chris Halls <[EMAIL PROTECTED]>, Rene Engelhard <[EMAIL PROTECTED]>
-Build-Depends: lsb-release, bzip2, bison (>= 1:1.875a-1) [i386 powerpc sparc
amd64 ppc64], flex [i386 powerpc sparc amd64 ppc64], libpam0g-dev [i386 powerpc
sparc amd64 ppc64], libxaw7-dev [i386 powerpc sparc amd64 ppc64], unzip [i386
powerpc sparc amd64 ppc64], zip [i386 powerpc sparc amd64 ppc64], autoconf
[i386 powerpc sparc amd64 ppc64], sharutils [i386 powerpc sparc amd64 ppc64],
pkg-config [i386 powerpc sparc amd64 ppc64], xutils [i386 powerpc sparc amd64
ppc64], libfontconfig1-dev [i386 powerpc sparc amd64 ppc64], binutils (>=
2.14.90.0.6-3) [sparc], libc6 (>= 2.3.2-1) [powerpc], zlib1g-dev [i386 powerpc
sparc amd64 ppc64], libfreetype6-dev [i386 powerpc sparc amd64 ppc64],
libx11-dev [i386 powerpc sparc amd64 ppc64], libsm-dev [i386 powerpc sparc
amd64 ppc64], libxt-dev [i386 powerpc sparc amd64 ppc64], libxext-dev [i386
powerpc sparc amd64 ppc64], libice-dev [i386 powerpc sparc amd64 ppc64],
libsane-dev [i386 powerpc sparc amd64 ppc64], libxrender-dev [i386 powerpc
sparc amd64 ppc64], libcupsys2-dev [i386 powerpc sparc amd64 ppc64],
libarchive-zip-perl [i386 powerpc sparc amd64 ppc64],
libstartup-notification0-dev [i386 powerpc sparc amd64 ppc64], libpng12-dev
[i386 powerpc sparc amd64 ppc64], libjpeg62-dev [i386 powerpc sparc amd64
ppc64], libxml2-dev [i386 powerpc sparc amd64 ppc64], libldap2-dev [i386
powerpc sparc amd64 ppc64], libexpat1-dev [i386 powerpc sparc amd64 ppc64],
libgnomevfs2-dev [i386 powerpc sparc amd64 ppc64], fastjar [i386 powerpc sparc
amd64 ppc64], libsndfile1-dev [i386 powerpc sparc amd64 ppc64], xsltproc [i386
powerpc sparc amd64 ppc64], graphicsmagick [i386 powerpc sparc amd64 ppc64],
netpbm [i386 powerpc sparc amd64 ppc64], fdupes [i386 powerpc sparc amd64
ppc64], xml-core [i386 powerpc sparc amd64 ppc64], libxkbfile-dev [i386 powerpc
sparc amd64 ppc64], libxinerama-dev [i386 powerpc sparc amd64 ppc64],
x11proto-render-dev [i386 powerpc sparc amd64 ppc64], unixodbc-dev (>= 2.2.11)
[i386 powerpc sparc amd64 ppc64], libxml-parser-perl [i386 powerpc sparc amd64
ppc64], gperf [i386 powerpc sparc amd64 ppc64], libpq-dev [i386 powerpc sparc
amd64 ppc64] , dpkg-dev (>= 1.14.9) [i386 powerpc sparc amd64 ppc64] ,
libcurl4-gnutls-dev [i386 powerpc sparc amd64 ppc64] , libdb4.5-dev [i386
powerpc sparc amd64 ppc64] , python-central (>= 0.5) [i386 powerpc sparc amd64
ppc64], debhelper (>= 5.0.37.2) , python-dev (>= 2.4) [i386 powerpc sparc amd64
ppc64] , java-gcj-compat-dev (>= 1.0.76-7) [i386 powerpc sparc amd64 ppc64] ,
ant (>= 1.6.5) [i386 powerpc sparc amd64 ppc64] , libxt-java (>= 0.20050823)
[i386 powerpc sparc amd64 ppc64] , libxerces2-java [i386 powerpc sparc amd64
ppc64] , libxalan2-java (>= 2.6.0-1) [i386 powerpc sparc amd64 ppc64] , mingw32
[i386 powerpc sparc amd64 ppc64] , libjcommon-java (>= 1.0.10) [i386 powerpc
sparc amd64 ppc64], libsac-java [i386 powerpc sparc amd64 ppc64], libxml-java
[i386 powerpc sparc amd64 ppc64], libflute-1.3-jfree-java [i386 powerpc sparc
amd64 ppc64], libjfreereport-java (>= 0.9.0-05) [i386 powerpc sparc amd64
ppc64], liblayout-java [i386 powerpc sparc amd64 ppc64], libloader-java [i386
powerpc sparc amd64 ppc64], libformula-java [i386 powerpc sparc amd64 ppc64],
librepository-java [i386 powerpc sparc amd64 ppc64], libfonts-java (>= 0.2.6)
[i386 powerpc sparc amd64 ppc64], libjcommon-serializer-java [i386 powerpc
sparc amd64 ppc64] , libxul-dev [i386 powerpc sparc amd64 ppc64], libnss3-dev
[i386 powerpc sparc amd64 ppc64] , dmake (>= 1:4.7) [i386 powerpc sparc amd64
ppc64] , 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 ppc64] , libaltlinuxhyph-dev (>= 0.1.1-11) [i386 powerpc
sparc amd64 ppc64] , libstlport4.6-dev (>= 4.6.2-3) [i386] , libboost-dev [i386
powerpc sparc amd64 ppc64] , libvigraimpex-dev [i386 powerpc sparc amd64 ppc64]
, portaudio19-dev [i386 powerpc sparc amd64 ppc64] , libwpd8-dev (>= 0.8.3-3)
[i386 powerpc sparc amd64 ppc64] , libwps-dev [i386 powerpc sparc amd64 ppc64]
, libwpg-dev [i386 powerpc sparc amd64 ppc64] , libsvg-dev [i386 powerpc sparc
amd64 ppc64] , libicu-dev [i386 powerpc sparc amd64 ppc64] , libxslt1-dev [i386
powerpc sparc amd64 ppc64] , libcairo2-dev [i386 powerpc sparc amd64 ppc64] ,
kdelibs4-dev (>= 4:3.4.3-2) [i386 powerpc sparc amd64 ppc64] , libhsqldb-java
(>= 1.8.0.9-1) [i386 powerpc sparc amd64 ppc64] , bsh (>= 2.0b4-1) [i386
powerpc sparc amd64 ppc64] , liblpsolve55-dev (>= 5.5.0.10-4) [i386 powerpc
sparc amd64 ppc64], lp-solve (>= 5.5.0.10-4) [i386 powerpc sparc amd64 ppc64] ,
libsuitesparse-dev [i386 powerpc sparc amd64 ppc64] , libdbus-glib-1-dev (>=
0.60) [i386 powerpc sparc amd64 ppc64] , libgstreamer-plugins-base0.10-dev
[i386 powerpc sparc amd64 ppc64] , libneon27-gnutls-dev [i386 powerpc sparc
amd64 ppc64] , libgtk2.0-dev (>= 2.10) [i386 powerpc sparc amd64 ppc64]
+Build-Depends: lsb-release, bzip2, bison (>= 1:1.875a-1) [i386 powerpc sparc
amd64 ppc64], flex [i386 powerpc sparc amd64 ppc64], libpam0g-dev [i386 powerpc
sparc amd64 ppc64], libxaw7-dev [i386 powerpc sparc amd64 ppc64], unzip [i386
powerpc sparc amd64 ppc64], zip [i386 powerpc sparc amd64 ppc64], autoconf
[i386 powerpc sparc amd64 ppc64], sharutils [i386 powerpc sparc amd64 ppc64],
pkg-config [i386 powerpc sparc amd64 ppc64], xutils [i386 powerpc sparc amd64
ppc64], libfontconfig1-dev [i386 powerpc sparc amd64 ppc64], binutils (>=
2.14.90.0.6-3) [sparc], libc6 (>= 2.3.2-1) [powerpc], zlib1g-dev [i386 powerpc
sparc amd64 ppc64], libfreetype6-dev [i386 powerpc sparc amd64 ppc64],
libx11-dev [i386 powerpc sparc amd64 ppc64], libsm-dev [i386 powerpc sparc
amd64 ppc64], libxt-dev [i386 powerpc sparc amd64 ppc64], libxext-dev [i386
powerpc sparc amd64 ppc64], libice-dev [i386 powerpc sparc amd64 ppc64],
libsane-dev [i386 powerpc sparc amd64 ppc64], libxrender-dev [i386 powerpc
sparc amd64 ppc64], libcupsys2-dev [i386 powerpc sparc amd64 ppc64],
libarchive-zip-perl [i386 powerpc sparc amd64 ppc64],
libstartup-notification0-dev [i386 powerpc sparc amd64 ppc64], libpng12-dev
[i386 powerpc sparc amd64 ppc64], libjpeg62-dev [i386 powerpc sparc amd64
ppc64], libxml2-dev [i386 powerpc sparc amd64 ppc64], libldap2-dev [i386
powerpc sparc amd64 ppc64], libexpat1-dev [i386 powerpc sparc amd64 ppc64],
libgnomevfs2-dev [i386 powerpc sparc amd64 ppc64], fastjar [i386 powerpc sparc
amd64 ppc64], libsndfile1-dev [i386 powerpc sparc amd64 ppc64], xsltproc [i386
powerpc sparc amd64 ppc64], graphicsmagick [i386 powerpc sparc amd64 ppc64],
netpbm [i386 powerpc sparc amd64 ppc64], fdupes [i386 powerpc sparc amd64
ppc64], xml-core [i386 powerpc sparc amd64 ppc64], libxkbfile-dev [i386 powerpc
sparc amd64 ppc64], libxinerama-dev [i386 powerpc sparc amd64 ppc64],
x11proto-render-dev [i386 powerpc sparc amd64 ppc64], unixodbc-dev (>= 2.2.11)
[i386 powerpc sparc amd64 ppc64], libxml-parser-perl [i386 powerpc sparc amd64
ppc64], gperf [i386 powerpc sparc amd64 ppc64], libpq-dev [i386 powerpc sparc
amd64 ppc64] , dpkg-dev (>= 1.14.10) [i386 powerpc sparc amd64 ppc64] ,
libcurl4-gnutls-dev [i386 powerpc sparc amd64 ppc64] , libdb4.5-dev [i386
powerpc sparc amd64 ppc64] , python-central (>= 0.5) [i386 powerpc sparc amd64
ppc64], debhelper (>= 5.0.37.2) , python-dev (>= 2.4) [i386 powerpc sparc amd64
ppc64] , java-gcj-compat-dev (>= 1.0.76-7) [i386 powerpc sparc amd64 ppc64] ,
ant (>= 1.6.5) [i386 powerpc sparc amd64 ppc64] , libxt-java (>= 0.20050823)
[i386 powerpc sparc amd64 ppc64] , libxerces2-java [i386 powerpc sparc amd64
ppc64] , libxalan2-java (>= 2.6.0-1) [i386 powerpc sparc amd64 ppc64] , mingw32
[i386 powerpc sparc amd64 ppc64] , libjcommon-java (>= 1.0.10) [i386 powerpc
sparc amd64 ppc64], libsac-java [i386 powerpc sparc amd64 ppc64], libxml-java
[i386 powerpc sparc amd64 ppc64], libflute-1.3-jfree-java [i386 powerpc sparc
amd64 ppc64], libjfreereport-java (>= 0.9.0-05) [i386 powerpc sparc amd64
ppc64], liblayout-java [i386 powerpc sparc amd64 ppc64], libloader-java [i386
powerpc sparc amd64 ppc64], libformula-java [i386 powerpc sparc amd64 ppc64],
librepository-java [i386 powerpc sparc amd64 ppc64], libfonts-java (>= 0.2.6)
[i386 powerpc sparc amd64 ppc64], libjcommon-serializer-java [i386 powerpc
sparc amd64 ppc64] , libxul-dev [i386 powerpc sparc amd64 ppc64], libnss3-dev
[i386 powerpc sparc amd64 ppc64] , dmake (>= 1:4.7) [i386 powerpc sparc amd64
ppc64] , 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 ppc64] , libaltlinuxhyph-dev (>= 0.1.1-11) [i386 powerpc
sparc amd64 ppc64] , libstlport4.6-dev (>= 4.6.2-3) [i386] , libboost-dev [i386
powerpc sparc amd64 ppc64] , libvigraimpex-dev [i386 powerpc sparc amd64 ppc64]
, portaudio19-dev [i386 powerpc sparc amd64 ppc64] , libwpd8-dev (>= 0.8.3-3)
[i386 powerpc sparc amd64 ppc64] , libwps-dev [i386 powerpc sparc amd64 ppc64]
, libwpg-dev [i386 powerpc sparc amd64 ppc64] , libsvg-dev [i386 powerpc sparc
amd64 ppc64] , libicu-dev [i386 powerpc sparc amd64 ppc64] , libxslt1-dev [i386
powerpc sparc amd64 ppc64] , libcairo2-dev [i386 powerpc sparc amd64 ppc64] ,
kdelibs4-dev (>= 4:3.4.3-2) [i386 powerpc sparc amd64 ppc64] , libhsqldb-java
(>= 1.8.0.9-1) [i386 powerpc sparc amd64 ppc64] , bsh (>= 2.0b4-1) [i386
powerpc sparc amd64 ppc64] , liblpsolve55-dev (>= 5.5.0.10-4) [i386 powerpc
sparc amd64 ppc64], lp-solve (>= 5.5.0.10-4) [i386 powerpc sparc amd64 ppc64] ,
libsuitesparse-dev [i386 powerpc sparc amd64 ppc64] , libdbus-glib-1-dev (>=
0.60) [i386 powerpc sparc amd64 ppc64] , libgstreamer-plugins-base0.10-dev
[i386 powerpc sparc amd64 ppc64] , libneon27-gnutls-dev [i386 powerpc sparc
amd64 ppc64] , libgtk2.0-dev (>= 2.10) [i386 powerpc sparc amd64 ppc64]
Build-Conflicts: libcairo2 (= 1.4.8-1), libxul-dev (=
1.8.0.13~pre070720-0etch1), gjdoc (= 0.7.8-2), libc6-dev (= 2.6.1-3) [i386
amd64], libc6-dev (= 2.6.1-4) [i386 amd64], nvidia-glx-dev, libicu36-dev (<=
3.6-7), libicu-dev (<= 3.8-1)
Standards-Version: 3.7.2
XS-Python-Version: current
@@ -753,6 +753,33 @@
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-11-22 21:51:42 +0000
+++ b/rules 2007-11-23 15:12:26 +0000
@@ -66,8 +66,8 @@
CORE_TARBALL=$(TAG)-core.tar.bz2
SYSTEM_TARBALL=$(TAG)-system.tar.bz2
-#CORE_TARBALL=OOo_2.3.0_src_core.tar.bz2
-#SYSTEM_TARBALL=OOo_2.3.0_src_system.tar.bz2
+#CORE_TARBALL=OOo_2.3.1_src_core.tar.bz2
+#SYSTEM_TARBALL=OOo_2.3.1_src_system.tar.bz2
ifeq "$(DISTREL)" "etch"
ETCH_BACKPORT=y
@@ -283,7 +283,7 @@
ifeq "$(NEW_DPKG_SHLIBDEPS)" "y"
# new dpkg-dev with --ignore-missing-info, when not using it it
# fails with the new dpkg-shlibdeps
- BUILD_DEPS += , dpkg-dev (>= 1.14.9) [$(OOO_ARCHS)]
+ BUILD_DEPS += , dpkg-dev (>= 1.14.10) [$(OOO_ARCHS)]
SHLIBS_OVERRIDE= -- --ignore-missing-info
endif
@@ -359,7 +359,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 ar as-IN be-BY bg bn br bs ca cs da de dz el \
+ ISOS:=en-US af ar 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 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 \
@@ -368,7 +368,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 ar as-IN be-BY bg bn br bs ca cs da de dz el \
+ LANGPACKISOS:=en-US af ar 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 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 \
@@ -421,6 +421,11 @@
GCJ_JAWT_DEPENDS= libgcj$(LIBGCJ_SONR)-awt
endif
endif
+ ifeq "$(ETCH_BACKPORT)" "y"
+ GCJ_JAWT_DIR=/usr/lib/gcj-4.1
+ else
+ GCJ_JAWT_DIR=/usr/lib/gcj-4.2-81
+ endif
export JAVA_HOME
CONFIGURE_FLAGS += --with-jdk-home=$(JAVA_HOME)
JAVA_COMMON_DEPENDS= , openoffice.org$(VER)-java-common (>> 2.2.0-4)
@@ -2592,9 +2597,17 @@
ifeq "$(INTERNAL_STDLIBS)" "y"
cat debian/shlibs.override.stdlibs >> debian/shlibs.local
endif
- LD_LIBRARY_PATH="/usr/lib/libfakeroot:$(PKGDIR)-core/$(OODIR)/program" \
- dh_shlibdeps -s \
- -l$(PKGDIR)-core/$(OODIR)/program:/usr/lib/gcj-4.2-81 \
+ # we need to do it in two steps. The new dpkg-shlibdeps doesn't find
+ # /usr/lib/libgcj-bc.so when specifying -l/usr/lib/gcj-4.2-81
+ # and therefore we must not use it for -gcj. But we *do* need it
+ # for -officebean (libjawt.so is there)
+ LD_LIBRARY_PATH="/usr/lib/libfakeroot:$(PKGDIR)-core/$(OODIR)/program" \
+ dh_shlibdeps -s -Nopenoffice.org$(VER)-officebean \
+ -l$(PKGDIR)-core/$(OODIR)/program \
+ $(SHLIBS_OVERRIDE)
+ LD_LIBRARY_PATH="/usr/lib/libfakeroot:$(PKGDIR)-core/$(OODIR)/program" \
+ dh_shlibdeps -popenoffice.org$(VER)-officebean \
+ -l$(PKGDIR)-core/$(OODIR)/program:$(GCJ_JAWT_DIR) \
$(SHLIBS_OVERRIDE)
# this is in an extension (.zip), so dh_shlibdeps doesn't get it. We
need to do
# it manually.
