------------------------------------------------------------
revno: 1776
committer: Rene Engelhard <r...@debian.org>
branch nick: unstable
timestamp: Tue 2009-12-08 23:30:37 +0100
message:
remove hppa conditionals again as the patch needs the split .mks in 3.2 and I
don't bother to port it; update Java conditionals
removed:
scripts/vars.hppa
modified:
changelog
control
rules
=== modified file 'changelog'
--- a/changelog 2009-12-08 21:38:41 +0000
+++ b/changelog 2009-12-08 22:30:37 +0000
@@ -12,14 +12,14 @@
* debian/rules:
- re-enable sparc
- fix install on no-Java builds
- - add BUILD_HPPA conditional, enable
- build-depend on libmysqlcppconn*-dev (>= 1.1.0~r791) to build against
version with fixed visibility of (e.g.) SQLException
This closes: #558240 for !i386 at least.
Build with internal libmysqlcppconn on i386 for now...
- * debian/scripts/vars.hppa: add
+ - don't build-depend on openjdk on archs using gcj-jdk...
+ - remove cacao-oj6-jre support, gone
- -- Rene Engelhard <r...@debian.org> Tue, 08 Dec 2009 09:03:26 +0100
+ -- Rene Engelhard <r...@debian.org> Tue, 08 Dec 2009 23:10:29 +0100
openoffice.org (1:3.1.1-8) unstable; urgency=low
=== modified file 'control'
--- a/control 2009-12-08 08:15:12 +0000
+++ b/control 2009-12-08 22:30:37 +0000
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian OpenOffice Team <debian-openoffice@lists.debian.org>
Uploaders: Chris Halls <ha...@debian.org>, Rene Engelhard <r...@debian.org>
-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, libjpeg62-dev, libxml2-dev,
libldap2-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.14.11) , 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) , libcurl4-gnutls-dev
, libssl-dev , libdb-dev , python-central (>= 0.5) , python-dev , debhelper (>=
6.0.7~) , openjdk-6-jdk , gcj-jdk [i386 mips mipsel s390 armel amd64 ia64
s390x sparc], libgcj-common (>= 1:4.4.1) [i386 mips mipsel s390 armel amd64
ia64 s390x sparc] , ant (>= 1.7.0) [i386 powerpc mips mipsel s390 armel amd64
ia64 ppc64 s390x sparc], ant-optional (>= 1.7.0) [i386 powerpc mips mipsel s390
armel amd64 ia64 ppc64 s390x sparc] , mingw32 [i386 powerpc mips mipsel s390
armel amd64 ia64 ppc64 s390x sparc] , libcommons-codec-java [i386 powerpc mips
mipsel s390 armel amd64 ia64 ppc64 s390x sparc], libcommons-httpclient-java
[i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x sparc],
libcommons-lang-java [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64
s390x sparc], libcommons-logging-java [i386 powerpc mips mipsel s390 armel
amd64 ia64 ppc64 s390x sparc] , libbase-java-openoffice.org [i386 powerpc mips
mipsel s390 armel amd64 ia64 ppc64 s390x sparc], libsac-java [i386 powerpc mips
mipsel s390 armel amd64 ia64 ppc64 s390x sparc], libxml-java-openoffice
.org [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x sparc],
libflute-java-openoffice.org [i386 powerpc mips mipsel s390 armel amd64 ia64
ppc64 s390x sparc], libpentaho-reporting-flow-engine-java-openoffice.org [i386
powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x sparc],
liblayout-java-openoffice.org [i386 powerpc mips mipsel s390 armel amd64 ia64
ppc64 s390x sparc], libloader-java-openoffice.org [i386 powerpc mips mipsel
s390 armel amd64 ia64 ppc64 s390x sparc], libformula-java-openoffice.org [i386
powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x sparc],
librepository-java-openoffice.org [i386 powerpc mips mipsel s390 armel amd64
ia64 ppc64 s390x sparc], libfonts-java-openoffice.org [i386 powerpc mips mipsel
s390 armel amd64 ia64 ppc64 s390x sparc], libserializer-java-openoffice.org
[i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x sparc] ,
libcommons-logging-java [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64
s390x sparc] , xulrunne
r-dev [i386 powerpc mips mipsel s390 arm armel amd64 ia64 ppc64 s390x sparc],
libnss3-dev [i386 powerpc mips mipsel s390 arm armel amd64 ia64 ppc64 s390x
sparc] , dmake (>= 1:4.11) , mono-devel (>= 2.0.1) [i386 amd64 ia64 sparc],
libmono-dev (>= 2.0.1) [i386 amd64 ia64 sparc], mono-utils (>= 2.0.1) [i386
amd64 ia64 sparc], cli-common-dev (>= 0.5.7) [i386 amd64 ia64 sparc] ,
libhunspell-dev (>= 1.1.5-2) , libhyphen-dev (>= 2.4) , libstlport4.6-dev (>=
4.6.2-3) [i386] , libboost-dev , libvigraimpex-dev , libwpd8-dev (>= 0.8.3-3) ,
libwps-dev , libwpg-dev , libicu-dev (>= 4.0) , libxslt1-dev , libcairo2-dev ,
kdelibs5-dev , libqt4-dev (>= 4.5) , libmysqlclient-dev , libmysqlcppconn-dev
(>= 1.1.0~r791) [powerpc mips mipsel armel s390 m68k amd64 ia64 ppc64 s390x
sparc] , libebook1.2-dev , libxrandr-dev , liblucene2-java (>= 2.3.2) [i386
powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x sparc] , libhsqldb-java
(>> 1.8.0.10) [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64
s390x sparc] , bsh (>= 2.0b4) [i386 powerpc mips mipsel s390 armel amd64 ia64
ppc64 s390x sparc] , 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 , librdf0-dev ,
libgtk2.0-dev (>= 2.10) , libgnomevfs2-dev , libgconf2-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, libjpeg62-dev, libxml2-dev,
libldap2-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.14.11) , 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) , libcurl4-gnutls-dev
, libssl-dev , libdb-dev , python-central (>= 0.5) , python-dev , debhelper (>=
6.0.7~) , openjdk-6-jdk [i386 powerpc armel s390 m68k amd64 ppc64 s390x
sparc] , gcj-jdk [i386 mips mipsel s390 armel amd64 ia64 s390x sparc],
libgcj-common (>= 1:4.4.1) [i386 mips mipsel s390 armel amd64 ia64 s390x sparc]
, ant (>= 1.7.0) [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x
sparc], ant-optional (>= 1.7.0) [i386 powerpc mips mipsel s390 armel amd64 ia64
ppc64 s390x sparc] , gcc-mingw32 [i386 powerpc mips mipsel s390 armel amd64
ia64 ppc64 s390x sparc] , libcommons-codec-java [i386 powerpc mips mipsel s390
armel amd64 ia64 ppc64 s390x sparc], libcommons-httpclient-java [i386 powerpc
mips mipsel s390 armel amd64 ia64 ppc64 s390x sparc], libcommons-lang-java
[i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x sparc],
libcommons-logging-java [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64
s390x sparc] , libbase-java-openoffice.org [i386 powerpc mips mipsel s390 armel
amd64 ia64 ppc64 s390x sparc], libsac-java [i386 powerpc mips mipsel s390
armel amd64 ia64 ppc64 s390x sparc], libxml-java-openoffice.org [i386 powerpc
mips mipsel s390 armel amd64 ia64 ppc64 s390x sparc],
libflute-java-openoffice.org [i386 powerpc mips mipsel s390 armel amd64 ia64
ppc64 s390x sparc], libpentaho-reporting-flow-engine-java-openoffice.org [i386
powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x sparc],
liblayout-java-openoffice.org [i386 powerpc mips mipsel s390 armel amd64 ia64
ppc64 s390x sparc], libloader-java-openoffice.org [i386 powerpc mips mipsel
s390 armel amd64 ia64 ppc64 s390x sparc], libformula-java-openoffice.org [i386
powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x sparc],
librepository-java-openoffice.org [i386 powerpc mips mipsel s390 armel amd64
ia64 ppc64 s390x sparc], libfonts-java-openoffice.org [i386 powerpc mips mipsel
s390 armel amd64 ia64 ppc64 s390x sparc], libserializer-java-openoffice.org
[i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x sparc] ,
libcommons-logging-java [i386 powerpc mips
mipsel s390 armel amd64 ia64 ppc64 s390x sparc] , xulrunner-dev [i386 powerpc
mips mipsel s390 arm armel amd64 ia64 ppc64 s390x sparc hppa], libnss3-dev
[i386 powerpc mips mipsel s390 arm armel amd64 ia64 ppc64 s390x sparc hppa] ,
dmake (>= 1:4.11) , mono-devel (>= 2.0.1) [i386 amd64 ia64 sparc], libmono-dev
(>= 2.0.1) [i386 amd64 ia64 sparc], mono-utils (>= 2.0.1) [i386 amd64 ia64
sparc], cli-common-dev (>= 0.5.7) [i386 amd64 ia64 sparc] , libhunspell-dev (>=
1.1.5-2) , libhyphen-dev (>= 2.4) , libstlport4.6-dev (>= 4.6.2-3) [i386] ,
libboost-dev , libvigraimpex-dev , libwpd8-dev (>= 0.8.3-3) , libwps-dev ,
libwpg-dev , libicu-dev (>= 4.0) , libxslt1-dev , libcairo2-dev , kdelibs5-dev
, libqt4-dev (>= 4.5) , libmysqlclient-dev , libmysqlcppconn-dev (>=
1.1.0~r791) [powerpc mips mipsel armel s390 m68k amd64 ia64 ppc64 s390x sparc
hppa] , libebook1.2-dev , libxrandr-dev , liblucene2-java (>= 2.3.2) [i386
powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x sparc] , libhsqld
b-java (>> 1.8.0.10) [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64
s390x sparc] , bsh (>= 2.0b4) [i386 powerpc mips mipsel s390 armel amd64 ia64
ppc64 s390x sparc] , 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 , librdf0-dev ,
libgtk2.0-dev (>= 2.10) , libgnomevfs2-dev , libgconf2-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), base-files (= 5)
Standards-Version: 3.8.3
XS-Python-Version: current
@@ -12,7 +12,7 @@
Homepage: http://www.go-oo.org
Package: openoffice.org
-Architecture: i386 powerpc mips mipsel armel s390 m68k amd64 ia64 ppc64 s390x
sparc
+Architecture: i386 powerpc mips mipsel armel s390 m68k amd64 ia64 ppc64 s390x
sparc hppa
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, ${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,
graphicsmagick-imagemagick-compat | imagemagick, libpaper-utils,
${gstreamer-plugins-suggests}
@@ -97,7 +97,7 @@
indic languages.
Package: openoffice.org-core
-Architecture: i386 powerpc mips mipsel armel s390 m68k amd64 ia64 ppc64 s390x
sparc
+Architecture: i386 powerpc mips mipsel armel s390 m68k amd64 ia64 ppc64 s390x
sparc hppa
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-i
mpress (<< ${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)
@@ -140,7 +140,7 @@
the Java support for OpenOffice.org (Java classes, scripts, config snippets).
Package: openoffice.org-writer
-Architecture: i386 powerpc mips mipsel armel s390 m68k amd64 ia64 ppc64 s390x
sparc
+Architecture: i386 powerpc mips mipsel armel s390 m68k amd64 ia64 ppc64 s390x
sparc hppa
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)
@@ -154,7 +154,7 @@
This package contains the wordprocessor component for OpenOffice.org.
Package: openoffice.org-calc
-Architecture: i386 powerpc mips mipsel armel s390 m68k amd64 ia64 ppc64 s390x
sparc
+Architecture: i386 powerpc mips mipsel armel s390 m68k amd64 ia64 ppc64 s390x
sparc hppa
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})
@@ -166,7 +166,7 @@
This package contains the spreadsheet component for OpenOffice.org.
Package: openoffice.org-impress
-Architecture: i386 powerpc mips mipsel armel s390 m68k amd64 ia64 ppc64 s390x
sparc
+Architecture: i386 powerpc mips mipsel armel s390 m68k amd64 ia64 ppc64 s390x
sparc hppa
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
@@ -178,7 +178,7 @@
This package contains the presentation component for OpenOffice.org.
Package: openoffice.org-draw
-Architecture: i386 powerpc mips mipsel armel s390 m68k amd64 ia64 ppc64 s390x
sparc
+Architecture: i386 powerpc mips mipsel armel s390 m68k amd64 ia64 ppc64 s390x
sparc hppa
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})
@@ -190,7 +190,7 @@
This package contains the drawing component for OpenOffice.org.
Package: openoffice.org-math
-Architecture: i386 powerpc mips mipsel armel s390 m68k amd64 ia64 ppc64 s390x
sparc
+Architecture: i386 powerpc mips mipsel armel s390 m68k amd64 ia64 ppc64 s390x
sparc hppa
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})
@@ -202,7 +202,7 @@
This package contains the equation editor component for OpenOffice.org.
Package: openoffice.org-base-core
-Architecture: i386 powerpc mips mipsel armel s390 m68k amd64 ia64 ppc64 s390x
sparc
+Architecture: i386 powerpc mips mipsel armel s390 m68k amd64 ia64 ppc64 s390x
sparc hppa
Depends: openoffice.org-core (= ${binary:Version}), ${shlibs:Depends},
${misc:Depends}
Replaces: openoffice.org-base (<< 1:2.3.1)
Suggests: openoffice.org-base
@@ -217,7 +217,7 @@
install openoffice.org-base.
Package: openoffice.org-base
-Architecture: i386 powerpc mips mipsel armel s390 m68k amd64 ia64 ppc64 s390x
sparc
+Architecture: i386 powerpc mips mipsel armel s390 m68k amd64 ia64 ppc64 s390x
sparc hppa
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}
Suggests: unixodbc, libmyodbc | odbc-postgresql | libsqliteodbc | tdsodbc |
mdbtools, libmysql-java | libpg-java | libjtds-java, openoffice.org-gcj,
openoffice.org-report-builder
@@ -338,7 +338,7 @@
option menu.
Package: openoffice.org-gtk
-Architecture: i386 powerpc mips mipsel armel s390 m68k amd64 ia64 ppc64 s390x
sparc
+Architecture: i386 powerpc mips mipsel armel s390 m68k amd64 ia64 ppc64 s390x
sparc hppa
Depends: openoffice.org-core (= ${binary:Version}), ${shlibs:Depends},
${misc:Depends}
Recommends: openoffice.org-style-tango
Section: gnome
@@ -354,7 +354,7 @@
contains a QuickStarter for the "notification area".
Package: openoffice.org-gnome
-Architecture: i386 powerpc mips mipsel armel s390 m68k amd64 ia64 ppc64 s390x
sparc
+Architecture: i386 powerpc mips mipsel armel s390 m68k amd64 ia64 ppc64 s390x
sparc hppa
Depends: openoffice.org-core (= ${binary:Version}), openoffice.org-gtk,
gconf2, ${shlibs:Depends}, ${misc:Depends}
Suggests: openoffice.org-evolution
Section: gnome
@@ -374,7 +374,7 @@
* evolution
Package: openoffice.org-evolution
-Architecture: i386 powerpc mips mipsel armel s390 m68k amd64 ia64 ppc64 s390x
sparc
+Architecture: i386 powerpc mips mipsel armel s390 m68k amd64 ia64 ppc64 s390x
sparc hppa
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}
@@ -406,7 +406,7 @@
Provides: ${python:Provides}
XB-Python-Version: ${python:Versions}
Section: python
-Architecture: i386 powerpc mips mipsel armel s390 m68k amd64 ia64 ppc64 s390x
sparc
+Architecture: i386 powerpc mips mipsel armel s390 m68k amd64 ia64 ppc64 s390x
sparc hppa
Enhances: openoffice.org
Depends: openoffice.org-core (= ${binary:Version}), ${python:Depends},
${shlibs:Depends}, ${misc:Depends}
Replaces: openoffice.org-common (<< 1.9.82)
@@ -434,7 +434,7 @@
Package: openoffice.org-filter-binfilter
Section: misc
-Architecture: i386 powerpc mips mipsel s390 m68k amd64 ia64 ppc64 s390x sparc
+Architecture: i386 powerpc mips mipsel s390 m68k amd64 ia64 ppc64 s390x sparc
hppa
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}
Replaces: openoffice.org2-core (<= 1.9.108-1), openoffice.org-math (<<
1.9.113-0pre1), openoffice.org-calc (<< 1.9.113-0pre1), openoffice.org-core (<<
1:3.1.1~rc1-2), openoffice.org2-filter-so52, openoffice.org-filter-so52
@@ -469,7 +469,7 @@
Package: libmythes-dev
Section: libdevel
Suggests: perl
-Architecture: i386 powerpc mips mipsel armel s390 m68k amd64 ia64 ppc64 s390x
sparc
+Architecture: i386 powerpc mips mipsel armel s390 m68k amd64 ia64 ppc64 s390x
sparc hppa
Depends: ${misc:Depends}
Description: simple thesaurus library -- development files
MyThes is a simple thesaurus that uses a structured
@@ -3116,7 +3116,7 @@
Package: uno-libs3
Section: libs
-Architecture: i386 powerpc mips mipsel armel s390 m68k amd64 ia64 ppc64 s390x
sparc
+Architecture: i386 powerpc mips mipsel armel s390 m68k amd64 ia64 ppc64 s390x
sparc hppa
Depends: ${shlibs:Depends}, ${misc:Depends}
Replaces: ure (<< 1:3.0.0~beta2-1)
Description: OpenOffice.org UNO runtime environment -- public shared libraries
@@ -3139,7 +3139,7 @@
Package: uno-libs3-dbg
Section: debug
Priority: extra
-Architecture: i386 powerpc mips mipsel armel s390 m68k amd64 ia64 ppc64 s390x
sparc
+Architecture: i386 powerpc mips mipsel armel s390 m68k amd64 ia64 ppc64 s390x
sparc hppa
Depends: uno-libs3 (= ${ure:Version}), ${misc:Depends}
Replaces: ure-dbg (<< 1:3.0.0~beta2-1)
Description: OpenOffice.org UNO runtime environment -- public shared library
debug symbols
@@ -3161,7 +3161,7 @@
Package: ure
Section: libs
-Architecture: i386 powerpc mips mipsel armel s390 m68k amd64 ia64 ppc64 s390x
sparc
+Architecture: i386 powerpc mips mipsel armel s390 m68k amd64 ia64 ppc64 s390x
sparc hppa
Depends: uno-libs3 (= ${ure:Version}), ${shlibs:Depends}, ${misc:Depends}
Suggests: java5-runtime, cli-uno-bridge
Conflicts: cli-uno-bridge (<< 1:3.0.0~dev300m22), openoffice.org-writer2latex
(<< 0.5.0.2-3), openoffice.org-writer2xhtml (<< 0.5.0.2-3),
openoffice.org-report-builder (<< 1:1.0.5+3.0.1-5),
openoffice.org-wiki-publisher (<< 1.0+OOo3.0.1-5), openoffice.org-coooder (<<
1.1.1+ooo-build3.0.0.9+r14588-3)
@@ -3179,7 +3179,7 @@
Package: ure-dbg
Section: debug
Priority: extra
-Architecture: i386 powerpc mips mipsel armel s390 m68k amd64 ia64 ppc64 s390x
sparc
+Architecture: i386 powerpc mips mipsel armel s390 m68k amd64 ia64 ppc64 s390x
sparc hppa
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
@@ -3281,7 +3281,7 @@
Package: mozilla-openoffice.org
Section: net
-Architecture: i386 powerpc mips mipsel s390 arm armel amd64 ia64 ppc64 s390x
sparc
+Architecture: i386 powerpc mips mipsel s390 arm armel amd64 ia64 ppc64 s390x
sparc hppa
Enhances: iceape-browser,
iceweasel,
mozilla-browser,
@@ -3360,7 +3360,7 @@
Package: openoffice.org-presentation-minimizer
Section: misc
-Architecture: i386 powerpc mips mipsel armel s390 m68k amd64 ia64 ppc64 s390x
sparc
+Architecture: i386 powerpc mips mipsel armel s390 m68k amd64 ia64 ppc64 s390x
sparc hppa
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
@@ -3379,7 +3379,7 @@
Package: openoffice.org-presenter-console
Section: misc
-Architecture: i386 powerpc mips mipsel armel s390 m68k amd64 ia64 ppc64 s390x
sparc
+Architecture: i386 powerpc mips mipsel armel s390 m68k amd64 ia64 ppc64 s390x
sparc hppa
Conflicts: openoffice.org-presenter-screen
Provides: openoffice.org-presenter-screen
Replaces: openoffice.org-presenter-screen
@@ -3407,7 +3407,7 @@
Package: openoffice.org-pdfimport
Section: misc
Priority: extra
-Architecture: i386 powerpc mips mipsel armel s390 m68k amd64 ia64 ppc64 s390x
sparc
+Architecture: i386 powerpc mips mipsel armel s390 m68k amd64 ia64 ppc64 s390x
sparc hppa
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}
Description: OpenOffice.org extension for importing PDF documents
@@ -3431,7 +3431,7 @@
Package: openoffice.org-dbg
Section: debug
-Architecture: i386 powerpc mips mipsel armel s390 m68k amd64 ia64 ppc64 s390x
sparc
+Architecture: i386 powerpc mips mipsel armel s390 m68k amd64 ia64 ppc64 s390x
sparc hppa
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
@@ -3445,7 +3445,7 @@
Package: openoffice.org-dev
Section: devel
-Architecture: i386 powerpc mips mipsel armel s390 m68k amd64 ia64 ppc64 s390x
sparc
+Architecture: i386 powerpc mips mipsel armel s390 m68k amd64 ia64 ppc64 s390x
sparc hppa
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
@@ -3482,7 +3482,7 @@
It also contains the gsicheck utility.
Package: openoffice.org-kde
-Architecture: i386 powerpc mips mipsel armel s390 m68k amd64 ia64 ppc64 s390x
sparc
+Architecture: i386 powerpc mips mipsel armel s390 m68k amd64 ia64 ppc64 s390x
sparc hppa
Depends: openoffice.org-core (= ${binary:Version}), ${shlibs:Depends},
${misc:Depends}
Recommends: ${kde-iconset-dep}
Suggests: konqueror, kmail, openoffice.org-kab
@@ -3503,7 +3503,7 @@
* openoffice.org-kab: KDE Addressbook support
Package: openoffice.org-kab
-Architecture: i386 powerpc mips mipsel armel s390 m68k amd64 ia64 ppc64 s390x
sparc
+Architecture: i386 powerpc mips mipsel armel s390 m68k amd64 ia64 ppc64 s390x
sparc hppa
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
@@ -3517,7 +3517,7 @@
Package: openoffice.org-sdbc-postgresql
Section: misc
-Architecture: i386 powerpc mips mipsel armel s390 m68k amd64 ia64 ppc64 s390x
sparc
+Architecture: i386 powerpc mips mipsel armel s390 m68k amd64 ia64 ppc64 s390x
sparc hppa
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)
@@ -3532,7 +3532,7 @@
Package: openoffice.org-mysql-connector
Section: misc
-Architecture: i386 powerpc mips mipsel armel s390 m68k amd64 ia64 ppc64 s390x
sparc
+Architecture: i386 powerpc mips mipsel armel s390 m68k amd64 ia64 ppc64 s390x
sparc hppa
Pre-Depends: openoffice.org-common, debconf (>= 0.5) | debconf-2.0, procps
Depends: ${shlibs:Depends}, openoffice.org-core (>> 1:3.1~), ${misc:Depends}
Suggests: mysql-server (>= 5.1)
=== modified file 'rules'
--- a/rules 2009-12-08 21:38:41 +0000
+++ b/rules 2009-12-08 22:30:37 +0000
@@ -83,7 +83,6 @@
BUILD_PPC64=y
BUILD_S390X=y
BUILD_SPARC=y
-BUILD_HPPA=y
PATCHSET=$(DIST)
BUILD_DEPS=
BUILD_PYUNO=y
@@ -395,9 +394,6 @@
ifeq "$(BUILD_SPARC)" "y"
OOO_ARCHS += sparc
endif
-ifeq "$(BUILD_HPPA)" "y"
- OOO_ARCHS += hppa
-endif
# Java...
OOO_JAVA_ARCHS = i386 powerpc mips mipsel s390 armel
ifeq "$(BUILD_AMD64)" "y"
@@ -419,6 +415,8 @@
# gcj does not work on ppc, so no need to build -gcj for it
OOO_GCJ_ARCHS := $(filter-out ppc64,$(filter-out powerpc,$(OOO_JAVA_ARCHS)))
+OOO_GCJ_JDK_ARCHS := ia64 mips mipsel kfreebsd-i386 kfreebsd-amd64 hppa
+
ifeq (,$(findstring $(ARCH),$(OOO_JAVA_ARCHS)))
ENABLE_JAVA=n
ENABLE_REPORTDESIGN=n
@@ -491,9 +489,6 @@
ifeq "$(BUILD_SPARC)" "y"
OOO_MOZILLA_ARCHS += sparc
endif
-ifeq "$(BUILD_HPPA)" "y"
- OOO_MOZILLA_ARCHS += hppa
-endif
ifeq "$(USE_BZIP_COMPRESS)" "y"
DPKG_DEPENDS = dpkg (>= 1.10.24)
@@ -681,15 +676,10 @@
BUILD_DEPS += , gcj-jdk [$(OOO_JAVA_ARCHS)]
endif
ifeq "$(JDK)" "openjdk"
- BUILD_DEPS += , openjdk-6-jdk
+ BUILD_DEPS += , openjdk-6-jdk [$(filter-out
$(OOO_GCJ_JDK_ARCHS),$(OOO_ARCHS))]
JAVA_HOME=/usr/lib/jvm/java-6-openjdk
CONFIGURE_FLAGS += --with-java-target-version=1.5
endif
- ifeq "$(JDK)" "openjdk-cacao"
- BUILD_DEPS += , cacao-oj6-jdk
- JAVA_HOME=/usr/lib/jvm/java-6-cacao
- CONFIGURE_FLAGS += --with-java-target-version=1.5
- endif
ifeq "$(BUILD_JARS_NATIVE)" "y"
CONFIGURE_FLAGS += --enable-gcjaot
ifeq "$(LENNY_BACKPORT)" "y"
@@ -713,9 +703,6 @@
ifneq (,$(filter $(ARCH), amd64 i386 sparc powerpc alpha mips mipsel m68k
s390))
JAVA_RUNTIME_DEPENDS += | openjdk-6-jre
endif
-# ifneq (,$(filter $(ARCH), alpha powerpc amd64 i386 mips mipsel))
-# JAVA_RUNTIME_DEPENDS += | cacao-oj6-jre
-# endif
ifneq (,$(filter $(ARCH), amd64 i386))
JAVA_RUNTIME_DEPENDS += | sun-java5-jre | sun-java6-jre
endif
=== removed file 'scripts/vars.hppa'
--- a/scripts/vars.hppa 2009-11-30 10:05:48 +0000
+++ b/scripts/vars.hppa 1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-LIBSUFFIX=lh
-PLATFORMID=linux_hppa
