The following commit has been merged in the debian-experimental-3.5 branch:
commit bc142c4a5137f61bdac7c1c74472dd884a441590
Author: Rene Engelhard <[email protected]>
Date: Tue Apr 24 22:23:33 2012 +0200
also use gcc 4.4 on mips
diff --git a/changelog b/changelog
index 54b6a13..7774899 100644
--- a/changelog
+++ b/changelog
@@ -7,8 +7,10 @@ libreoffice (1:3.5.3~rc2-1) UNRELEASED; urgency=low
* debian/rules:
- only ship (and build) unowinreg.dll for i386/amd64. Probably not used
on other archs and it saves us the g++-mingw-w64-i686 build-dep there
+ - use gcc 4.4 on mips a) for consistency b) as 3.5.3~rc1-1 bus errord on
+ ball, too
- -- Rene Engelhard <[email protected]> Tue, 24 Apr 2012 19:14:53 +0200
+ -- Rene Engelhard <[email protected]> Tue, 24 Apr 2012 22:21:54 +0200
libreoffice (1:3.5.3~rc1-1) experimental; urgency=low
diff --git a/control b/control
index 30f8532..46d71f7 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, gcc-4.4 [mipsel], g++-4.4 [mipsel],
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],
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, debhe
lper (>= 7.2.3~), libcppunit-dev (>= 1.12), gdb, junit4 (>= 4.8.2-2),
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), g++-mingw-w64-i686 [i386 amd64],
libcommons-codec-java, libcommons-httpclient-java, libcommons-lang-java,
libcommons-logging-java (>= 1.1.1-9), libservlet2.5-java, libbase-java [!armel
!armhf !hppa !powerpc !powerpcspe !ppc64 !kfreebsd-amd64 !kfreebsd-i386],
libsac-java [!armel !armhf !hppa !powerpc !powerpcspe !ppc64 !kfreebsd-amd64
!kfreebsd-i386], libxml-java (>= 1.1.6) [!armel !armhf !hppa !powerpc
!powerpcspe !ppc64 !kfreebsd-amd64 !kfreebsd-i386], libflute-java (>= 1.1.6)
[!armel !armhf !hppa !powerpc !powerpcspe !ppc64 !kfreebsd-amd64
!kfreebsd-i386], libpentaho
-reporting-flow-engine-java (>= 0.9.4) [!armel !armhf !hppa !powerpc
!powerpcspe !ppc64 !kfreebsd-amd64 !kfreebsd-i386], liblayout-java (>= 0.2.10)
[!armel !armhf !hppa !powerpc !powerpcspe !ppc64 !kfreebsd-amd64
!kfreebsd-i386], libloader-java (>= 1.1.6) [!armel !armhf !hppa !powerpc
!powerpcspe !ppc64 !kfreebsd-amd64 !kfreebsd-i386], libformula-java (>= 1.1.7)
[!armel !armhf !hppa !powerpc !powerpcspe !ppc64 !kfreebsd-amd64
!kfreebsd-i386], librepository-java (>= 1.1.6) [!armel !armhf !hppa !powerpc
!powerpcspe !ppc64 !kfreebsd-amd64 !kfreebsd-i386], libfonts-java (>= 1.1.6)
[!armel !armhf !hppa !powerpc !powerpcspe !ppc64 !kfreebsd-amd64
!kfreebsd-i386], libserializer-java (>= 1.1.6) [!armel !armhf !hppa !powerpc
!powerpcspe !ppc64 !kfreebsd-amd64 !kfreebsd-i386], libcommons-logging-java (>=
1.1.1-9), libservlet2.5-java, javahelper (>= 0.37~), libnss3-dev (>= 3.12.3),
xulrunner-dev [!s390x], dmake (>= 1:4.11), libhunspell-dev (>= 1.1.5-2),
libhyphen-dev (>= 2.4), libstlpo
rt4.6-dev (>= 4.6.2-3) [i386], libboost-dev (>= 1.38), 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:4.5), libmysqlclient-dev, libmysqlcppconn-dev (>=
1.1.0~r791), libgtk2.0-dev (>= 2.10), libgtk-3-dev (>= 3.2~), libebook1.2-dev
[!armel !armhf !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), libglib2.0-dev (>= 2.15.0), libgconf2-dev, liborbit2-dev, gettext, make
(>= 3.81-8.2), 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, gcc-4.4 [mips mipsel], g++-4.4 [mips
mipsel], 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],
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), gdb, junit4 (>=
4.8.2-2), 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), g++-mingw-w64-i686
[i386 amd64], libcommons-codec-java, libcommons-httpclient-java,
libcommons-lang-java, libcommons-logging-java (>= 1.1.1-9), libservlet2.5-java,
libbase-java [!armel !armhf !hppa !powerpc !powerpcspe !ppc64 !kfreebsd-amd64
!kfreebsd-i386], libsac-java [!armel !armhf !hppa !powerpc !powerpcspe !ppc64
!kfreebsd-amd64 !kfreebsd-i386], libxml-java (>= 1.1.6) [!armel !armhf !hppa
!powerpc !powerpcspe !ppc64 !kfreebsd-amd64 !kfreebsd-i386], libflute-java (>=
1.1.6) [!armel !armhf !hppa !powerpc !powerpcspe !ppc64 !kfreebsd-amd64
!kfreebsd-i386],
libpentaho-reporting-flow-engine-java (>= 0.9.4) [!armel !armhf !hppa !powerpc
!powerpcspe !ppc64 !kfreebsd-amd64 !kfreebsd-i386], liblayout-java (>= 0.2.10)
[!armel !armhf !hppa !powerpc !powerpcspe !ppc64 !kfreebsd-amd64
!kfreebsd-i386], libloader-java (>= 1.1.6) [!armel !armhf !hppa !powerpc
!powerpcspe !ppc64 !kfreebsd-amd64 !kfreebsd-i386], libformula-java (>= 1.1.7)
[!armel !armhf !hppa !powerpc !powerpcspe !ppc64 !kfreebsd-amd64
!kfreebsd-i386], librepository-java (>= 1.1.6) [!armel !armhf !hppa !powerpc
!powerpcspe !ppc64 !kfreebsd-amd64 !kfreebsd-i386], libfonts-java (>= 1.1.6)
[!armel !armhf !hppa !powerpc !powerpcspe !ppc64 !kfreebsd-amd64
!kfreebsd-i386], libserializer-java (>= 1.1.6) [!armel !armhf !hppa !powerpc
!powerpcspe !ppc64 !kfreebsd-amd64 !kfreebsd-i386], libcommons-logging-java (>=
1.1.1-9), libservlet2.5-java, javahelper (>= 0.37~), libnss3-dev (>= 3.12.3),
xulrunner-dev [!s390x], 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, 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:4.5), libmysqlclient-dev,
libmysqlcppconn-dev (>= 1.1.0~r791), libgtk2.0-dev (>= 2.10), libgtk-3-dev (>=
3.2~), libebook1.2-dev [!armel !armhf !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), libglib2.0-dev (>= 2.15.0), libgconf2-dev, liborbit2-dev, gettext, make
(>= 3.81-8.2), 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], libc0.1-dev (= 2.13-26)
[kfreebsd-i386 kfreebsd-amd64], nvidia-glx-dev, nvidia-glx-legacy-dev, 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), gcc (>= 4:4.7~) [!i386 !amd64
!kfreebsd-i386 !kfreebsd-amd64], g++ (>= 4:4.7~) [!i386 !amd64 !kfreebsd-i386
!kfreebsd-amd64], base-files (= 6.0), base-files (= 6.0squeeze1),
libhsqldb-java (>= 1.8.1~)
Standards-Version: 3.9.1
diff --git a/rules b/rules
index fa72bda..18a736c 100755
--- a/rules
+++ b/rules
@@ -344,9 +344,9 @@ ifeq "$(DEB_HOST_ARCH)" "i386"
LINK_TO_STLPORT=y
endif
-ifeq (mipsel,$(findstring mipsel,$(OOO_ARCHS)))
- BUILD_DEPS += , gcc-4.4 [mipsel], g++-4.4 [mipsel]
- ifeq "$(DEB_HOST_ARCH)" "mipsel"
+ifneq (,$(findstring mips,$(OOO_ARCHS)))
+ BUILD_DEPS += , gcc-4.4 [mips mipsel], g++-4.4 [mips mipsel]
+ ifneq (,$(findstring mips,$(DEB_HOST_ARCH)))
GCC_VERSION := 4.4
endif
endif
--
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]
