------------------------------------------------------------
revno: 1062
committer: Rene Engelhard <[EMAIL PROTECTED]>
branch nick: debian
timestamp: Mon 2008-04-14 12:30:53 +0200
message:
disable Java and Mozilla on armel; fix extension descriptions; ooo-build
update; close #475987
modified:
changelog
control
control.in
control.reportdesign.in
rules
=== modified file 'changelog'
--- a/changelog 2008-04-13 13:27:54 +0000
+++ b/changelog 2008-04-14 10:30:53 +0000
@@ -1,7 +1,7 @@
openoffice.org (1:2.4.0-3.4pre) unstable; urgency=medium
* ooo-build:
- - update (r12153)
+ - update (r12156)
+ disables cjk-character-units-*.diff as they cause some problems
(closes: #474028)
+ emf+-canvas-vcl-non-closed-polygon.diff: fixed invalid access
@@ -12,15 +12,19 @@
- src: update GSIs from ftp.linux.cz: bg da et fi ga mk nb nn
* debian/rules:
- handle new aotcompile.py location in java-gcj-compat-dev due to
- python-central >= 0.6
+ python-central >= 0.6 (closes: #475987)
- bump libstlport4.6-dev builddep to ensure building against
libstlport4.6ldbl
- reenable system-hunspell
- bump libhyphen0 dep to 2.3-1-3
- set MOZILLA= when arch not in OOO_MOZILLA_ARCHS
- fix OOO_OGLTRANS_ARCHS conditional
+ - disable Java (OOM) and mozilla (no xulrunner/nss/nspr available yet)
+ on armel
* debian/rules, ooo-build/patches/src680/configures-explicit-arch.diff:
explicitely specify --host and --build (closes: #475037)
+ * debian/control.in, debian/control.reportdesign.in: Fix long
+ description, thanks Gerfried Fuchs (closes: #475992)
* merge from Ubuntu:
- debian/*.mime:
+ Update and sort mime-types.
@@ -29,7 +33,7 @@
- debian/control.reportdesign.in:
+ change %OOO_ARCHS% to %OOO_JAVA_ARCHS%
- -- Rene Engelhard <[EMAIL PROTECTED]> Fri, 11 Apr 2008 10:21:07 +0200
+ -- Rene Engelhard <[EMAIL PROTECTED]> Mon, 14 Apr 2008 12:23:51 +0200
openoffice.org (1:2.4.0-3) unstable; urgency=low
=== modified file 'control'
--- a/control 2008-04-06 23:04:53 +0000
+++ b/control 2008-04-14 10:30:53 +0000
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian OpenOffice Team <[email protected]>
Uploaders: Chris Halls <[EMAIL PROTECTED]>, Rene Engelhard <[EMAIL PROTECTED]>
-Build-Depends: lsb-release, bzip2, bison (>= 1:1.875a-1) [i386 powerpc sparc
mips mipsel armel s390 amd64 ppc64 ia64], flex-old [i386 powerpc sparc mips
mipsel armel s390 amd64 ppc64 ia64], libpam0g-dev [i386 powerpc sparc mips
mipsel armel s390 amd64 ppc64 ia64], libxaw7-dev [i386 powerpc sparc mips
mipsel armel s390 amd64 ppc64 ia64], unzip [i386 powerpc sparc mips mipsel
armel s390 amd64 ppc64 ia64], zip [i386 powerpc sparc mips mipsel armel s390
amd64 ppc64 ia64], autoconf [i386 powerpc sparc mips mipsel armel s390 amd64
ppc64 ia64], sharutils [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64
ia64], pkg-config [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64],
xutils [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64],
libfontconfig1-dev [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64
ia64], binutils (>= 2.14.90.0.6-3) [sparc], libc6 (>= 2.3.2-1) [powerpc],
zlib1g-dev [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64],
libfreetype6-dev [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64],
libx11-dev [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64],
libsm-dev [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64],
libxt-dev [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64],
libxext-dev [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64],
libxtst-dev [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64],
libice-dev [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64],
libsane-dev [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64],
libxrender-dev [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64],
libcupsys2-dev [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64],
libarchive-zip-perl [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64
ia64], libpng12-dev [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64
ia64], libjpeg62-dev [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64
ia64], libxml2-dev [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64
ia64], libldap2-dev [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64
ia64], libexpat1-dev [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64
ia64], libgnomevfs2-dev [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64
ia64], fastjar [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64],
xsltproc [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64],
graphicsmagick-imagemagick-compat [i386 powerpc sparc mips mipsel armel s390
amd64 ppc64 ia64], netpbm [i386 powerpc sparc mips mipsel armel s390 amd64
ppc64 ia64], fdupes [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64
ia64], xml-core [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64],
libxkbfile-dev [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64],
libxinerama-dev [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64],
x11proto-render-dev [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64
ia64], unixodbc-dev (>= 2.2.11) [i386 powerpc sparc mips mipsel armel s390
amd64 ppc64 ia64], libxml-parser-perl [i386 powerpc sparc mips mipsel armel
s390 amd64 ppc64 ia64], gperf [i386 powerpc sparc mips mipsel armel s390 amd64
ppc64 ia64], libpq-dev [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64
ia64] , g++ (>> 4.3.0) [s390], gcc (>> 4.3.0) [s390] , dpkg-dev (>= 1.14.11)
[i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64] , libgl1-mesa-dev
[i386 powerpc sparc s390 amd64 ppc64 ia64], libglu1-mesa-dev [i386 powerpc
sparc s390 amd64 ppc64 ia64] , libcurl4-openssl-dev [i386 powerpc sparc mips
mipsel armel s390 amd64 ppc64 ia64] , libssl-dev [i386 powerpc sparc mips
mipsel armel s390 amd64 ppc64 ia64] , libdb4.6-dev [i386 powerpc sparc mips
mipsel armel s390 amd64 ppc64 ia64] , python-central (>= 0.5) [i386 powerpc
sparc mips mipsel armel s390 amd64 ppc64 ia64] , python-dev (>= 2.4) [i386
powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64] , debhelper (>= 5.0.51~)
, java-gcj-compat-dev (>= 1.0.65-4) [i386 powerpc sparc mips mipsel armel s390
amd64 ppc64 ia64], libgcj-bc [i386 powerpc sparc mips mipsel armel s390 amd64
ppc64 ia64] , ant (>= 1.6.5) [i386 powerpc sparc mips mipsel armel s390 amd64
ppc64 ia64] , libxerces2-java [i386 powerpc sparc mips mipsel armel s390 amd64
ppc64 ia64] , libxalan2-java (>= 2.6.0-1) [i386 powerpc sparc mips mipsel armel
s390 amd64 ppc64 ia64] , mingw32 [i386 powerpc sparc mips mipsel armel s390
amd64 ppc64 ia64] , libjcommon-java (>= 1.0.10) [i386 powerpc sparc mips mipsel
armel s390 amd64 ppc64 ia64], libsac-java [i386 powerpc sparc mips mipsel armel
s390 amd64 ppc64 ia64], libxml-java [i386 powerpc sparc mips mipsel armel s390
amd64 ppc64 ia64], libflute-1.3-jfree-java [i386 powerpc sparc mips mipsel
armel s390 amd64 ppc64 ia64], libpentaho-reporting-flow-engine-java [i386
powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64], liblayout-java [i386
powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64], libloader-java [i386
powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64], libformula-java [i386
powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64], librepository-java
[i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64], libfonts-java (>=
0.2.6) [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64],
libjcommon-serializer-java [i386 powerpc sparc mips mipsel armel s390 amd64
ppc64 ia64] , libxul-dev [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64
ia64], libnss3-dev [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64]
, dmake (>= 1:4.11) [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64
ia64] , mono-mcs (>= 1.2.3) [i386 sparc amd64 ia64], mono-gmcs (>= 1.2.3) [i386
sparc amd64 ia64], libmono-dev (>= 1.2.3) [i386 sparc amd64 ia64], mono-utils
(>= 1.2.3) [i386 sparc amd64 ia64], cli-common-dev (>= 0.4.4) [i386 sparc amd64
ia64], mono-1.0-devel [i386 sparc amd64 ia64], mono-2.0-devel [i386 sparc amd64
ia64] , libhunspell-dev (>= 1.1.5-2) [i386 powerpc sparc mips mipsel armel s390
amd64 ppc64 ia64] , libhyphen-dev (>= 2.3-3) [i386 powerpc sparc mips mipsel
armel s390 amd64 ppc64 ia64] , libstlport4.6-dev (>= 4.6.2-3.1) [i386] ,
libboost-dev [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64] ,
libvigraimpex-dev [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64]
, libwpd8-dev (>= 0.8.3-3) [i386 powerpc sparc mips mipsel armel s390 amd64
ppc64 ia64] , libwps-dev [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64
ia64] , libwpg-dev [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64]
, libicu-dev [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64] ,
libxslt1-dev [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64] ,
libcairo2-dev [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64] ,
kdelibs4-dev (>= 4:3.4.3-2) [i386 powerpc sparc mips mipsel armel s390 amd64
ppc64 ia64] , libhsqldb-java (>= 1.8.0.9-1) [i386 powerpc sparc mips mipsel
armel s390 amd64 ppc64 ia64] , bsh (>= 2.0b4-1) [i386 powerpc sparc mips mipsel
armel s390 amd64 ppc64 ia64] , liblpsolve55-dev (>= 5.5.0.10-10) [i386 powerpc
sparc mips mipsel s390 amd64 ppc64 ia64], lp-solve (>= 5.5.0.10-10) [i386
powerpc sparc mips mipsel s390 amd64 ppc64 ia64] , libsuitesparse-dev (>>
3.1.0) [i386 powerpc sparc mips mipsel s390 amd64 ppc64 ia64] ,
libdbus-glib-1-dev (>= 0.60) [i386 powerpc sparc mips mipsel armel s390 amd64
ppc64 ia64] , libgstreamer-plugins-base0.10-dev [i386 powerpc sparc mips mipsel
armel s390 amd64 ppc64 ia64] , libneon27-dev [i386 powerpc sparc mips mipsel
armel s390 amd64 ppc64 ia64] , libgtk2.0-dev (>= 2.10) [i386 powerpc sparc mips
mipsel armel s390 amd64 ppc64 ia64]
+Build-Depends: lsb-release, bzip2, bison (>= 1:1.875a-1) [i386 powerpc sparc
mips mipsel armel s390 amd64 ppc64 ia64], flex-old [i386 powerpc sparc mips
mipsel armel s390 amd64 ppc64 ia64], libpam0g-dev [i386 powerpc sparc mips
mipsel armel s390 amd64 ppc64 ia64], libxaw7-dev [i386 powerpc sparc mips
mipsel armel s390 amd64 ppc64 ia64], unzip [i386 powerpc sparc mips mipsel
armel s390 amd64 ppc64 ia64], zip [i386 powerpc sparc mips mipsel armel s390
amd64 ppc64 ia64], autoconf [i386 powerpc sparc mips mipsel armel s390 amd64
ppc64 ia64], sharutils [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64
ia64], pkg-config [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64],
xutils [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64],
libfontconfig1-dev [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64
ia64], binutils (>= 2.14.90.0.6-3) [sparc], libc6 (>= 2.3.2-1) [powerpc],
zlib1g-dev [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64],
libfreetype6-dev [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64],
libx11-dev [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64],
libsm-dev [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64],
libxt-dev [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64],
libxext-dev [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64],
libxtst-dev [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64],
libice-dev [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64],
libsane-dev [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64],
libxrender-dev [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64],
libcupsys2-dev [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64],
libarchive-zip-perl [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64
ia64], libpng12-dev [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64
ia64], libjpeg62-dev [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64
ia64], libxml2-dev [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64
ia64], libldap2-dev [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64
ia64], libexpat1-dev [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64
ia64], libgnomevfs2-dev [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64
ia64], fastjar [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64],
xsltproc [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64],
graphicsmagick-imagemagick-compat [i386 powerpc sparc mips mipsel armel s390
amd64 ppc64 ia64], netpbm [i386 powerpc sparc mips mipsel armel s390 amd64
ppc64 ia64], fdupes [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64
ia64], xml-core [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64],
libxkbfile-dev [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64],
libxinerama-dev [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64],
x11proto-render-dev [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64
ia64], unixodbc-dev (>= 2.2.11) [i386 powerpc sparc mips mipsel armel s390
amd64 ppc64 ia64], libxml-parser-perl [i386 powerpc sparc mips mipsel armel
s390 amd64 ppc64 ia64], gperf [i386 powerpc sparc mips mipsel armel s390 amd64
ppc64 ia64], libpq-dev [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64
ia64] , g++ (>> 4.3.0) [s390], gcc (>> 4.3.0) [s390] , dpkg-dev (>= 1.14.11)
[i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64] , libgl1-mesa-dev
[i386 powerpc sparc s390 amd64 ppc64 ia64], libglu1-mesa-dev [i386 powerpc
sparc s390 amd64 ppc64 ia64] , libcurl4-openssl-dev [i386 powerpc sparc mips
mipsel armel s390 amd64 ppc64 ia64] , libssl-dev [i386 powerpc sparc mips
mipsel armel s390 amd64 ppc64 ia64] , libdb4.6-dev [i386 powerpc sparc mips
mipsel armel s390 amd64 ppc64 ia64] , python-central (>= 0.5) [i386 powerpc
sparc mips mipsel armel s390 amd64 ppc64 ia64] , python-dev (>= 2.4) [i386
powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64] , debhelper (>= 5.0.51~)
, java-gcj-compat-dev (>= 1.0.65-4) [i386 powerpc sparc mips mipsel s390 amd64
ppc64 ia64], libgcj-bc [i386 powerpc sparc mips mipsel s390 amd64 ppc64 ia64] ,
ant (>= 1.6.5) [i386 powerpc sparc mips mipsel s390 amd64 ppc64 ia64] ,
libxerces2-java [i386 powerpc sparc mips mipsel s390 amd64 ppc64 ia64] ,
libxalan2-java (>= 2.6.0-1) [i386 powerpc sparc mips mipsel s390 amd64 ppc64
ia64] , mingw32 [i386 powerpc sparc mips mipsel s390 amd64 ppc64 ia64] ,
libjcommon-java (>= 1.0.10) [i386 powerpc sparc mips mipsel s390 amd64 ppc64
ia64], libsac-java [i386 powerpc sparc mips mipsel s390 amd64 ppc64 ia64],
libxml-java [i386 powerpc sparc mips mipsel s390 amd64 ppc64 ia64],
libflute-1.3-jfree-java [i386 powerpc sparc mips mipsel s390 amd64 ppc64 ia64],
libpentaho-reporting-flow-engine-java [i386 powerpc sparc mips mipsel s390
amd64 ppc64 ia64], liblayout-java [i386 powerpc sparc mips mipsel s390 amd64
ppc64 ia64], libloader-java [i386 powerpc sparc mips mipsel s390 amd64 ppc64
ia64], libformula-java [i386 powerpc sparc mips mipsel s390 amd64 ppc64 ia64],
librepository-java [i386 powerpc sparc mips mipsel s390 amd64 ppc64 ia64],
libfonts-java (>= 0.2.6) [i386 powerpc sparc mips mipsel s390 amd64 ppc64
ia64], libjcommon-serializer-java [i386 powerpc sparc mips mipsel s390 amd64
ppc64 ia64] , libxul-dev [i386 powerpc sparc mips mipsel s390 amd64 ppc64
ia64], libnss3-dev [i386 powerpc sparc mips mipsel s390 amd64 ppc64 ia64] ,
dmake (>= 1:4.11) [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64]
, mono-mcs (>= 1.2.3) [i386 sparc amd64 ia64], mono-gmcs (>= 1.2.3) [i386 sparc
amd64 ia64], libmono-dev (>= 1.2.3) [i386 sparc amd64 ia64], mono-utils (>=
1.2.3) [i386 sparc amd64 ia64], cli-common-dev (>= 0.4.4) [i386 sparc amd64
ia64], mono-1.0-devel [i386 sparc amd64 ia64], mono-2.0-devel [i386 sparc amd64
ia64] , libhunspell-dev (>= 1.1.5-2) [i386 powerpc sparc mips mipsel armel s390
amd64 ppc64 ia64] , libhyphen-dev (>= 2.3-3) [i386 powerpc sparc mips mipsel
armel s390 amd64 ppc64 ia64] , libstlport4.6-dev (>= 4.6.2-3.1) [i386] ,
libboost-dev [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64] ,
libvigraimpex-dev [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64]
, libwpd8-dev (>= 0.8.3-3) [i386 powerpc sparc mips mipsel armel s390 amd64
ppc64 ia64] , libwps-dev [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64
ia64] , libwpg-dev [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64]
, libicu-dev [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64] ,
libxslt1-dev [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64] ,
libcairo2-dev [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64] ,
kdelibs4-dev (>= 4:3.4.3-2) [i386 powerpc sparc mips mipsel armel s390 amd64
ppc64 ia64] , libhsqldb-java (>= 1.8.0.9-1) [i386 powerpc sparc mips mipsel
s390 amd64 ppc64 ia64] , bsh (>= 2.0b4-1) [i386 powerpc sparc mips mipsel s390
amd64 ppc64 ia64] , liblpsolve55-dev (>= 5.5.0.10-10) [i386 powerpc sparc mips
mipsel s390 amd64 ppc64 ia64], lp-solve (>= 5.5.0.10-10) [i386 powerpc sparc
mips mipsel s390 amd64 ppc64 ia64] , libsuitesparse-dev (>> 3.1.0) [i386
powerpc sparc mips mipsel s390 amd64 ppc64 ia64] , libdbus-glib-1-dev (>= 0.60)
[i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64] ,
libgstreamer-plugins-base0.10-dev [i386 powerpc sparc mips mipsel armel s390
amd64 ppc64 ia64] , libneon27-dev [i386 powerpc sparc mips mipsel armel s390
amd64 ppc64 ia64] , libgtk2.0-dev (>= 2.10) [i386 powerpc sparc mips mipsel
armel s390 amd64 ppc64 ia64]
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,
nvidia-glx-legacy-dev, libicu36-dev (<= 3.6-7), libicu-dev (<= 3.8-1),
libmono-dev (= 1.2.6+dfsg-1), libmono-dev (= 1.2.6+dfsg-2), libmono-dev (=
1.2.6+dfsg-3), libmono-dev (= 1.2.6+dfsg-4), gcj-4.2 (= 4.2.2-6), flex (=
2.5.34-1) [amd64]
Standards-Version: 3.7.2
XS-Python-Version: current
@@ -411,7 +411,7 @@
Homepage: http://udk.openoffice.org/python/python-bridge.html
Package: openoffice.org-officebean
-Architecture: i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64
+Architecture: i386 powerpc sparc mips mipsel s390 amd64 ppc64 ia64
Section: misc
Depends: openoffice.org-core (= ${Source-Version}), ${shlibs:Depends},
${java-runtime-depends}, ${java-common-depends}
Replaces: openoffice.org-common (<< 1.9.113-0pre1), openoffice.org2-officebean
@@ -496,7 +496,7 @@
a near drop-in replacement for Microsoft(R) Office.
.
This package contains the presentation minimizer extension:
- "The Sun Presentation Minimizer is used to reduce the file size of the
+ "The Sun Presentation Minimizer is used to reduce the file size of the
current presentation. Images will be compressed, and data that is no longer
needed will be removed.
The Sun Presentation Minimizer can optimize the image quality size.
@@ -3065,7 +3065,7 @@
Package: mozilla-openoffice.org
Section: net
-Architecture: i386 powerpc sparc mips mipsel armel s390
+Architecture: i386 powerpc sparc mips mipsel s390
Enhances: iceape-browser,
iceweasel,
mozilla-browser,
@@ -3097,7 +3097,7 @@
Package: openoffice.org-report-builder
Section: misc
Priority: optional
-Architecture: i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64
+Architecture: i386 powerpc sparc mips mipsel s390 amd64 ppc64 ia64
Depends: ${shlibs:Depends}, ${report-builder-jar-depends}, openoffice.org-base
(>= 2.3.0~src680m225), openoffice.org-core (>> 1:2.3.0~oog680m1),
openoffice.org-java-common (>= 1:2.3.0~oog680m1)
Conflicts: openoffice.org-reportdesigner
Replaces: openoffice.org-reportdesigner
@@ -3108,7 +3108,7 @@
a near drop-in replacement for Microsoft(R) Office.
.
This package contains the report builder extension:
- "Create with the Sun Report Builder stylish, smart-looking database reports.
+ "Create with the Sun Report Builder stylish, smart-looking database reports.
The flexible report editor can define group and page headers as well as
group and page footers and even calculation fields are available to
accomplish complex database reports."
=== modified file 'control.in'
--- a/control.in 2008-03-26 20:19:00 +0000
+++ b/control.in 2008-04-14 10:30:53 +0000
@@ -744,7 +744,7 @@
a near drop-in replacement for Microsoft(R) Office.
.
This package contains the presentation minimizer extension:
- "The Sun Presentation Minimizer is used to reduce the file size of the
+ "The Sun Presentation Minimizer is used to reduce the file size of the
current presentation. Images will be compressed, and data that is no longer
needed will be removed.
The Sun Presentation Minimizer can optimize the image quality size.
=== modified file 'control.reportdesign.in'
--- a/control.reportdesign.in 2008-04-07 09:05:13 +0000
+++ b/control.reportdesign.in 2008-04-14 10:30:53 +0000
@@ -12,7 +12,7 @@
a near drop-in replacement for Microsoft(R) Office.
.
This package contains the report builder extension:
- "Create with the Sun Report Builder stylish, smart-looking database reports.
+ "Create with the Sun Report Builder stylish, smart-looking database reports.
The flexible report editor can define group and page headers as well as
group and page footers and even calculation fields are available to
accomplish complex database reports."
=== modified file 'rules'
--- a/rules 2008-04-11 08:22:38 +0000
+++ b/rules 2008-04-14 10:30:53 +0000
@@ -267,7 +267,7 @@
OOO_ARCHS += ia64
endif
# Java...
-OOO_JAVA_ARCHS = i386 powerpc sparc mips mipsel armel s390
+OOO_JAVA_ARCHS = i386 powerpc sparc mips mipsel s390
ifeq "$(BUILD_AMD64)" "y"
OOO_JAVA_ARCHS+= amd64
endif
@@ -298,7 +298,7 @@
ENABLE_MONO=n
endif
# Mozilla plugin. Crashes on amd64
-OOO_NPSOPLUGIN_ARCHS = i386 powerpc sparc mips mipsel armel s390
+OOO_NPSOPLUGIN_ARCHS = i386 powerpc sparc mips mipsel s390
ifeq "$(BUILD_AMD64)" "y"
ifeq "$(ARCH)" "amd64"
PACKAGE_NPSOPLUGIN=n
@@ -337,7 +337,7 @@
endif
endif
-OOO_MOZILLA_ARCHS=i386 powerpc sparc mips mipsel armel s390
+OOO_MOZILLA_ARCHS=i386 powerpc sparc mips mipsel s390
ifeq "$(BUILD_AMD64)" "y"
OOO_MOZILLA_ARCHS += amd64
endif
