The following commit has been merged in the master branch:
commit 47e0389b62d5ceef2607872a2db8fe83f5c8bf28
Author: Rene Engelhard <r...@debian.org>
Date: Sun Feb 26 20:39:32 2012 +0000
actually filter-out also armhf for OOO_REPORTDESIGN_ARCHS
diff --git a/changelog b/changelog
index da1526f..b6b3a82 100644
--- a/changelog
+++ b/changelog
@@ -8,8 +8,9 @@ libreoffice (1:3.4.5-4) UNRELEASED; urgency=low
Rico Tzschichholz
- chmod 755 setsdkenv_unix
- also disable graphite on alpha (closes: #661294)
+ - actually filter-out also armhf for OOO_REPORTDESIGN_ARCHS
- -- Rene Engelhard <r...@debian.org> Sun, 26 Feb 2012 21:34:47 +0100
+ -- Rene Engelhard <r...@debian.org> Sun, 26 Feb 2012 20:39:05 +0000
libreoffice (1:3.4.5-3) unstable; urgency=low
diff --git a/control b/control
index fd1017f..e8574f8 100644
--- a/control
+++ b/control
@@ -3,7 +3,7 @@ Section: editors
Priority: optional
Maintainer: Debian LibreOffice Maintainers <debian-openoffice@lists.debian.org>
Uploaders: Rene Engelhard <r...@debian.org>
-Build-Depends: 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,
libsane-dev, libxrender-dev, libcups2-dev, libarchive-zip-perl, libpng12-dev,
libjpeg-dev, libxml2-dev, libexpat1-dev, fastjar, xsltproc, libxkbfile-dev,
libxinerama-dev, x11proto-render-dev, unixodbc-dev (>= 2.2.11),
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-private-dev, libpoppler-cpp-dev, libgraphite2-dev (>= 0.9.3)
[!alpha !armel !sparc], libtextcat-dev (>= 2.2-8), libcurl4-gnutls-dev,
libssl-dev, libdb-dev, dpkg-dev (>= 1.15.6), python (>= 2.6.6-3+squeeze4),
python-dev, debhelper (>= 7.2.3~), libcppunit-dev (>= 1.12), openjdk-6-jdk (>=
6b23~p
re8-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 (>=
1.1.1-9), libservlet2.5-java, 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-jav
a (>= 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
(>= 1.1.1-9), libservlet2.5-java, javahelper (>= 0.37~), xulrunner-dev,
libnss3-dev (>= 3.12.3), dmake (>= 1:4.11), libhunspell-dev (>= 1.1.5-2),
libhyphen-dev (>= 2.4), libstlport4.6-dev (>= 4.6.2-3) [i386], libboost-dev (>=
1.38), libmdds-dev (>= 0.5.0), libvigraimpex-dev, libwpd-dev (>= 0.9.0),
libmythes-dev (>= 2:1.2), libwps-dev (>= 0.2.0), libwpg-dev (>= 0.2.0),
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),
libebook1.2-dev [!armel !armhf], libpq-dev (>= 9.0~), libxrandr-dev,
liblucene2-java (>= 2.3.2), libhsqldb-java (>> 1.8.0.10), bsh (>= 2.0b4),
liblpsolve
55-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 (>= 1.0.8), libgtk2.0-dev (>= 2.10),
libgnomevfs2-dev, libgconf2-dev, liborbit2-dev, libldap2-dev
+Build-Depends: 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,
libsane-dev, libxrender-dev, libcups2-dev, libarchive-zip-perl, libpng12-dev,
libjpeg-dev, libxml2-dev, libexpat1-dev, fastjar, xsltproc, libxkbfile-dev,
libxinerama-dev, x11proto-render-dev, unixodbc-dev (>= 2.2.11),
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-private-dev, libpoppler-cpp-dev, libgraphite2-dev (>= 0.9.3)
[!alpha !armel !sparc], libtextcat-dev (>= 2.2-8), libcurl4-gnutls-dev,
libssl-dev, libdb-dev, dpkg-dev (>= 1.15.6), python (>= 2.6.6-3+squeeze4),
python-dev, debhelper (>= 7.2.3~), libcppunit-dev (>= 1.12), openjdk-6-jdk (>=
6b23~p
re8-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 (>=
1.1.1-9), libservlet2.5-java, libbase-java [!armel !armhf !hppa !kfreebsd-amd64
!kfreebsd-i386], libsac-java [!armel !armhf !hppa !kfreebsd-amd64
!kfreebsd-i386], libxml-java (>= 1.1.6) [!armel !armhf !hppa !kfreebsd-amd64
!kfreebsd-i386], libflute-java (>= 1.1.6) [!armel !armhf !hppa !kfreebsd-amd64
!kfreebsd-i386], libpentaho-reporting-flow-engine-java (>= 0.9.4) [!armel
!armhf !hppa !kfreebsd-amd64 !kfreebsd-i386], liblayout-java (>= 0.2.10)
[!armel !armhf !hppa !kfreebsd-amd64 !kfreebsd-i386], libloader-java (>= 1.1.6)
[!armel !armhf !hpp
a !kfreebsd-amd64 !kfreebsd-i386], libformula-java (>= 1.1.7) [!armel !armhf
!hppa !kfreebsd-amd64 !kfreebsd-i386], librepository-java (>= 1.1.6) [!armel
!armhf !hppa !kfreebsd-amd64 !kfreebsd-i386], libfonts-java (>= 1.1.6) [!armel
!armhf !hppa !kfreebsd-amd64 !kfreebsd-i386], libserializer-java (>= 1.1.6)
[!armel !armhf !hppa !kfreebsd-amd64 !kfreebsd-i386], libcommons-logging-java
(>= 1.1.1-9), libservlet2.5-java, javahelper (>= 0.37~), xulrunner-dev,
libnss3-dev (>= 3.12.3), dmake (>= 1:4.11), libhunspell-dev (>= 1.1.5-2),
libhyphen-dev (>= 2.4), libstlport4.6-dev (>= 4.6.2-3) [i386], libboost-dev (>=
1.38), libmdds-dev (>= 0.5.0), libvigraimpex-dev, libwpd-dev (>= 0.9.0),
libmythes-dev (>= 2:1.2), libwps-dev (>= 0.2.0), libwpg-dev (>= 0.2.0),
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),
libebook1.2-dev [!armel !armhf], libpq-dev (>= 9.0~), libxrandr-dev, libluce
ne2-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.60),
libgstreamer-plugins-base0.10-dev, libneon27-gnutls-dev, librdf0-dev (>=
1.0.8), libgtk2.0-dev (>= 2.10), libgnomevfs2-dev, libgconf2-dev,
liborbit2-dev, libldap2-dev
Build-Depends-Indep: fdupes, xml-core, imagemagick, fontforge,
translate-toolkit (>= 1.9)
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 !armhf], 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 !armhf], libreoffice-report-builder-bin [!armel !armhf
!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
@@ -3152,7 +3152,7 @@ Homepage:
http://extensions.services.openoffice.org/project/reportdesign
Package: libreoffice-report-builder-bin
Section: misc
-Architecture: alpha amd64 armhf i386 ia64 mips mipsel powerpc powerpcspe ppc64
s390 s390x sparc
+Architecture: alpha amd64 i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390
s390x sparc
Depends: ${shlibs:Depends}, libreoffice-core, libreoffice-base, ${misc:Depends}
Description: LibreOffice extension for building database reports -- libraries
LibreOffice is a full-featured office productivity suite that provides
diff --git a/rules b/rules
index 89222b1..add2ca9 100755
--- a/rules
+++ b/rules
@@ -366,7 +366,7 @@ OOO_ARCH_DEP_EXTENSIONS_ARCHS := $(OOO_ARCHS)
OOO_BASE_ARCHS := $(filter-out armel armhf,$(OOO_JAVA_ARCHS))
$(eval $(call gen_no_archs,OOO_BASE_ARCHS))
-OOO_REPORTDESIGN_ARCHS := $(filter-out armel
$(OOO_GCJ_JDK_ARCHS),$(OOO_JAVA_ARCHS))
+OOO_REPORTDESIGN_ARCHS := $(filter-out armel armhf
$(OOO_GCJ_JDK_ARCHS),$(OOO_JAVA_ARCHS))
$(eval $(call gen_no_archs,OOO_REPORTDESIGN_ARCHS))
ifneq (,$(findstring $(ARCH),$(OOO_NO_BASE_ARCHS)))
--
LibreOffice packaging repository
--
To UNSUBSCRIBE, email to debian-openoffice-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1s1ksq-0004qg...@vasks.debian.org
