------------------------------------------------------------
revno: 1675
committer: Rene Engelhard <r...@debian.org>
branch nick: debian
timestamp: Mon 2009-09-21 03:08:46 +0200
message:
update ooo-build; add s390x
modified:
changelog
control
rules
=== modified file 'changelog'
--- a/changelog 2009-09-16 13:28:47 +0000
+++ b/changelog 2009-09-21 01:08:46 +0000
@@ -3,14 +3,17 @@
* The "Goodbye sparc!" release. :-(
* ooo-build:
- - update (2bd5d28c97d3d84756bb5f88a3be0487a62fe9b0)
+ - update (e43be3327f9ee193d09f0365607469f849846d04)
* merge from Ubuntu:
- Add support to turn off building on sparc.
- * debian/rules: don't build sparc. Too many random(!) build failures
+ * debian/rules:
+ - don't build sparc. Too many random(!) build failures
+ - add ENABLE_S390X conditionals. enable. forgotten so far although OOo
+ claims to support s390x
* debian/control.mysql.in: remove bogus conflicts, add Homepage:
- -- Rene Engelhard <r...@debian.org> Wed, 16 Sep 2009 15:27:39 +0200
+ -- Rene Engelhard <r...@debian.org> Mon, 21 Sep 2009 03:02:00 +0200
openoffice.org (1:3.1.1-2) unstable; urgency=low
=== modified file 'control'
--- a/control 2009-09-15 13:15:13 +0000
+++ b/control 2009-09-21 01:08:46 +0000
@@ -3,8 +3,8 @@
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, bc , g++ (>> 4.3.0) [s390],
gcc (>> 4.3.0) [s390] , dpkg-dev (>= 1.14.11) , libgl1-mesa-dev [i386 powerpc
s390 amd64 ia64 ppc64], libglu1-mesa-dev [i386 powerpc s390 amd64 ia64 ppc64] ,
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-jd
k [i386 mips mipsel s390 armel amd64 ia64], libgcj-common (>= 1:4.4.0) [i386
mips mipsel s390 armel amd64 ia64] , ant (>= 1.7.0) [i386 powerpc mips mipsel
s390 armel amd64 ia64 ppc64], ant-optional (>= 1.7.0) [i386 powerpc mips mipsel
s390 armel amd64 ia64 ppc64] , mingw32 [i386 powerpc mips mipsel s390 armel
amd64 ia64 ppc64] , libcommons-codec-java [i386 powerpc mips mipsel s390 armel
amd64 ia64 ppc64], libcommons-httpclient-java [i386 powerpc mips mipsel s390
armel amd64 ia64 ppc64], libcommons-lang-java [i386 powerpc mips mipsel s390
armel amd64 ia64 ppc64], libcommons-logging-java [i386 powerpc mips mipsel s390
armel amd64 ia64 ppc64] , libbase-java-openoffice.org [i386 powerpc mips mipsel
s390 armel amd64 ia64 ppc64], libsac-java [i386 powerpc mips mipsel s390 armel
amd64 ia64 ppc64], libxml-java-openoffice.org [i386 powerpc mips mipsel s390
armel amd64 ia64 ppc64], libflute-java-openoffice.org [i386 powerpc mips mipsel
s390 armel amd64 ia64 ppc64], libpentaho-reportin
g-flow-engine-java-openoffice.org [i386 powerpc mips mipsel s390 armel amd64
ia64 ppc64], liblayout-java-openoffice.org [i386 powerpc mips mipsel s390 armel
amd64 ia64 ppc64], libloader-java-openoffice.org [i386 powerpc mips mipsel s390
armel amd64 ia64 ppc64], libformula-java-openoffice.org [i386 powerpc mips
mipsel s390 armel amd64 ia64 ppc64], librepository-java-openoffice.org [i386
powerpc mips mipsel s390 armel amd64 ia64 ppc64], libfonts-java-openoffice.org
[i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64],
libserializer-java-openoffice.org [i386 powerpc mips mipsel s390 armel amd64
ia64 ppc64] , libcommons-logging-java [i386 powerpc mips mipsel s390 armel
amd64 ia64 ppc64] , iceape-dev (>= 1.1.9-5) [i386 powerpc mips mipsel s390 arm
armel amd64 ia64 ppc64], libnss3-dev [i386 powerpc mips mipsel s390 arm armel
amd64 ia64 ppc64] , dmake (>= 1:4.11) , mono-devel (>= 2.0.1) [i386 amd64
ia64], libmono-dev (>= 2.0.1) [i386 amd64 ia64], mono-utils (>= 2.0.1) [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 , 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) , libebook1.2-dev , libxrandr-dev , liblucene2-java (>=
2.3.2) [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64] , libhsqldb-java
(>> 1.8.0.10) [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64] , bsh (>=
2.0b4) [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64] ,
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-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)
+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, bc , 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], libglu1-mesa-dev [i386 powerpc s390 amd64 ia64
ppc64 s390x] , libpoppler-dev (>= 0.8.0) , libcurl4-openssl-dev , libssl-dev ,
libdb-dev , python-central (>= 0.5) , python-dev , debhelper (>= 6.0.7~) ,
openjdk-6
-jdk , gij [i386 mips mipsel s390 armel amd64 ia64 s390x], java-gcj-compat-dev
(>= 1.0.76-7) [i386 mips mipsel s390 armel amd64 ia64 s390x], libgcj-bc [i386
mips mipsel s390 armel amd64 ia64 s390x] , ant (>= 1.7.0) [i386 powerpc mips
mipsel s390 armel amd64 ia64 ppc64 s390x], ant-optional (>= 1.7.0) [i386
powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x] , mingw32 [i386 powerpc
mips mipsel s390 armel amd64 ia64 ppc64 s390x] , libcommons-codec-java [i386
powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x],
libcommons-httpclient-java [i386 powerpc mips mipsel s390 armel amd64 ia64
ppc64 s390x], libcommons-lang-java [i386 powerpc mips mipsel s390 armel amd64
ia64 ppc64 s390x], libcommons-logging-java [i386 powerpc mips mipsel s390 armel
amd64 ia64 ppc64 s390x] , iceape-dev (>= 1.1.9-5) [i386 powerpc mips mipsel
s390 arm armel amd64 ia64 ppc64 s390x], libnss3-dev [i386 powerpc mips mipsel
s390 arm armel amd64 ia64 ppc64 s390x] , dmake (>= 1:4.11) , mono-mcs (>=
1.2.3) [i
386 amd64 ia64], mono-gmcs (>= 1.2.3) [i386 amd64 ia64], libmono-dev (>=
1.2.3) [i386 amd64 ia64], mono-utils (>= 1.2.3) [i386 amd64 ia64],
cli-common-dev (>= 0.5.7) [i386 amd64 ia64], mono-1.0-devel [i386 amd64 ia64],
mono-2.0-devel [i386 amd64 ia64] , 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 ,
libxslt1-dev , libcairo2-dev , kdelibs4-dev , libebook1.2-dev , libxrandr-dev ,
libhsqldb-java (>> 1.8.0.9) [i386 powerpc mips mipsel s390 armel amd64 ia64
ppc64 s390x] , bsh (>= 2.0b4) [i386 powerpc mips mipsel s390 armel amd64 ia64
ppc64 s390x] , liblpsolve55-dev (>= 5.5.0.10-10), lp-solve (>= 5.5.0.10-10) ,
libsuitesparse-dev (>= 3.1.0) , libdbus-glib-1-dev (>= 0.60) ,
libgstreamer-plugins-base0.10-dev , libneon27-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)
Standards-Version: 3.8.3
XS-Python-Version: current
Vcs-Bzr:
nosmart+http://bzr.debian.org/pkg-openoffice/packages/openofficeorg/3.1/unstable
@@ -12,7 +12,7 @@
Homepage: http://www.go-oo.org
Package: openoffice.org
-Architecture: i386 powerpc mips mipsel armel s390 m68k amd64 ia64 ppc64
+Architecture: i386 powerpc mips mipsel armel s390 m68k amd64 ia64 ppc64 s390x
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
+Architecture: i386 powerpc mips mipsel armel s390 m68k amd64 ia64 ppc64 s390x
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)
Provides: openoffice.org-bundled, openoffice.org2-core, openoffice.org-java,
openoffice.org2-hunspell, openoffice.org-hunspell
@@ -139,7 +139,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
+Architecture: i386 powerpc mips mipsel armel s390 m68k amd64 ia64 ppc64 s390x
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)
@@ -153,7 +153,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
+Architecture: i386 powerpc mips mipsel armel s390 m68k amd64 ia64 ppc64 s390x
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})
@@ -165,7 +165,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
+Architecture: i386 powerpc mips mipsel armel s390 m68k amd64 ia64 ppc64 s390x
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
@@ -177,7 +177,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
+Architecture: i386 powerpc mips mipsel armel s390 m68k amd64 ia64 ppc64 s390x
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})
@@ -189,7 +189,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
+Architecture: i386 powerpc mips mipsel armel s390 m68k amd64 ia64 ppc64 s390x
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})
@@ -201,7 +201,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
+Architecture: i386 powerpc mips mipsel armel s390 m68k amd64 ia64 ppc64 s390x
Depends: openoffice.org-core (= ${binary:Version}), ${shlibs:Depends},
${misc:Depends}
Replaces: openoffice.org-base (<< 1:2.3.1)
Suggests: openoffice.org-base
@@ -216,7 +216,7 @@
install openoffice.org-base.
Package: openoffice.org-base
-Architecture: i386 powerpc mips mipsel armel s390 m68k amd64 ia64 ppc64
+Architecture: i386 powerpc mips mipsel armel s390 m68k amd64 ia64 ppc64 s390x
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
@@ -331,7 +331,7 @@
option menu.
Package: openoffice.org-gtk
-Architecture: i386 powerpc mips mipsel armel s390 m68k amd64 ia64 ppc64
+Architecture: i386 powerpc mips mipsel armel s390 m68k amd64 ia64 ppc64 s390x
Depends: openoffice.org-core (= ${binary:Version}),
openoffice.org-style-tango, ${shlibs:Depends}, ${misc:Depends}
Section: gnome
Enhances: openoffice.org
@@ -346,7 +346,7 @@
contains a QuickStarter for the "notification area".
Package: openoffice.org-gnome
-Architecture: i386 powerpc mips mipsel armel s390 m68k amd64 ia64 ppc64
+Architecture: i386 powerpc mips mipsel armel s390 m68k amd64 ia64 ppc64 s390x
Depends: openoffice.org-core (= ${binary:Version}), openoffice.org-gtk,
gconf2, ${shlibs:Depends}, ${misc:Depends}
Suggests: openoffice.org-evolution
Section: gnome
@@ -366,7 +366,7 @@
* evolution
Package: openoffice.org-evolution
-Architecture: i386 powerpc mips mipsel armel s390 m68k amd64 ia64 ppc64
+Architecture: i386 powerpc mips mipsel armel s390 m68k amd64 ia64 ppc64 s390x
Section: gnome
Pre-Depends: openoffice.org-core (>= 1:3.1.0-2)
Depends: openoffice.org-core (= ${binary:Version}), openoffice.org-base,
${shlibs:Depends}, ${libebook-dep}, ${misc:Depends}
@@ -398,7 +398,7 @@
Provides: ${python:Provides}
XB-Python-Version: ${python:Versions}
Section: python
-Architecture: i386 powerpc mips mipsel armel s390 m68k amd64 ia64 ppc64
+Architecture: i386 powerpc mips mipsel armel s390 m68k amd64 ia64 ppc64 s390x
Enhances: openoffice.org
Depends: openoffice.org-core (= ${binary:Version}), ${python:Depends},
${shlibs:Depends}, ${misc:Depends}
Replaces: openoffice.org-common (<< 1.9.82)
@@ -411,7 +411,7 @@
Homepage: http://udk.openoffice.org/python/python-bridge.html
Package: openoffice.org-officebean
-Architecture: i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64
+Architecture: i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x
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
@@ -426,7 +426,7 @@
Package: openoffice.org-filter-binfilter
Section: misc
-Architecture: i386 powerpc mips mipsel s390 m68k amd64 ia64 ppc64
+Architecture: i386 powerpc mips mipsel s390 m68k amd64 ia64 ppc64 s390x
Pre-Depends: openoffice.org-core (>= 1:3.1.0-2)
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
@@ -461,7 +461,7 @@
Package: libmythes-dev
Section: libdevel
Suggests: perl
-Architecture: i386 powerpc mips mipsel armel s390 m68k amd64 ia64 ppc64
+Architecture: i386 powerpc mips mipsel armel s390 m68k amd64 ia64 ppc64 s390x
Depends: ${misc:Depends}
Description: simple thesaurus library -- development files
MyThes is a simple thesaurus that uses a structured
@@ -3094,7 +3094,7 @@
Package: uno-libs3
Section: libs
-Architecture: i386 powerpc mips mipsel armel s390 m68k amd64 ia64 ppc64
+Architecture: i386 powerpc mips mipsel armel s390 m68k amd64 ia64 ppc64 s390x
Depends: ${shlibs:Depends}, ${misc:Depends}
Replaces: ure (<< 1:3.0.0~beta2-1)
Description: OpenOffice.org UNO runtime environment -- public shared libraries
@@ -3117,7 +3117,7 @@
Package: uno-libs3-dbg
Section: debug
Priority: extra
-Architecture: i386 powerpc mips mipsel armel s390 m68k amd64 ia64 ppc64
+Architecture: i386 powerpc mips mipsel armel s390 m68k amd64 ia64 ppc64 s390x
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
@@ -3139,7 +3139,7 @@
Package: ure
Section: libs
-Architecture: i386 powerpc mips mipsel armel s390 m68k amd64 ia64 ppc64
+Architecture: i386 powerpc mips mipsel armel s390 m68k amd64 ia64 ppc64 s390x
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)
@@ -3157,7 +3157,7 @@
Package: ure-dbg
Section: debug
Priority: extra
-Architecture: i386 powerpc mips mipsel armel s390 m68k amd64 ia64 ppc64
+Architecture: i386 powerpc mips mipsel armel s390 m68k amd64 ia64 ppc64 s390x
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
@@ -3172,7 +3172,7 @@
This package contains the (detached) debug symbols for the URE.
Package: openoffice.org-gcj
-Architecture: i386 mips mipsel s390 armel amd64 ia64
+Architecture: i386 mips mipsel s390 armel amd64 ia64 s390x
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
@@ -3259,7 +3259,7 @@
Package: mozilla-openoffice.org
Section: net
-Architecture: i386 powerpc mips mipsel s390 arm armel amd64 ia64 ppc64
+Architecture: i386 powerpc mips mipsel s390 arm armel amd64 ia64 ppc64 s390x
Enhances: iceape-browser,
iceweasel,
mozilla-browser,
@@ -3278,7 +3278,7 @@
Package: openoffice.org-ogltrans
Section: graphics
Priority: extra
-Architecture: i386 powerpc s390 amd64 ia64 ppc64
+Architecture: i386 powerpc s390 amd64 ia64 ppc64 s390x
Depends: ${shlibs:Depends}, openoffice.org-core (>> 1:3.1.0~),
openoffice.org-impress (>> 1:3.1.0~), openoffice.org-common (>> 1:3.1.0~),
${misc:Depends}
Enhances: openoffice.org-impress
Replaces: openoffice.org-impress (= 1:3.1.0~rc1-1)
@@ -3326,7 +3326,7 @@
Package: openoffice.org-report-builder-bin
Section: misc
-Architecture: i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64
+Architecture: i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x
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
@@ -3338,7 +3338,7 @@
Package: openoffice.org-presentation-minimizer
Section: misc
-Architecture: i386 powerpc mips mipsel armel s390 m68k amd64 ia64 ppc64
+Architecture: i386 powerpc mips mipsel armel s390 m68k amd64 ia64 ppc64 s390x
Pre-Depends: openoffice.org-common
Depends: ${shlibs:Depends}, openoffice.org-core (>= 2.3),
openoffice.org-impress, ${misc:Depends}
Enhances: openoffice.org-impress
@@ -3357,7 +3357,7 @@
Package: openoffice.org-presenter-console
Section: misc
-Architecture: i386 powerpc mips mipsel armel s390 m68k amd64 ia64 ppc64
+Architecture: i386 powerpc mips mipsel armel s390 m68k amd64 ia64 ppc64 s390x
Conflicts: openoffice.org-presenter-screen
Provides: openoffice.org-presenter-screen
Replaces: openoffice.org-presenter-screen
@@ -3385,7 +3385,7 @@
Package: openoffice.org-pdfimport
Section: misc
Priority: extra
-Architecture: i386 powerpc mips mipsel armel s390 m68k amd64 ia64 ppc64
+Architecture: i386 powerpc mips mipsel armel s390 m68k amd64 ia64 ppc64 s390x
Pre-Depends: openoffice.org-common
Depends: ${shlibs:Depends}, openoffice.org-core (>= 1:3.0.0~bea300~dev300m6),
${misc:Depends}
Description: OpenOffice.org extension for importing PDF documents
@@ -3409,7 +3409,7 @@
Package: openoffice.org-dbg
Section: debug
-Architecture: i386 powerpc mips mipsel armel s390 m68k amd64 ia64 ppc64
+Architecture: i386 powerpc mips mipsel armel s390 m68k amd64 ia64 ppc64 s390x
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
@@ -3423,7 +3423,7 @@
Package: openoffice.org-dev
Section: devel
-Architecture: i386 powerpc mips mipsel armel s390 m68k amd64 ia64 ppc64
+Architecture: i386 powerpc mips mipsel armel s390 m68k amd64 ia64 ppc64 s390x
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
@@ -3460,7 +3460,7 @@
It also contains the gsicheck utility.
Package: openoffice.org-kde
-Architecture: i386 powerpc mips mipsel armel s390 m68k amd64 ia64 ppc64
+Architecture: i386 powerpc mips mipsel armel s390 m68k amd64 ia64 ppc64 s390x
Depends: openoffice.org-core (= ${binary:Version}), ${kde-iconset-dep},
${shlibs:Depends}, ${misc:Depends}
Suggests: konqueror, kmail, openoffice.org-kab
Section: kde
@@ -3480,7 +3480,7 @@
* openoffice.org-kab: KDE Addressbook support
Package: openoffice.org-kab
-Architecture: i386 powerpc mips mipsel armel s390 m68k amd64 ia64 ppc64
+Architecture: i386 powerpc mips mipsel armel s390 m68k amd64 ia64 ppc64 s390x
Pre-Depends: openoffice.org-core (>= 1:3.1.0-2)
Depends: openoffice.org-core (= ${binary:Version}), ${shlibs:Depends},
${misc:Depends}
Recommends: kaddressbook
@@ -3494,7 +3494,7 @@
Package: openoffice.org-sdbc-postgresql
Section: misc
-Architecture: i386 powerpc mips mipsel armel s390 m68k amd64 ia64 ppc64
+Architecture: i386 powerpc mips mipsel armel s390 m68k amd64 ia64 ppc64 s390x
Pre-Depends: openoffice.org-common
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)
=== modified file 'rules'
--- a/rules 2009-09-16 15:22:02 +0000
+++ b/rules 2009-09-21 01:08:46 +0000
@@ -79,8 +79,9 @@
# Default package configuration
#
BUILD_AMD64=y
+BUILD_IA64=y
BUILD_PPC64=y
-BUILD_IA64=y
+BUILD_S390X=y
BUILD_SPARC=n
PATCHSET=$(DIST)
BUILD_DEPS=
@@ -354,6 +355,9 @@
ifeq "$(BUILD_PPC64)" "y"
OOO_OGLTRANS_ARCHS+= ppc64
endif
+ifeq "$(BUILD_S390X)" "y"
+ OOO_OGLTRANS_ARCHS+= s390x
+endif
ifeq "$(BUILD_SPARC)" "y"
OOO_OGLTRANS_ARCHS+= sparc
endif
@@ -374,6 +378,9 @@
ifeq "$(BUILD_PPC64)" "y"
OOO_ARCHS += ppc64
endif
+ifeq "$(BUILD_S390X)" "y"
+ OOO_ARCHS += s390x
+endif
ifeq "$(BUILD_SPARC)" "y"
OOO_ARCHS += sparc
endif
@@ -388,6 +395,9 @@
ifeq "$(BUILD_PPC64)" "y"
OOO_JAVA_ARCHS+= ppc64
endif
+ifeq "$(BUILD_S390X)" "y"
+ OOO_JAVA_ARCHS+= s390x
+endif
ifeq "$(BUILD_SPARC)" "y"
OOO_JAVA_ARCHS+= sparc
endif
@@ -461,6 +471,9 @@
ifeq "$(BUILD_PPC64)" "y"
OOO_MOZILLA_ARCHS += ppc64
endif
+ifeq "$(BUILD_S390X)" "y"
+ OOO_MOZILLA_ARCHS += s390x
+endif
ifeq "$(BUILD_SPARC)" "y"
OOO_MOZILLA_ARCHS += sparc
endif
