r796 ./packages/openofficeorg/2.2.1/unstable: 2.2.1-9 changes
------------------------------------------------------------
revno: 796
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Mon 2007-09-17 14:45:23 +0200
message:
2.2.1-9 changes
modified:
README.Debian
changelog
control
control.in
openoffice.org-impress.mime
rules
=== modified file 'README.Debian'
--- a/README.Debian 2007-07-27 10:50:19 +0000
+++ b/README.Debian 2007-09-17 12:45:23 +0000
@@ -108,13 +108,13 @@
Spellcheck dictionaries, Hyphenation patterns and Thesauri
----------------------------------------------------------
-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.
+Currently, there are dictionaries available for Afrikaans, Arabic, Armenian,
+Bulgarian, Catalan, Croatian, Czech, Danish, Dutch, English (AUS/GB/US),
+Esperanto, Estonian, Farsi, 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>).
=== modified file 'changelog'
--- a/changelog 2007-08-27 22:35:13 +0000
+++ b/changelog 2007-09-17 12:45:23 +0000
@@ -1,7 +1,43 @@
+openoffice.org (2.2.1-9) unstable; urgency=high
+
+ * ooo-build:
+ - update
+ + 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
+ have a dependency on libjawt.so which all supported JDKs have,
+ and don't have a dependency on a specific gcj lib anymore we
+ can just depend (or-ed) on all supported JDKs.
+ Closes: 441202. Indirectly closes: #439287
+ + sc-preserve-imp-opts.diff: fix order (closes: #403128), thanks
+ Nagy Elemer Karoly
+ + ucb-no-CURL_NO_OLDIES.diff: don't build with -DCURL_NO_OLDIES
+ (closes: #442338)
+ + itiff.diff: fix tiff heap overflow (CVE-2007-2834)
+ * merge from 2.3 branch:
+ - debian/control.in:
+ + Add XS-Vcs-{Bzr,Svn} fields
+ - debian/rules:
+ + BUILD_JARS_NATIVE=n until gcj-4.2 is unbroken
+ + add DBVER substition
+ - debian/README.Debian: mention myspell-hy, myspell-fa, hunspell-ar
+ - debian/openoffice.org-impress.mime: run Impress with -show for .pps
+ - debian/watch: add
+ * debian/rules:
+ - build-depend on libdb4.5-{dev,java} for sid - libdb4.4-java
+ is gone and the build-dep on it can't easily be removed in 2.2.1 (although
+ strictly not needed anymore) and fix libdbX.Y builddep to be in effect
+ for all OOo archs, not just Java archs (closes: #431786)
+ * debian/control.in: Build-Conflict against libc6-dev (= 2.6.1-3) and
+ libc6-dev (= 2.6.1-3) on i386/amd64 as sigcontext.h is broken
+ there.
+
+ -- Rene Engelhard <rene@debian.org> Sun, 16 Sep 2007 00:42:19 +0200
+
openoffice.org (2.2.1-8) unstable; urgency=medium
* ooo-build:
- - update (r10110
+ - update (r10110)
- ooo59127.vcl.honourcairofont.diff: fix for gdk hang. [CC]
(closes: #433870)
- cairo-canvas-ppc-fix.diff: fix endianness to fix yellow color in
=== modified file 'control'
--- a/control 2007-08-27 22:35:13 +0000
+++ b/control 2007-09-17 12:45:23 +0000
@@ -3,10 +3,12 @@
Priority: optional
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] , libwpg-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), libxul-dev (= 1.8.0.13~pre070720-0etch1), gjdoc (= 0.7.8-2)
+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], , libcurl4-gnutls-dev [i386 powerpc sparc amd64] , libdb4.5-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] , java-gcj-compat-dev (>= 1.0.56) [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.5-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] , libwpg-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), 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]
Standards-Version: 3.7.2
XS-Python-Version: current
+XS-Vcs-Bzr: http://bzr.debian.org/pkg-openoffice/packages/openofficeorg/2.2/unstable
+XS-Vcs-Svn: svn://svn.gnome.org/svn/ooo-build/branches/ooo-build-2-2
Package: openoffice.org
Architecture: i386 powerpc sparc amd64
@@ -381,7 +383,7 @@
Package: openoffice.org-officebean
Architecture: i386 powerpc sparc amd64
Section: misc
-Depends: openoffice.org-core (= ${Source-Version}), ${shlibs:Depends}, ${jawt-depends}, ${java-common-depends}
+Depends: openoffice.org-core (= ${Source-Version}), ${shlibs:Depends}, java-gcj-compat | ${gcj-jawt-depends} | sun-java5-bin | sun-java6-bin, ${java-common-depends}
Replaces: openoffice.org-common (<< 1.9.113-0pre1), openoffice.org2-officebean
Provides: openoffice.org2-officebean
Conflicts: openoffice.org2-officebean
@@ -3068,20 +3070,6 @@
For latest news on OpenOffice.org in Debian, see
http://openoffice.debian.net
-Package: openoffice.org-gcj
-Section: libs
-Architecture: i386 powerpc sparc amd64
-Depends: ${shlibs:Depends}, gij | java-gcj-compat, openoffice.org-core (= ${Source-Version}), openoffice.org-java-common (= ${source:Version}), ${java-gcj-depends}
-Enhances: openoffice.org-writer, openoffice.org-base
-Description: OpenOffice.orgs Java libraries (native for use with GIJ)
- OpenOffice.org is a full-featured office productivity suite that provides
- a near drop-in replacement for Microsoft(R) Office.
- .
- This package contains the .jars from openoffice.org-java-common compiled to
- native to make the Java features of OOo faster when using gij.
- .
- This package has NO effect with Suns/Blackdowns/IBMs/etc. JDK.
-
Package: libuno-cil
Architecture: i386 amd64
Depends: ${shlibs:Depends}, openoffice.org-core (>> ${base-version}), mono-gac, ${cli:Depends}
=== modified file 'control.in'
--- a/control.in 2007-08-27 22:35:13 +0000
+++ b/control.in 2007-09-17 12:45:23 +0000
@@ -47,11 +47,12 @@
libxinerama-dev [%OOO_ARCHS%],
x11proto-render-dev [%OOO_ARCHS%],
unixodbc-dev (>= 2.2.11) [%OOO_ARCHS%],
- libdb4.4-dev [%OOO_ARCHS%]
%BUILD_DEPS%
-Build-Conflicts: libcairo2 (= 1.4.8-1), libxul-dev (= 1.8.0.13~pre070720-0etch1), gjdoc (= 0.7.8-2)
+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]
Standards-Version: 3.7.2
XS-Python-Version: current
+XS-Vcs-Bzr: http://bzr.debian.org/pkg-openoffice/packages/openofficeorg/2.2/unstable
+XS-Vcs-Svn: svn://svn.gnome.org/svn/ooo-build/branches/ooo-build-2-2
Package: openoffice.orgVER
Architecture: %OOO_ARCHS%
@@ -614,7 +615,7 @@
Section: misc
Depends: openoffice.orgVER-core (= ${Source-Version}),
${shlibs:Depends},
- ${jawt-depends},
+ java-gcj-compat | ${gcj-jawt-depends} | sun-java5-bin | sun-java6-bin,
${java-common-depends}
Replaces: openoffice.orgVER-common (<< 1.9.113-0pre1), openoffice.org2-officebean
Provides: openoffice.org2-officebean
=== modified file 'openoffice.org-impress.mime'
--- a/openoffice.org-impress.mime 2007-07-30 12:10:34 +0000
+++ b/openoffice.org-impress.mime 2007-09-17 12:45:23 +0000
@@ -6,6 +6,6 @@
application/vnd.ms-powerpoint; soffice -impress '%s'; edit=soffice -impress '%s'; test=test "$DISPLAY" != ""; nametemplate=%s.ppt; description="Microsoft PowerPoint Document"; priority=3
application/x-mspowerpoint; soffice -impress '%s'; edit=soffice -impress '%s'; test=test "$DISPLAY" != ""; nametemplate=%s.ppt; description="Microsoft PowerPoint Document"; priority=3
application/mspowerpoint; soffice -impress '%s'; edit=soffice -impress '%s'; test=test "$DISPLAY" != ""; nametemplate=%s.pps; description="Microsoft PowerPoint Document"; priority=3
-application/vnd.ms-powerpoint; soffice -impress '%s'; edit=soffice -impress '%s'; test=test "$DISPLAY" != ""; nametemplate=%s.pps; description="Microsoft PowerPoint Document"; priority=3
+application/vnd.ms-powerpoint; soffice -impress -show '%s'; edit=soffice -impress '%s'; test=test "$DISPLAY" != ""; nametemplate=%s.pps; description="Microsoft PowerPoint Document"; priority=3
application/x-mspowerpoint; soffice -impress '%s'; edit=soffice -impress '%s'; test=test "$DISPLAY" != ""; nametemplate=%s.pps; description="Microsoft PowerPoint Document"; priority=3
=== modified file 'rules'
--- a/rules 2007-08-27 22:35:13 +0000
+++ b/rules 2007-09-17 12:45:23 +0000
@@ -80,7 +80,7 @@
PACKAGE_QA_TOOLS=y
PACKAGE_TTF_OPENSYMBOL=y
PACKAGE_NPSOPLUGIN=y
-BUILD_JARS_NATIVE=y
+BUILD_JARS_NATIVE=n
BUILD_BINFILTERS=y
BUILD_ONLY_EN_US=n
ENABLE_JAVA=y
@@ -130,6 +130,7 @@
RUN_SMOKETEST=n
USE_LIBCURL4=y
USE_LIBSUITESPARSE=y
+DBVER=4.5
# when we have a package we want to have to be installed on older things with some older
# C++ ABI (like it was the case with openoffice.org2), we need to set this. Don't touch
@@ -192,6 +193,7 @@
USE_LIBCURL4=n
USE_LIBSUITESPARSE=n
USE_SYSTEM_LIBWPG=n
+ DBVER=4.4
endif
#############
@@ -249,6 +251,8 @@
BUILD_DEPS += , libcurl3-gnutls-dev [$(OOO_ARCHS)]
endif
+ BUILD_DEPS += , libdb$(DBVER)-dev [$(OOO_ARCHS)]
+
ifneq "$(BUILD_DBG_PACKAGE)" "y"
SMALL_SYMBOLS = y
else
@@ -347,12 +351,12 @@
endif
DBG_DBG_SUGGESTS+= , libgcj$(LIBGCJ_SONR)-dbg
ifeq "$(shell dpkg --compare-versions `dpkg -l gcj-4.1 | tail -n 1 | awk '{ print $$3 }'` ge '4.1.2-3' && echo true || echo false)" "true"
- JAWT_DEPENDS= , libgcj$(LIBGCJ_SONR)-1-awt
+ GCJ_JAWT_DEPENDS= , libgcj$(LIBGCJ_SONR)-1-awt
else
ifeq "$(GCJ_VERSION)" "4.2"
- JAWT_DEPENDS= , libgcj$(LIBGCJ_SONR)-1-awt
+ GCJ_JAWT_DEPENDS= , libgcj$(LIBGCJ_SONR)-1-awt
else
- JAWT_DEPENDS= , libgcj$(LIBGCJ_SONR)-awt
+ GCJ_JAWT_DEPENDS= , libgcj$(LIBGCJ_SONR)-awt
endif
endif
export JAVA_HOME
@@ -384,7 +388,7 @@
CONFIGURE_FLAGS += --with-system-xml-apis
# xml-apis.jar is already a link in xalan, see above
endif
- BUILD_DEPS += , libdb4.4-java [$(OOO_JAVA_ARCHS)]
+ BUILD_DEPS += , libdb$(DBVER)-java [$(OOO_JAVA_ARCHS)]
ifeq "$(DIST)" "Debian"
BUILD_DEPS += , mingw32 [$(OOO_JAVA_ARCHS)]
CONFIGURE_FLAGS += --with-mingwin=i586-mingw32msvc-g++
@@ -2453,7 +2457,7 @@
-V'writer-pyuno-dep=$(WRITER_PYUNO_DEP)' \
-V'base-hsqldb-depends=$(BASE_HSQLDB_DEPENDS)' \
-V'java-common-depends=$(JAVA_COMMON_DEPENDS)' \
- -V'jawt-depends=$(JAWT_DEPENDS)' \
+ -V'gcj-jawt-depends=$(GCJ_JAWT_DEPENDS)' \
-V'java-gcj-depends=$(JAVA_GCJ_DEPENDS)' \
-V'mozilla-nss-depends=$(MOZILLA_NSS_DEPENDS)' \
-V'Binary-Version=$(BINARY_VERSION)' \
Reply to: