The following commit has been merged in the debian-experimental-3.5 branch:
commit 320e2c5ff29d337e5fc3a3368f9f5211a880cdf9
Author: Rene Engelhard <[email protected]>
Date: Wed Jan 11 15:23:16 2012 +0000
Revert "work around smoketest failure; disable base for powerpc(spe)/ppc64
as for armel"
This reverts commit 6eba544807e29f0d96ef8edf7f31332be592dff3.
diff --git a/changelog b/changelog
index 1ae7f78..0f2fac8 100644
--- a/changelog
+++ b/changelog
@@ -9,9 +9,6 @@ libreoffice (1:3.5.0~beta3-1) UNRELEASED; urgency=low
* debian/libreoffice-core.preinst.in:
- rm -f /var/lib/libreoffice/basis3.4/program/services.rdb on upgrade
(and for safety on install, too) (closes: #650341)
- * debian/rules:
- - work around smoketest failure; disable base for powerpc(spe)/ppc64 as
- for armel
* merge from ubuntu-precise-3.5:
- add debian multiarch support for Qt4
diff --git a/control b/control
index 9441af7..b621d07 100644
--- a/control
+++ b/control
@@ -3,7 +3,7 @@ Section: editors
Priority: optional
Maintainer: Debian LibreOffice Maintainers <[email protected]>
Uploaders: Rene Engelhard <[email protected]>
-Build-Depends: dpkg-dev (>= 1.16.1), lsb-release, bzip2, bison, flex |
flex-old, libxaw7-dev, unzip, zip, autoconf, automake, sharutils, pkg-config,
libfontconfig1-dev, libc0.1 (>= 2.10.2-7) [kfreebsd-i386 kfreebsd-amd64],
zlib1g-dev, libfreetype6-dev, libx11-dev, libsm-dev, libxt-dev, libxext-dev,
libxtst-dev, libice-dev, libcups2-dev, libarchive-zip-perl, fastjar, xsltproc,
libxkbfile-dev, libxinerama-dev, x11proto-render-dev, libxml-parser-perl,
gperf, po-debconf, bc, wget | curl, libgl1-mesa-dev [!armel !mips !mipsel],
libglu1-mesa-dev [!armel !mips !mipsel], libpoppler-dev (>= 0.8.0),
libpoppler-cpp-dev, libgraphite2-dev (>= 0.9.3) [!armel !sparc],
libexttextcat-dev (>= 3.1.1), libjpeg-dev, libxml2-dev, libxslt1-dev,
libexpat1-dev, unixodbc-dev (>= 2.2.11), libsane-dev, libxrender-dev,
libpng12-dev, libssl-dev, librsvg2-dev, libdb-dev, python (>=
2.6.6-3+squeeze4), python-dev (>= 2.6), python3-dev, debhelper (>= 7.2.3~),
libcppunit-dev (>= 1.12), openjdk-6-jdk (>= 6b23~
pre8-2) [alpha amd64 armel armhf i386 mips mipsel powerpc powerpcspe ppc64
s390 s390x sparc], openjdk-7-jdk [ia64], gcj-jdk [hppa kfreebsd-i386
kfreebsd-amd64], gcj-native-helper [hppa kfreebsd-amd64 kfreebsd-i386],
libgcj-common (>= 1:4.4.1) [hppa kfreebsd-amd64 kfreebsd-i386], ant (>= 1.7.0),
ant-optional (>= 1.7.0), mingw-w64 (>= 1.0), libcommons-codec-java,
libcommons-httpclient-java, libcommons-lang-java, libcommons-logging-java,
libservlet2.5-java (>= 1.1.1-9), libbase-java [!armel !hppa !kfreebsd-amd64
!kfreebsd-i386], libsac-java [!armel !hppa !kfreebsd-amd64 !kfreebsd-i386],
libxml-java (>= 1.1.6) [!armel !hppa !kfreebsd-amd64 !kfreebsd-i386],
libflute-java (>= 1.1.6) [!armel !hppa !kfreebsd-amd64 !kfreebsd-i386],
libpentaho-reporting-flow-engine-java (>= 0.9.4) [!armel !hppa !kfreebsd-amd64
!kfreebsd-i386], liblayout-java (>= 0.2.10) [!armel !hppa !kfreebsd-amd64
!kfreebsd-i386], libloader-java (>= 1.1.6) [!armel !hppa !kfreebsd-amd64
!kfreebsd-i386], libformula-ja
va (>= 1.1.7) [!armel !hppa !kfreebsd-amd64 !kfreebsd-i386],
librepository-java (>= 1.1.6) [!armel !hppa !kfreebsd-amd64 !kfreebsd-i386],
libfonts-java (>= 1.1.6) [!armel !hppa !kfreebsd-amd64 !kfreebsd-i386],
libserializer-java (>= 1.1.6) [!armel !hppa !kfreebsd-amd64 !kfreebsd-i386],
libcommons-logging-java, libavalon-framework-java, javahelper (>= 0.37~),
libnss3-dev (>= 3.12.3), xulrunner-dev, dmake (>= 1:4.11), libhunspell-dev (>=
1.1.5-2), libhyphen-dev (>= 2.4), libstlport4.6-dev (>= 4.6.2-3) [i386],
libboost1.46-dev, libmdds-dev (>= 0.5.0), libvigraimpex-dev, libsampleicc-dev,
libicc-utils-dev, libwpd-dev (>= 0.9.0), libmythes-dev (>= 2:1.2), libwps-dev
(>= 0.2.0), libwpg-dev (>= 0.2.0), libvisio-dev, libcmis-dev, libicu-dev (>=
4.0), libcairo2-dev, kdelibs5-dev (>= 4:4.3.4), libqt4-dev (>= 4.5),
libmysqlclient-dev, libmysqlcppconn-dev (>= 1.1.0~r791), libgtk2.0-dev (>=
2.10), libgtk-3-dev (>= 3.2~), libebook1.2-dev [!armel !powerpc !powerpcspe
!ppc64], libpq-dev (>=
9.0~), libxrandr-dev, liblucene2-java (>= 2.3.2), libhsqldb-java (>>
1.8.0.10), bsh (>= 2.0b4), 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.70),
libgstreamer-plugins-base0.10-dev, libneon27-gnutls-dev, librdf0-dev (>=
1.0.8), libgnomevfs2-dev, libgconf2-dev, liborbit2-dev, gettext, libldap2-dev
+Build-Depends: dpkg-dev (>= 1.16.1), lsb-release, bzip2, bison, flex |
flex-old, libxaw7-dev, unzip, zip, autoconf, automake, sharutils, pkg-config,
libfontconfig1-dev, libc0.1 (>= 2.10.2-7) [kfreebsd-i386 kfreebsd-amd64],
zlib1g-dev, libfreetype6-dev, libx11-dev, libsm-dev, libxt-dev, libxext-dev,
libxtst-dev, libice-dev, libcups2-dev, libarchive-zip-perl, fastjar, xsltproc,
libxkbfile-dev, libxinerama-dev, x11proto-render-dev, libxml-parser-perl,
gperf, po-debconf, bc, wget | curl, libgl1-mesa-dev [!armel !mips !mipsel],
libglu1-mesa-dev [!armel !mips !mipsel], libpoppler-dev (>= 0.8.0),
libpoppler-cpp-dev, libgraphite2-dev (>= 0.9.3) [!armel !sparc],
libexttextcat-dev (>= 3.1.1), libjpeg-dev, libxml2-dev, libxslt1-dev,
libexpat1-dev, unixodbc-dev (>= 2.2.11), libsane-dev, libxrender-dev,
libpng12-dev, libssl-dev, librsvg2-dev, libdb-dev, python (>=
2.6.6-3+squeeze4), python-dev (>= 2.6), python3-dev, debhelper (>= 7.2.3~),
libcppunit-dev (>= 1.12), openjdk-6-jdk (>= 6b23~
pre8-2) [alpha amd64 armel armhf i386 mips mipsel powerpc powerpcspe ppc64
s390 s390x sparc], openjdk-7-jdk [ia64], gcj-jdk [hppa kfreebsd-i386
kfreebsd-amd64], gcj-native-helper [hppa kfreebsd-amd64 kfreebsd-i386],
libgcj-common (>= 1:4.4.1) [hppa kfreebsd-amd64 kfreebsd-i386], ant (>= 1.7.0),
ant-optional (>= 1.7.0), mingw-w64 (>= 1.0), libcommons-codec-java,
libcommons-httpclient-java, libcommons-lang-java, libcommons-logging-java,
libservlet2.5-java (>= 1.1.1-9), libbase-java [!armel !hppa !kfreebsd-amd64
!kfreebsd-i386], libsac-java [!armel !hppa !kfreebsd-amd64 !kfreebsd-i386],
libxml-java (>= 1.1.6) [!armel !hppa !kfreebsd-amd64 !kfreebsd-i386],
libflute-java (>= 1.1.6) [!armel !hppa !kfreebsd-amd64 !kfreebsd-i386],
libpentaho-reporting-flow-engine-java (>= 0.9.4) [!armel !hppa !kfreebsd-amd64
!kfreebsd-i386], liblayout-java (>= 0.2.10) [!armel !hppa !kfreebsd-amd64
!kfreebsd-i386], libloader-java (>= 1.1.6) [!armel !hppa !kfreebsd-amd64
!kfreebsd-i386], libformula-ja
va (>= 1.1.7) [!armel !hppa !kfreebsd-amd64 !kfreebsd-i386],
librepository-java (>= 1.1.6) [!armel !hppa !kfreebsd-amd64 !kfreebsd-i386],
libfonts-java (>= 1.1.6) [!armel !hppa !kfreebsd-amd64 !kfreebsd-i386],
libserializer-java (>= 1.1.6) [!armel !hppa !kfreebsd-amd64 !kfreebsd-i386],
libcommons-logging-java, libavalon-framework-java, javahelper (>= 0.37~),
libnss3-dev (>= 3.12.3), xulrunner-dev, dmake (>= 1:4.11), libhunspell-dev (>=
1.1.5-2), libhyphen-dev (>= 2.4), libstlport4.6-dev (>= 4.6.2-3) [i386],
libboost1.46-dev, libmdds-dev (>= 0.5.0), libvigraimpex-dev, libsampleicc-dev,
libicc-utils-dev, libwpd-dev (>= 0.9.0), libmythes-dev (>= 2:1.2), libwps-dev
(>= 0.2.0), libwpg-dev (>= 0.2.0), libvisio-dev, libcmis-dev, libicu-dev (>=
4.0), libcairo2-dev, kdelibs5-dev (>= 4:4.3.4), libqt4-dev (>= 4.5),
libmysqlclient-dev, libmysqlcppconn-dev (>= 1.1.0~r791), libgtk2.0-dev (>=
2.10), libgtk-3-dev (>= 3.2~), libebook1.2-dev [!armel], libpq-dev (>= 9.0~),
libxrandr-dev, liblu
cene2-java (>= 2.3.2), libhsqldb-java (>> 1.8.0.10), bsh (>= 2.0b4),
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.70),
libgstreamer-plugins-base0.10-dev, libneon27-gnutls-dev, librdf0-dev (>=
1.0.8), libgnomevfs2-dev, libgconf2-dev, liborbit2-dev, gettext, libldap2-dev
Build-Depends-Indep: fdupes, xml-core, imagemagick, fontforge
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~), qt3-dev-tools, ant (= 1.8.0-1) [hppa kfreebsd-i386 kfreebsd-amd64],
ant (= 1.8.0-2) [hppa kfreebsd-i386 kfreebsd-amd64], ant (= 1.8.0-3) [hppa
kfreebsd-i386 kfreebsd-amd64], g++-4.6 (= 4.6.1-10), g++-4.6 (= 4.6.1-11),
base-files (= 6.0), base-files (= 6.0squeeze1), libhsqldb-java (>= 1.8.1~)
Standards-Version: 3.9.1
@@ -16,7 +16,7 @@ Homepage: http://www.libreoffice.org
Package: libreoffice
Architecture: alpha amd64 armel armhf hppa i386 ia64 mips mipsel powerpc
powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386
Section: metapackages
-Depends: libreoffice-core (= ${binary:Version}), libreoffice-writer,
libreoffice-calc, libreoffice-impress, libreoffice-draw, libreoffice-math,
libreoffice-base [!armel !powerpc !powerpcspe !ppc64],
libreoffice-report-builder-bin [!armel !hppa !kfreebsd-amd64 !kfreebsd-i386],
ttf-dejavu, ttf-sil-gentium-basic, libreoffice-filter-mobiledev,
${lucene-depends}, ${java-common-depends}, ${misc:Depends}
+Depends: libreoffice-core (= ${binary:Version}), libreoffice-writer,
libreoffice-calc, libreoffice-impress, libreoffice-draw, libreoffice-math,
libreoffice-base [!armel], libreoffice-report-builder-bin [!armel !hppa
!kfreebsd-amd64 !kfreebsd-i386], ttf-dejavu, ttf-sil-gentium-basic,
libreoffice-filter-mobiledev, ${lucene-depends}, ${java-common-depends},
${misc:Depends}
Recommends: ttf-liberation | ttf-mscorefonts-installer, libpaper-utils
Suggests: hunspell-dictionary, myspell-dictionary,
libreoffice-help-${help-l10n-virtual-version},
libreoffice-l10n-${help-l10n-virtual-version}, unixodbc, cups-bsd, libsane,
hyphen-hyphenation-patterns, mythes-thesaurus, libxrender1, libgl1,
libreoffice-gnome | libreoffice-kde, iceweasel | firefox | icedove |
thunderbird | iceape-browser | mozilla-browser, ${java-runtime-depends},
openclipart-libreoffice, pstoedit, imagemagick |
graphicsmagick-imagemagick-compat, ${gstreamer-plugins-suggests},
${libldap-suggests}, ${ooo-binfilter-dep}, ${ooo-officebean-dep}
Description: office productivity suite
@@ -142,7 +142,7 @@ Description: office productivity suite -- arch-independent
Java support files
Package: libreoffice-writer
Architecture: alpha amd64 armel armhf hppa i386 ia64 mips mipsel powerpc
powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386
-Depends: libreoffice-core (= ${binary:Version}), libreoffice-base-core (=
${binary:Version}) [!armel !powerpc !powerpcspe !ppc64], ${shlibs:Depends},
${misc:Depends}
+Depends: libreoffice-core (= ${binary:Version}), libreoffice-base-core (=
${binary:Version}) [!armel], ${shlibs:Depends}, ${misc:Depends}
Recommends: ${ooo-binfilter-dep}, ${java-runtime-depends},
${java-common-depends}, libreoffice-emailmerge, libreoffice-math
Replaces: libreoffice-core (<< 1:3.3.2-5)
Suggests: libreoffice-gcj, libreoffice-base
@@ -154,7 +154,7 @@ Description: office productivity suite -- word processor
Package: libreoffice-calc
Architecture: alpha amd64 armel armhf hppa i386 ia64 mips mipsel powerpc
powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386
-Depends: libreoffice-core (= ${binary:Version}), libreoffice-base-core (=
${binary:Version}) [!armel !powerpc !powerpcspe !ppc64], ${shlibs:Depends},
${lpsolve-dep}, ${misc:Depends}
+Depends: libreoffice-core (= ${binary:Version}), libreoffice-base-core (=
${binary:Version}) [!armel], ${shlibs:Depends}, ${lpsolve-dep}, ${misc:Depends}
Description: office productivity suite -- spreadsheet
LibreOffice is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
@@ -189,7 +189,7 @@ Description: office productivity suite -- equation editor
This package contains the equation editor component for LibreOffice.
Package: libreoffice-base-core
-Architecture: alpha amd64 armhf hppa i386 ia64 mips mipsel s390 s390x sparc
kfreebsd-amd64 kfreebsd-i386
+Architecture: alpha amd64 armhf hppa i386 ia64 mips mipsel powerpc powerpcspe
ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386
Depends: libreoffice-core (= ${binary:Version}), ${shlibs:Depends},
${misc:Depends}
Suggests: libreoffice-base
Description: office productivity suite -- shared library
@@ -203,7 +203,7 @@ Description: office productivity suite -- shared library
install libreoffice-base.
Package: libreoffice-base
-Architecture: alpha amd64 armhf hppa i386 ia64 mips mipsel s390 s390x sparc
kfreebsd-amd64 kfreebsd-i386
+Architecture: alpha amd64 armhf hppa i386 ia64 mips mipsel powerpc powerpcspe
ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386
Section: database
Depends: libreoffice-core (= ${binary:Version}), libreoffice-base-core (=
${binary:Version}), ${shlibs:Depends}, ${java-runtime-depends},
${java:Depends}, ${java-common-depends}, ${misc:Depends}
Suggests: unixodbc, libmyodbc | odbc-postgresql | libsqliteodbc | tdsodbc |
mdbtools, libmysql-java | libpg-java | libjtds-java, libreoffice-gcj,
libreoffice-report-builder
@@ -790,7 +790,7 @@ Description: office productivity suite -- KDE integration
Package: libreoffice-sdbc-postgresql
Section: misc
-Architecture: alpha amd64 armhf hppa i386 ia64 mips mipsel s390 s390x sparc
kfreebsd-amd64 kfreebsd-i386
+Architecture: alpha amd64 armhf hppa i386 ia64 mips mipsel powerpc powerpcspe
ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386
Depends: ${shlibs:Depends}, libreoffice-core (>= 1:3.4.4~), ${misc:Depends}
Conflicts: ure (<< 1.5.1+OOo3.1.1-15)
Suggests: postgresql (>= 8.4)
@@ -804,7 +804,7 @@ Homepage: http://wiki.documentfoundation.org/PostgreSQL-SDBC
Package: libreoffice-mysql-connector
Section: misc
-Architecture: alpha amd64 armhf hppa i386 ia64 mips mipsel s390 s390x sparc
kfreebsd-amd64 kfreebsd-i386
+Architecture: alpha amd64 armhf hppa i386 ia64 mips mipsel powerpc powerpcspe
ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386
Depends: ${shlibs:Depends}, libreoffice-core, ${misc:Depends}
Suggests: mysql-server (>= 5.1)
Conflicts: ure (<< 1.5.1+OOo3.1.1-15)
@@ -817,7 +817,7 @@ Description: MySQL Connector extension for LibreOffice
LibreOffice without any wrapper layer such as ODBC or JDBC.
Package: libreoffice-evolution
-Architecture: alpha amd64 armhf hppa i386 ia64 mips mipsel s390 s390x sparc
kfreebsd-amd64 kfreebsd-i386
+Architecture: alpha amd64 armhf hppa i386 ia64 mips mipsel powerpc powerpcspe
ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386
Section: gnome
Depends: libreoffice-core (= ${binary:Version}), libreoffice-common (>=
1:3.4.0~), libreoffice-base, ${shlibs:Depends}, ${libebook-dep}, ${misc:Depends}
Recommends: evolution
diff --git a/rules b/rules
index 0cf2ac5..ac268f7 100755
--- a/rules
+++ b/rules
@@ -353,7 +353,7 @@ $(eval $(call gen_no_archs,OOO_OPENJDK_ARCHS))
OOO_ARCH_DEP_EXTENSIONS_ARCHS := $(OOO_ARCHS)
-OOO_BASE_ARCHS := $(filter-out armel powerpc powerpcspe
ppc64,$(OOO_JAVA_ARCHS))
+OOO_BASE_ARCHS := $(filter-out armel,$(OOO_JAVA_ARCHS))
$(eval $(call gen_no_archs,OOO_BASE_ARCHS))
OOO_REPORTDESIGN_ARCHS := $(filter-out armel
$(OOO_GCJ_JDK_ARCHS),$(OOO_JAVA_ARCHS))
$(eval $(call gen_no_archs,OOO_REPORTDESIGN_ARCHS))
--
LibreOffice packaging repository
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
Archive: http://lists.debian.org/[email protected]
