------------------------------------------------------------
revno: 1849
committer: Rene Engelhard <[email protected]>
branch nick: unstable
timestamp: Sat 2010-03-13 15:36:00 +0100
message:
add ARM bridges fix from issue 105359; reenable armel
added:
patches/branch_directly_to_cpp_vtable_call_on_arm.diff
modified:
changelog
control
patches/series
rules
=== modified file 'changelog'
--- a/changelog 2010-03-09 18:03:26 +0000
+++ b/changelog 2010-03-13 14:36:00 +0000
@@ -11,8 +11,11 @@
workaround for mysqlc as for graphite
* debian/rules: re-enable system-mysqlcppconn (also in the STLport case);
handle MYSQLC_STATUS suffix
+ * debian/patches/branch_directly_to_cpp_vtable_call_on_arm.diff: add
+ ARM bridges fix from issue 105359
+ * debian/rules: reenable armel
- -- Rene Engelhard <[email protected]> Tue, 09 Mar 2010 18:48:49 +0100
+ -- Rene Engelhard <[email protected]> Sat, 13 Mar 2010 15:24:28 +0100
openoffice.org (1:3.2.0-4) unstable; urgency=low
=== modified file 'control'
--- a/control 2010-03-09 21:47:00 +0000
+++ b/control 2010-03-13 14:36:00 +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), flex | flex-old,
libpam0g-dev, libxaw7-dev, unzip, zip, autoconf, sharutils, pkg-config,
libfontconfig1-dev, binutils (>= 2.14.90.0.6-3) [sparc], libc6 (>= 2.3.2)
[powerpc], zlib1g-dev, libfreetype6-dev, libx11-dev, libsm-dev, libxt-dev,
libxext-dev, libxtst-dev, libice-dev, libsane-dev, libxrender-dev,
libcups2-dev, libarchive-zip-perl, libpng12-dev, libjpeg-dev, libxml2-dev,
libexpat1-dev, fastjar, xsltproc, imagemagick, netpbm, fdupes, xml-core,
libxkbfile-dev, libxinerama-dev, x11proto-render-dev, unixodbc-dev (>= 2.2.11),
libxml-parser-perl, gperf, libpq-dev, po-debconf, , g++ (>> 4.3.0) [s390], gcc
(>> 4.3.0) [s390] , dpkg-dev (>= 1.15.1) , libgl1-mesa-dev [i386 powerpc s390
amd64 ia64 ppc64 s390x sparc], libglu1-mesa-dev [i386 powerpc s390 amd64 ia64
ppc64 s390x sparc] , libpoppler-dev (>= 0.8.0) , libgraphite-dev [i386 powerpc
mips mipsel s390 m68k amd64 ia64 ppc64 s390x sparc hppa] , libcurl4-openssl-dev
, libs
sl-dev , libdb-dev , python-central (>= 0.5) , python-dev , debhelper (>=
7.2.3~) , openjdk-6-jdk [i386 powerpc s390 amd64 ppc64 s390x sparc] , gcj-jdk
[i386 mips mipsel s390 amd64 ia64 s390x sparc hppa], libgcj-common (>= 1:4.4.1)
[i386 mips mipsel s390 amd64 ia64 s390x sparc hppa] , ant (>= 1.7.0) [i386
powerpc s390 amd64 ppc64 s390x sparc], ant-optional (>= 1.7.0) [i386 powerpc
s390 amd64 ppc64 s390x sparc], ant1.7 [ia64 mips mipsel kfreebsd-i386
kfreebsd-amd64 hppa], ant1.7-optional [ia64 mips mipsel kfreebsd-i386
kfreebsd-amd64 hppa] , gcc-mingw32 [i386 powerpc mips mipsel s390 amd64 ia64
ppc64 s390x sparc hppa], mingw32-runtime [i386 powerpc mips mipsel s390 amd64
ia64 ppc64 s390x sparc hppa] , libcommons-codec-java [i386 powerpc mips mipsel
s390 amd64 ia64 ppc64 s390x sparc hppa], libcommons-httpclient-java [i386
powerpc mips mipsel s390 amd64 ia64 ppc64 s390x sparc hppa],
libcommons-lang-java [i386 powerpc mips mipsel s390 amd64 ia64 ppc64 s390x
sparc hppa], libcommo
ns-logging-java [i386 powerpc mips mipsel s390 amd64 ia64 ppc64 s390x sparc
hppa] , libbase-java-openoffice.org [i386 powerpc mips mipsel s390 amd64 ia64
ppc64 s390x sparc hppa], libsac-java [i386 powerpc mips mipsel s390 amd64 ia64
ppc64 s390x sparc hppa], libxml-java-openoffice.org [i386 powerpc mips mipsel
s390 amd64 ia64 ppc64 s390x sparc hppa], libflute-java-openoffice.org [i386
powerpc mips mipsel s390 amd64 ia64 ppc64 s390x sparc hppa],
libpentaho-reporting-flow-engine-java-openoffice.org [i386 powerpc mips mipsel
s390 amd64 ia64 ppc64 s390x sparc hppa], liblayout-java-openoffice.org [i386
powerpc mips mipsel s390 amd64 ia64 ppc64 s390x sparc hppa],
libloader-java-openoffice.org [i386 powerpc mips mipsel s390 amd64 ia64 ppc64
s390x sparc hppa], libformula-java-openoffice.org [i386 powerpc mips mipsel
s390 amd64 ia64 ppc64 s390x sparc hppa], librepository-java-openoffice.org
[i386 powerpc mips mipsel s390 amd64 ia64 ppc64 s390x sparc hppa],
libfonts-java-openoffice.org
[i386 powerpc mips mipsel s390 amd64 ia64 ppc64 s390x sparc hppa],
libserializer-java-openoffice.org [i386 powerpc mips mipsel s390 amd64 ia64
ppc64 s390x sparc hppa] , libcommons-logging-java [i386 powerpc mips mipsel
s390 amd64 ia64 ppc64 s390x sparc hppa] , xulrunner-dev [i386 powerpc mips
mipsel s390 amd64 ia64 ppc64 s390x sparc hppa], libnss3-dev (>= 3.12.3) [i386
powerpc mips mipsel s390 amd64 ia64 ppc64 s390x sparc hppa] , dmake (>= 1:4.11)
, mono-devel (>= 2.4.2.3) [i386 amd64 ia64], libmono-dev (>= 2.4.2.3) [i386
amd64 ia64], mono-utils (>= 2.4.2.3) [i386 amd64 ia64], cli-common-dev (>=
0.5.7) [i386 amd64 ia64] , libhunspell-dev (>= 1.1.5-2) , libhyphen-dev (>=
2.4) , libstlport4.6-dev (>= 4.6.2-3) [i386] , libboost-dev (>= 1.38) ,
libvigraimpex-dev , libwpd8-dev (>= 0.8.3-3) , libwps-dev , libwpg-dev ,
libicu-dev (>= 4.0) , libxslt1-dev , libcairo2-dev , kdelibs5-dev (>= 4:4.3.4)
, libqt4-dev (>= 4.5) , libmysqlclient-dev , libmysqlcppconn-dev (>=
1.1.0~r791) [pow
erpc mips mipsel s390 m68k amd64 ia64 ppc64 s390x sparc hppa] ,
libebook1.2-dev , libxrandr-dev , liblucene2-java (>= 2.3.2) [i386 powerpc mips
mipsel s390 amd64 ia64 ppc64 s390x sparc hppa] , libhsqldb-java (>> 1.8.0.10)
[i386 powerpc mips mipsel s390 amd64 ia64 ppc64 s390x sparc hppa] , bsh (>=
2.0b4) [i386 powerpc mips mipsel s390 amd64 ia64 ppc64 s390x sparc hppa] ,
liblpsolve55-dev (>= 5.5.0.13-5+b1), lp-solve (>= 5.5.0.13-5+b1) ,
libsuitesparse-dev (>= 1:3.4.0) , libdbus-glib-1-dev (>= 0.60) ,
libgstreamer-plugins-base0.10-dev , libneon27-gnutls-dev , libgtk2.0-dev (>=
2.10) , libgnomevfs2-dev , libgconf2-dev , libldap2-dev
+Build-Depends: lsb-release, bzip2, bison (>= 1:1.875a), flex | flex-old,
libpam0g-dev, libxaw7-dev, unzip, zip, autoconf, sharutils, pkg-config,
libfontconfig1-dev, binutils (>= 2.14.90.0.6-3) [sparc], libc6 (>= 2.3.2)
[powerpc], zlib1g-dev, libfreetype6-dev, libx11-dev, libsm-dev, libxt-dev,
libxext-dev, libxtst-dev, libice-dev, libsane-dev, libxrender-dev,
libcups2-dev, libarchive-zip-perl, libpng12-dev, libjpeg-dev, libxml2-dev,
libexpat1-dev, fastjar, xsltproc, imagemagick, netpbm, fdupes, xml-core,
libxkbfile-dev, libxinerama-dev, x11proto-render-dev, unixodbc-dev (>= 2.2.11),
libxml-parser-perl, gperf, libpq-dev, po-debconf, , g++ (>> 4.3.0) [s390], gcc
(>> 4.3.0) [s390] , g++-4.4 (>= 4.4.2-5) [armel] , dpkg-dev (>= 1.15.1) ,
libgl1-mesa-dev [i386 powerpc s390 amd64 ia64 ppc64 s390x sparc],
libglu1-mesa-dev [i386 powerpc s390 amd64 ia64 ppc64 s390x sparc] ,
libpoppler-dev (>= 0.8.0) , libgraphite-dev [i386 powerpc mips mipsel s390 m68k
amd64 ia64 ppc64 s390x sparc hppa
armel] , libcurl4-openssl-dev , libssl-dev , libdb-dev , python-central (>=
0.5) , python-dev , debhelper (>= 7.2.3~) , openjdk-6-jdk [i386 powerpc s390
amd64 ppc64 s390x sparc armel] , gcj-jdk [i386 mips mipsel s390 amd64 ia64
s390x sparc hppa armel], libgcj-common (>= 1:4.4.1) [i386 mips mipsel s390
amd64 ia64 s390x sparc hppa armel] , ant (>= 1.7.0) [i386 powerpc s390 amd64
ppc64 s390x sparc armel], ant-optional (>= 1.7.0) [i386 powerpc s390 amd64
ppc64 s390x sparc armel], ant1.7 [ia64 mips mipsel kfreebsd-i386 kfreebsd-amd64
hppa], ant1.7-optional [ia64 mips mipsel kfreebsd-i386 kfreebsd-amd64 hppa] ,
gcc-mingw32 [i386 powerpc mips mipsel s390 amd64 ia64 ppc64 s390x sparc hppa
armel], mingw32-runtime [i386 powerpc mips mipsel s390 amd64 ia64 ppc64 s390x
sparc hppa armel] , libcommons-codec-java [i386 powerpc mips mipsel s390 amd64
ia64 ppc64 s390x sparc hppa armel], libcommons-httpclient-java [i386 powerpc
mips mipsel s390 amd64 ia64 ppc64 s390x sparc hppa armel], libco
mmons-lang-java [i386 powerpc mips mipsel s390 amd64 ia64 ppc64 s390x sparc
hppa armel], libcommons-logging-java [i386 powerpc mips mipsel s390 amd64 ia64
ppc64 s390x sparc hppa armel] , libbase-java-openoffice.org [i386 powerpc mips
mipsel s390 amd64 ia64 ppc64 s390x sparc hppa armel], libsac-java [i386 powerpc
mips mipsel s390 amd64 ia64 ppc64 s390x sparc hppa armel],
libxml-java-openoffice.org [i386 powerpc mips mipsel s390 amd64 ia64 ppc64
s390x sparc hppa armel], libflute-java-openoffice.org [i386 powerpc mips mipsel
s390 amd64 ia64 ppc64 s390x sparc hppa armel],
libpentaho-reporting-flow-engine-java-openoffice.org [i386 powerpc mips mipsel
s390 amd64 ia64 ppc64 s390x sparc hppa armel], liblayout-java-openoffice.org
[i386 powerpc mips mipsel s390 amd64 ia64 ppc64 s390x sparc hppa armel],
libloader-java-openoffice.org [i386 powerpc mips mipsel s390 amd64 ia64 ppc64
s390x sparc hppa armel], libformula-java-openoffice.org [i386 powerpc mips
mipsel s390 amd64 ia64 ppc64 s39
0x sparc hppa armel], librepository-java-openoffice.org [i386 powerpc mips
mipsel s390 amd64 ia64 ppc64 s390x sparc hppa armel],
libfonts-java-openoffice.org [i386 powerpc mips mipsel s390 amd64 ia64 ppc64
s390x sparc hppa armel], libserializer-java-openoffice.org [i386 powerpc mips
mipsel s390 amd64 ia64 ppc64 s390x sparc hppa armel] , libcommons-logging-java
[i386 powerpc mips mipsel s390 amd64 ia64 ppc64 s390x sparc hppa armel] ,
xulrunner-dev [i386 powerpc mips mipsel s390 amd64 ia64 ppc64 s390x sparc armel
hppa armel], libnss3-dev (>= 3.12.3) [i386 powerpc mips mipsel s390 amd64 ia64
ppc64 s390x sparc armel hppa armel] , dmake (>= 1:4.11) , mono-devel (>=
2.4.2.3) [i386 amd64 ia64], libmono-dev (>= 2.4.2.3) [i386 amd64 ia64],
mono-utils (>= 2.4.2.3) [i386 amd64 ia64], cli-common-dev (>= 0.5.7) [i386
amd64 ia64] , libhunspell-dev (>= 1.1.5-2) , libhyphen-dev (>= 2.4) ,
libstlport4.6-dev (>= 4.6.2-3) [i386] , libboost-dev (>= 1.38) ,
libvigraimpex-dev , libwpd8-dev (>= 0.
8.3-3) , libwps-dev , libwpg-dev , libicu-dev (>= 4.0) , libxslt1-dev ,
libcairo2-dev , kdelibs5-dev (>= 4:4.3.4) , libqt4-dev (>= 4.5) ,
libmysqlclient-dev , libmysqlcppconn-dev (>= 1.1.0~r791) [powerpc mips mipsel
s390 m68k amd64 ia64 ppc64 s390x sparc hppa armel] , libebook1.2-dev ,
libxrandr-dev , liblucene2-java (>= 2.3.2) [i386 powerpc mips mipsel s390 amd64
ia64 ppc64 s390x sparc hppa armel] , libhsqldb-java (>> 1.8.0.10) [i386 powerpc
mips mipsel s390 amd64 ia64 ppc64 s390x sparc hppa armel] , bsh (>= 2.0b4)
[i386 powerpc mips mipsel s390 amd64 ia64 ppc64 s390x sparc hppa armel] ,
liblpsolve55-dev (>= 5.5.0.13-5+b1), lp-solve (>= 5.5.0.13-5+b1) ,
libsuitesparse-dev (>= 1:3.4.0) , libdbus-glib-1-dev (>= 0.60) ,
libgstreamer-plugins-base0.10-dev , libneon27-gnutls-dev , libgtk2.0-dev (>=
2.10) , libgnomevfs2-dev , libgconf2-dev , libldap2-dev
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, 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),
libmono-dev (= 2.4+dfsg-2) [sparc], gcj-4.2 (= 4.2.2-6), flex (= 2.5.34-1)
[amd64], libboost1.39-dev (<< 1.39.0-2), graphicsmagick-imagemagick-compat (<<
1.3.9~), base-files (= 5)
Standards-Version: 3.8.3
XS-Python-Version: current
@@ -11,7 +11,7 @@
Homepage: http://www.go-oo.org
Package: openoffice.org
-Architecture: i386 powerpc mips mipsel s390 m68k amd64 ia64 ppc64 s390x sparc
hppa
+Architecture: i386 powerpc mips mipsel s390 m68k amd64 ia64 ppc64 s390x sparc
hppa armel
Depends: openoffice.org-core (= ${binary:Version}), openoffice.org-writer,
openoffice.org-calc, openoffice.org-impress, openoffice.org-draw,
openoffice.org-math, openoffice.org-base, openoffice.org-report-builder-bin,
ttf-dejavu, ttf-sil-gentium-basic, ${ooo-officebean-dep},
openoffice.org-filter-mobiledev, ${lucene-depends}, ${java-common-depends},
${misc:Depends}
Recommends: ${ooo-binfilter-dep}, ttf-liberation | ttf-mscorefonts-installer
Suggests: hunspell-dictionary, myspell-dictionary,
openoffice.org-help-${help-l10n-virtual-version},
openoffice.org-l10n-${help-l10n-virtual-version}, menu, unixodbc, cups-bsd,
libsane, openoffice.org-hyphenation, openoffice.org2-thesaurus, libxrender1,
libgl1, openoffice.org-gnome | openoffice.org-kde, iceweasel | firefox |
icedove | thunderbird | iceape-browser | mozilla-browser,
${java-runtime-depends}, openclipart-openoffice.org, pstoedit, imagemagick |
graphicsmagick-imagemagick-compat, libpaper-utils,
${gstreamer-plugins-suggests}, ${libldap-suggests}
@@ -99,7 +99,7 @@
indic languages.
Package: openoffice.org-core
-Architecture: i386 powerpc mips mipsel s390 m68k amd64 ia64 ppc64 s390x sparc
hppa
+Architecture: i386 powerpc mips mipsel s390 m68k amd64 ia64 ppc64 s390x sparc
hppa armel
Depends: openoffice.org-common (>> ${base-version}), ttf-opensymbol (>=
1:3.0), ${shlibs:Depends}, ure (>= 1.5.1+OOo3.1.1-15), 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-help-2.4,
openoffice.org-help-3.1, 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.o
rg-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 (<< 20040229-4.1),
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), my
spell-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)
@@ -142,7 +142,7 @@
the Java support for OpenOffice.org (Java classes, scripts, config snippets).
Package: openoffice.org-writer
-Architecture: i386 powerpc mips mipsel s390 m68k amd64 ia64 ppc64 s390x sparc
hppa
+Architecture: i386 powerpc mips mipsel s390 m68k amd64 ia64 ppc64 s390x sparc
hppa armel
Depends: openoffice.org-core (= ${binary:Version}), openoffice.org-base-core
(= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
Recommends: ${ooo-binfilter-dep}, ${java-runtime-depends},
${java-common-depends}, openoffice.org-emailmerge, openoffice.org-math
Replaces: openoffice.org (<< 1.9), openoffice.org-debian-files,
openoffice.org2-writer (<< ${binary:Version}), openoffice.org-common (<<
1:2.3.1)
@@ -156,7 +156,7 @@
This package contains the wordprocessor component for OpenOffice.org.
Package: openoffice.org-calc
-Architecture: i386 powerpc mips mipsel s390 m68k amd64 ia64 ppc64 s390x sparc
hppa
+Architecture: i386 powerpc mips mipsel s390 m68k amd64 ia64 ppc64 s390x sparc
hppa armel
Depends: openoffice.org-core (= ${binary:Version}), openoffice.org-base-core
(= ${binary:Version}), ${shlibs:Depends}, ${lpsolve-dep}, ${misc:Depends}
Replaces: openoffice.org2-core (<< 1.9.113-0pre1), openoffice.org (<< 1.9),
openoffice.org-debian-files, openoffice.org-core (<= 2.2.0-4),
openoffice.org2-calc (<< ${binary:Version}), openoffice.org-common (<<
2.0.3+2.0.4m179)
Conflicts: openoffice.org-bin (<< 1.9), openoffice.org-debian-files,
openoffice.org2-calc (<< ${binary:Version})
@@ -168,7 +168,7 @@
This package contains the spreadsheet component for OpenOffice.org.
Package: openoffice.org-impress
-Architecture: i386 powerpc mips mipsel s390 m68k amd64 ia64 ppc64 s390x sparc
hppa
+Architecture: i386 powerpc mips mipsel s390 m68k amd64 ia64 ppc64 s390x sparc
hppa armel
Depends: openoffice.org-core (= ${binary:Version}), openoffice.org-draw (=
${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
Replaces: openoffice.org (<< 1.9), openoffice.org-debian-files,
openoffice.org2-impress (<< ${binary:Version}), openoffice.org-common (<<
2.0.3+2.0.4m179)
Provides: openoffice.org2-impress
@@ -181,7 +181,7 @@
This package contains the presentation component for OpenOffice.org.
Package: openoffice.org-draw
-Architecture: i386 powerpc mips mipsel s390 m68k amd64 ia64 ppc64 s390x sparc
hppa
+Architecture: i386 powerpc mips mipsel s390 m68k amd64 ia64 ppc64 s390x sparc
hppa armel
Depends: openoffice.org-core (= ${binary:Version}), ${shlibs:Depends},
${misc:Depends}
Replaces: openoffice.org (<< 1.9), openoffice.org-debian-files,
openoffice.org2-draw (<< ${binary:Version}), openoffice.org-core (<<
1:3.1.1~rc1-2), openoffice.org-common (<< 2.0.3+2.0.4m179)
Conflicts: openoffice.org-debian-files, openoffice.org2-draw (<<
${binary:Version})
@@ -193,7 +193,7 @@
This package contains the drawing component for OpenOffice.org.
Package: openoffice.org-math
-Architecture: i386 powerpc mips mipsel s390 m68k amd64 ia64 ppc64 s390x sparc
hppa
+Architecture: i386 powerpc mips mipsel s390 m68k amd64 ia64 ppc64 s390x sparc
hppa armel
Depends: openoffice.org-core (= ${binary:Version}), ${shlibs:Depends},
${misc:Depends}
Replaces: openoffice.org (<< 1.9), openoffice.org-debian-files,
openoffice.org2-math (<< ${binary:Version}), openoffice.org-common (<<
2.0.3+2.0.4m179)
Conflicts: openoffice.org-debian-files, openoffice.org2-math (<<
${binary:Version})
@@ -205,7 +205,7 @@
This package contains the equation editor component for OpenOffice.org.
Package: openoffice.org-base-core
-Architecture: i386 powerpc mips mipsel s390 m68k amd64 ia64 ppc64 s390x sparc
hppa
+Architecture: i386 powerpc mips mipsel s390 m68k amd64 ia64 ppc64 s390x sparc
hppa armel
Depends: openoffice.org-core (= ${binary:Version}), ${shlibs:Depends},
${misc:Depends}
Replaces: openoffice.org-base (<< 1:2.3.1)
Suggests: openoffice.org-base
@@ -220,7 +220,7 @@
install openoffice.org-base.
Package: openoffice.org-base
-Architecture: i386 powerpc mips mipsel s390 m68k amd64 ia64 ppc64 s390x sparc
hppa
+Architecture: i386 powerpc mips mipsel s390 m68k amd64 ia64 ppc64 s390x sparc
hppa armel
Section: database
Depends: openoffice.org-core (= ${binary:Version}), openoffice.org-base-core
(= ${binary:Version}), ${shlibs:Depends}, ${java-runtime-depends},
${base-hsqldb-depends}, ${java-common-depends}, ${misc:Depends}
Breaks: openoffice.org-sdbc-postgresql (<< 1:0.7.6+OOo3.2.0-4)
@@ -342,7 +342,7 @@
option menu.
Package: openoffice.org-gtk
-Architecture: i386 powerpc mips mipsel s390 m68k amd64 ia64 ppc64 s390x sparc
hppa
+Architecture: i386 powerpc mips mipsel s390 m68k amd64 ia64 ppc64 s390x sparc
hppa armel
Depends: openoffice.org-core (= ${binary:Version}), ${shlibs:Depends},
${misc:Depends}
Recommends: openoffice.org-style-tango
Section: gnome
@@ -358,7 +358,7 @@
contains a QuickStarter for the "notification area".
Package: openoffice.org-gnome
-Architecture: i386 powerpc mips mipsel s390 m68k amd64 ia64 ppc64 s390x sparc
hppa
+Architecture: i386 powerpc mips mipsel s390 m68k amd64 ia64 ppc64 s390x sparc
hppa armel
Depends: openoffice.org-core (= ${binary:Version}), openoffice.org-gtk,
gconf2, ${shlibs:Depends}, ${misc:Depends}
Suggests: openoffice.org-evolution
Section: gnome
@@ -378,7 +378,7 @@
* evolution
Package: openoffice.org-evolution
-Architecture: i386 powerpc mips mipsel s390 m68k amd64 ia64 ppc64 s390x sparc
hppa
+Architecture: i386 powerpc mips mipsel s390 m68k amd64 ia64 ppc64 s390x sparc
hppa armel
Section: gnome
Pre-Depends: openoffice.org-core (>= 1:3.1.0-2), debconf (>= 0.5) |
debconf-2.0, procps
Depends: openoffice.org-core (= ${binary:Version}), openoffice.org-base,
${shlibs:Depends}, ${libebook-dep}, ${misc:Depends}
@@ -411,7 +411,7 @@
Provides: ${python:Provides}
XB-Python-Version: ${python:Versions}
Section: python
-Architecture: i386 powerpc mips mipsel s390 m68k amd64 ia64 ppc64 s390x sparc
hppa
+Architecture: i386 powerpc mips mipsel s390 m68k amd64 ia64 ppc64 s390x sparc
hppa armel
Enhances: openoffice.org
Depends: openoffice.org-core (= ${binary:Version}), ${python:Depends},
${shlibs:Depends}, ${misc:Depends}
Replaces: openoffice.org-common (<< 1.9.82)
@@ -424,7 +424,7 @@
Homepage: http://udk.openoffice.org/python/python-bridge.html
Package: openoffice.org-officebean
-Architecture: i386 powerpc mips mipsel s390 amd64 ia64 ppc64 s390x sparc hppa
+Architecture: i386 powerpc mips mipsel s390 amd64 ia64 ppc64 s390x sparc hppa
armel
Section: java
Depends: openoffice.org-core (= ${binary:Version}), ${shlibs:Depends},
${java-runtime-depends}, ${java-common-depends}, ${misc:Depends}
Replaces: openoffice.org-common (<< 1.9.113-0pre1), openoffice.org2-officebean
@@ -474,7 +474,7 @@
Package: libmythes-dev
Section: libdevel
Suggests: perl
-Architecture: i386 powerpc mips mipsel s390 m68k amd64 ia64 ppc64 s390x sparc
hppa
+Architecture: i386 powerpc mips mipsel s390 m68k amd64 ia64 ppc64 s390x sparc
hppa armel
Depends: ${misc:Depends}
Description: simple thesaurus library -- development files
MyThes is a simple thesaurus that uses a structured
@@ -3275,7 +3275,7 @@
Package: uno-libs3
Section: libs
-Architecture: i386 powerpc mips mipsel s390 m68k amd64 ia64 ppc64 s390x sparc
hppa
+Architecture: i386 powerpc mips mipsel s390 m68k amd64 ia64 ppc64 s390x sparc
hppa armel
Depends: ${shlibs:Depends}, ${misc:Depends}
Replaces: ure (<< 1.4+OOo3.0.0~beta2-1)
Description: OpenOffice.org UNO runtime environment -- public shared libraries
@@ -3298,7 +3298,7 @@
Package: uno-libs3-dbg
Section: debug
Priority: extra
-Architecture: i386 powerpc mips mipsel s390 m68k amd64 ia64 ppc64 s390x sparc
hppa
+Architecture: i386 powerpc mips mipsel s390 m68k amd64 ia64 ppc64 s390x sparc
hppa armel
Depends: uno-libs3 (= ${ure:Version}), ${misc:Depends}
Replaces: ure-dbg (<< 1.4+OOo3.0.0~beta2-1)
Description: OpenOffice.org UNO runtime environment -- public shared library
debug symbols
@@ -3320,7 +3320,7 @@
Package: ure
Section: libs
-Architecture: i386 powerpc mips mipsel s390 m68k amd64 ia64 ppc64 s390x sparc
hppa
+Architecture: i386 powerpc mips mipsel s390 m68k amd64 ia64 ppc64 s390x sparc
hppa armel
Pre-Depends: debconf (>= 0.5) | debconf-2.0
Depends: uno-libs3 (= ${ure:Version}), ${shlibs:Depends}, ${misc:Depends}
Suggests: java5-runtime, cli-uno-bridge
@@ -3339,7 +3339,7 @@
Package: ure-dbg
Section: debug
Priority: extra
-Architecture: i386 powerpc mips mipsel s390 m68k amd64 ia64 ppc64 s390x sparc
hppa
+Architecture: i386 powerpc mips mipsel s390 m68k amd64 ia64 ppc64 s390x sparc
hppa armel
Depends: ure (= ${ure:Version}), uno-libs3-dbg (= ${ure:Version}),
${misc:Depends}
Description: OpenOffice.org UNO runtime environment -- debug symbols
The Uno Runtime Environment (URE) is the well-known UNO component model
@@ -3354,7 +3354,7 @@
This package contains the (detached) debug symbols for the URE.
Package: openoffice.org-gcj
-Architecture: i386 mips mipsel s390 amd64 ia64 s390x sparc hppa
+Architecture: i386 mips mipsel s390 amd64 ia64 s390x sparc hppa armel
Depends: ${shlibs:Depends}, java-gcj-compat, openoffice.org-core (=
${binary:Version}), openoffice.org-java-common (= ${source:Version}),
${java-gcj-depends}, ${misc:Depends}
Enhances: openoffice.org-writer, openoffice.org-base
Description: full-featured office productivity suite -- Java libraries for GIJ
@@ -3441,7 +3441,7 @@
Package: mozilla-openoffice.org
Section: net
-Architecture: i386 powerpc mips mipsel s390 amd64 ia64 ppc64 s390x sparc hppa
+Architecture: i386 powerpc mips mipsel s390 amd64 ia64 ppc64 s390x sparc armel
hppa armel
Enhances: iceape-browser,
iceweasel,
mozilla-browser,
@@ -3511,7 +3511,7 @@
Package: openoffice.org-report-builder-bin
Section: misc
-Architecture: i386 powerpc mips mipsel s390 amd64 ia64 ppc64 s390x sparc hppa
+Architecture: i386 powerpc mips mipsel s390 amd64 ia64 ppc64 s390x sparc hppa
armel
Depends: ${shlibs:Depends}, openoffice.org-core (>> 1:2.3.0~oog680m1),
openoffice.org-base (>= 2.3.0~src680m225), ${misc:Depends}
Replaces: openoffice.org-report-builder
Description: OpenOffice.org extension for building database reports --
libraries
@@ -3523,7 +3523,7 @@
Package: openoffice.org-presentation-minimizer
Section: misc
-Architecture: i386 powerpc mips mipsel s390 m68k amd64 ia64 ppc64 s390x sparc
hppa
+Architecture: i386 powerpc mips mipsel s390 m68k amd64 ia64 ppc64 s390x sparc
hppa armel
Pre-Depends: openoffice.org-common, debconf (>= 0.5) | debconf-2.0, procps
Depends: ${shlibs:Depends}, openoffice.org-core (>= 2.3),
openoffice.org-impress, ${misc:Depends}
Enhances: openoffice.org-impress
@@ -3543,7 +3543,7 @@
Package: openoffice.org-presenter-console
Section: misc
-Architecture: i386 powerpc mips mipsel s390 m68k amd64 ia64 ppc64 s390x sparc
hppa
+Architecture: i386 powerpc mips mipsel s390 m68k amd64 ia64 ppc64 s390x sparc
hppa armel
Conflicts: openoffice.org-presenter-screen, ure (<< 1.5.1+OOo3.1.1-15)
Provides: openoffice.org-presenter-screen
Replaces: openoffice.org-presenter-screen
@@ -3571,7 +3571,7 @@
Package: openoffice.org-pdfimport
Section: misc
Priority: extra
-Architecture: i386 powerpc mips mipsel s390 m68k amd64 ia64 ppc64 s390x sparc
hppa
+Architecture: i386 powerpc mips mipsel s390 m68k amd64 ia64 ppc64 s390x sparc
hppa armel
Pre-Depends: openoffice.org-common, debconf (>= 0.5) | debconf-2.0, procps
Depends: ${shlibs:Depends}, openoffice.org-core (>= 1:3.0.0~bea300~dev300m6),
${misc:Depends}
Conflicts: ure (<< 1.5.1+OOo3.1.1-15)
@@ -3596,7 +3596,7 @@
Package: openoffice.org-dbg
Section: debug
-Architecture: i386 powerpc mips mipsel s390 m68k amd64 ia64 ppc64 s390x sparc
hppa
+Architecture: i386 powerpc mips mipsel s390 m68k amd64 ia64 ppc64 s390x sparc
hppa armel
Priority: extra
Depends: openoffice.org-core (= ${binary:Version}) | openoffice.org-gcj (=
${binary:Version}) | openoffice.org-dev (= ${binary:Version}) |
openoffice.org-gnome (= ${binary:Version}) | openoffice.org-kde (=
${binary:Version}) | openoffice.org-calc (= ${binary:Version}) |
openoffice.org-base-core (= ${binary:Version}) | openoffice.org-base (=
${binary:Version}) | openoffice.org-impress (= ${binary:Version}) |
openoffice.org-filter-binfilter (= ${binary:Version}) | openoffice.org-draw (=
${binary:Version}) | openoffice.org-writer (= ${binary:Version}) | python-uno
(= ${binary:Version}) | cli-uno-bridge (= ${binary:Version}) |
mozilla-openoffice.org (= ${binary:Version}) | openoffice.org-ogltrans (=
${binary:Version}), ${misc:Depends}
Recommends: ure-dbg
@@ -3610,7 +3610,7 @@
Package: openoffice.org-dev
Section: devel
-Architecture: i386 powerpc mips mipsel s390 m68k amd64 ia64 ppc64 s390x sparc
hppa
+Architecture: i386 powerpc mips mipsel s390 m68k amd64 ia64 ppc64 s390x sparc
hppa armel
Depends: openoffice.org-core (= ${binary:Version}), ${shlibs:Depends},
${dev-stl-depends}, ${misc:Depends}
Recommends: dmake, g++, java-gcj-compat-dev, ${java-common-depends}
Suggests: openoffice.org-dev-doc, libmythes-dev, c-shell
@@ -3647,7 +3647,7 @@
It also contains the gsicheck utility.
Package: openoffice.org-kde
-Architecture: i386 powerpc mips mipsel s390 m68k amd64 ia64 ppc64 s390x sparc
hppa
+Architecture: i386 powerpc mips mipsel s390 m68k amd64 ia64 ppc64 s390x sparc
hppa armel
Depends: openoffice.org-core (= ${binary:Version}), ${shlibs:Depends},
${misc:Depends}
Recommends: ${kde-iconset-dep}
Suggests: konqueror, kmail, openoffice.org-kab
@@ -3668,7 +3668,7 @@
* openoffice.org-kab: KDE Addressbook support
Package: openoffice.org-kab
-Architecture: i386 powerpc mips mipsel s390 m68k amd64 ia64 ppc64 s390x sparc
hppa
+Architecture: i386 powerpc mips mipsel s390 m68k amd64 ia64 ppc64 s390x sparc
hppa armel
Pre-Depends: openoffice.org-core (>= 1:3.1.0-2), debconf (>= 0.5) |
debconf-2.0, procps
Depends: openoffice.org-core (= ${binary:Version}), ${shlibs:Depends},
${misc:Depends}
Recommends: kaddressbook
@@ -3683,7 +3683,7 @@
Package: openoffice.org-sdbc-postgresql
Section: misc
-Architecture: i386 powerpc mips mipsel s390 m68k amd64 ia64 ppc64 s390x sparc
hppa
+Architecture: i386 powerpc mips mipsel s390 m68k amd64 ia64 ppc64 s390x sparc
hppa armel
Pre-Depends: openoffice.org-common, debconf (>= 0.5) | debconf-2.0, procps
Depends: ${shlibs:Depends}, openoffice.org-core (>> 1:2.3.0~oog680m1),
${misc:Depends}
Conflicts: openoffice.org-java-common (<< 2.3.0~src680m212),
openoffice.org-gcj (<< 2.3.0~src680m212), ure (<< 1.5.1+OOo3.1.1-15)
@@ -3698,7 +3698,7 @@
Package: openoffice.org-mysql-connector
Section: misc
-Architecture: i386 powerpc mips mipsel s390 m68k amd64 ia64 ppc64 s390x sparc
hppa
+Architecture: i386 powerpc mips mipsel s390 m68k amd64 ia64 ppc64 s390x sparc
hppa armel
Pre-Depends: openoffice.org-common, debconf (>= 0.5) | debconf-2.0, procps
Depends: ${shlibs:Depends}, openoffice.org-core (>> 1:3.2~), ${misc:Depends}
Suggests: mysql-server (>= 5.1)
=== added file 'patches/branch_directly_to_cpp_vtable_call_on_arm.diff'
--- a/patches/branch_directly_to_cpp_vtable_call_on_arm.diff 1970-01-01
00:00:00 +0000
+++ b/patches/branch_directly_to_cpp_vtable_call_on_arm.diff 2010-03-13
14:36:00 +0000
@@ -0,0 +1,38 @@
+diff --git a/patches/dev300/apply b/patches/dev300/apply
+index 0f5b9fd..0707a42 100644
+--- openoffice.org-3.2.0/ooo-build-3-2-0-8/patches/dev300/apply
++++ openoffice.org-3.2.0/ooo-build-3-2-0-8/patches/dev300/apply
+@@ -530,6 +530,9 @@ customunittext-percent.diff, i#80784, atimar
+ # fix by Caolan
+ bridges-testcppu-x86_64-fixes.diff, i#98028, n#575704, pmladek
+
++# fix ARM bridges
++branch_directly_to_cpp_vtable_call_on_arm.diff, i#105359
++
+ # make sure that we have mpGraphics
+ # it might get lost when calling ImplNewFont()
+ # fixes ReportBuilder crasher
+diff --git a/patches/dev300/branch_directly_to_cpp_vtable_call_on_arm.diff
b/patches/dev300/branch_directly_to_cpp_vtable_call_on_arm.diff
+new file mode 100644
+index 0000000..c6a3152
+--- /dev/null
++++
openoffice.org-3.2.0/ooo-build-3-2-0-8/patches/dev300/branch_directly_to_cpp_vtable_call_on_arm.diff
+@@ -0,0 +1,18 @@
++--- bridges/source/cpp_uno/gcc3_linux_arm/armhelper.s 2007-12-12
15:35:44.000000000 +0000
+++++ bridges/source/cpp_uno/gcc3_linux_arm/armhelper.s 2010-03-11
16:22:29.000000000 +0000
++@@ -10,13 +10,5 @@
++ privateSnippetExecutor:
++ stmfd sp!, {r0-r3} @ follow other parameters on stack
++ mov r0, ip @ r0 points to functionoffset/vtable
++- mov ip, sp @ fix up the ip
++- stmfd sp!, {fp,ip,lr,pc} @ 8 x 4 => stack remains 8 aligned
++- sub fp, ip, #4 @ set frame pointer
++-
++- add r1, sp, #16 @ r1 points to this and params
++- bl cpp_vtable_call(PLT)
++-
++- add sp, sp, #32 @ restore stack
++- ldr fp, [sp, #-32] @ restore frame pointer
++- ldr pc, [sp, #-24] @ return
+++ mov r1, sp @ r1 points to this and params
+++ b cpp_vtable_call(PLT)
=== modified file 'patches/series'
--- a/patches/series 2010-03-09 18:03:26 +0000
+++ b/patches/series 2010-03-13 14:36:00 +0000
@@ -1,2 +1,3 @@
update-mysqlnative-cws.diff
system-mysqlcpp.diff
+branch_directly_to_cpp_vtable_call_on_arm.diff
=== modified file 'rules'
--- a/rules 2010-03-09 18:03:26 +0000
+++ b/rules 2010-03-13 14:36:00 +0000
@@ -89,7 +89,7 @@
BUILD_PPC64=y
BUILD_S390X=y
BUILD_SPARC=y
-BUILD_ARMEL=n
+BUILD_ARMEL=y
BUILD_HPPA=y
PATCHSET=$(DIST)
BUILD_DEPS=
@@ -314,7 +314,6 @@
# Debian Lenny
ifeq "$(LENNY_BACKPORT)" "y"
- BUILD_ARMEL=y
USE_SYSTEM_LUCENE=n
USE_SYSTEM_ICU=n
MONO_MINVER= (>= 1.2.3)
