diff -Nru libreoffice-3.4.4/debian/changelog libreoffice-3.4.4/debian/changelog --- libreoffice-3.4.4/debian/changelog 2011-11-11 16:10:36.000000000 +0000 +++ libreoffice-3.4.4/debian/changelog 2011-12-06 16:10:13.000000000 +0000 @@ -1,3 +1,9 @@ +libreoffice (1:3.4.4-0ubuntu2) oneiric; urgency=low + + * Build for armhf. + + -- Matthias Klose Tue, 06 Dec 2011 17:09:39 +0100 + libreoffice (1:3.4.4-0ubuntu1) oneiric-proposed; urgency=low [ Bjoern Michaelsen ] diff -Nru libreoffice-3.4.4/debian/control libreoffice-3.4.4/debian/control --- libreoffice-3.4.4/debian/control 2011-11-11 16:10:46.000000000 +0000 +++ libreoffice-3.4.4/debian/control 2011-12-06 16:14:10.000000000 +0000 @@ -4,7 +4,7 @@ Maintainer: Ubuntu Core Developers XSBC-Original-Maintainer: Debian LibreOffice Maintainers Uploaders: Rene Engelhard -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, dpkg-dev (>= 1.15.1), libgl1-mesa-dev [!armel !mips !mipsel], libglu1-mesa-dev [!armel !mips !mipsel], libpoppler-dev (>= 0.8.0), 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), default-jdk, 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), libcommons-codec-java, libcommons-httpclient-java, libcommons-lang-java, libcommons-logging-java, libservlet2.5-java, libservlet2.5-java, javahelper (>= 0.37~), xulrunner-dev | firefox-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], libpq-dev, libxrandr-dev, 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: 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, dpkg-dev (>= 1.15.1), libgl1-mesa-dev [!armel !armhf !mips !mipsel], libglu1-mesa-dev [!armel !armhf !mips !mipsel], libpoppler-dev (>= 0.8.0), 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), default-jdk, 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), libcommons-codec-java, libcommons-httpclient-java, libcommons-lang-java, libcommons-logging-java,,, javahelper (>= 0.37~), xulrunner-dev | firefox-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, libxrandr-dev, 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 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 @@ Package: libreoffice 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-writer, libreoffice-calc, libreoffice-impress, libreoffice-draw, libreoffice-math, libreoffice-base [!armel], libreoffice-report-builder-bin [!armel], 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], 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}, menu, 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 @@ -143,7 +143,7 @@ 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], ${shlibs:Depends}, ${misc:Depends} +Depends: libreoffice-core (= ${binary:Version}), libreoffice-base-core (= ${binary:Version}) [!armel !armhf], ${shlibs:Depends}, ${misc:Depends} Recommends: libreoffice-emailmerge, libreoffice-math Replaces: libreoffice-core (<< 1:3.3.2-5) Suggests: libreoffice-gcj, ${java-runtime-depends}, ${java-common-depends}, ${ooo-binfilter-dep}, libreoffice-base @@ -155,7 +155,7 @@ 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], ${shlibs:Depends}, ${lpsolve-dep}, ${misc:Depends} +Depends: libreoffice-core (= ${binary:Version}), libreoffice-base-core (= ${binary:Version}) [!armel !armhf], ${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. @@ -190,7 +190,7 @@ This package contains the equation editor component for LibreOffice. Package: libreoffice-base-core -Architecture: alpha amd64 armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386 +Architecture: alpha amd64 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 @@ -204,7 +204,7 @@ install libreoffice-base. Package: libreoffice-base -Architecture: alpha amd64 armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386 +Architecture: alpha amd64 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 @@ -575,7 +575,7 @@ Package: libreoffice-ogltrans Section: graphics Priority: extra -Architecture: alpha amd64 armhf hppa i386 ia64 powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386 +Architecture: alpha amd64 hppa i386 ia64 powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386 Depends: ${shlibs:Depends}, libreoffice-core, libreoffice-impress, libreoffice-common, ${misc:Depends} Enhances: libreoffice-impress Conflicts: ure (<< 1.5.1+OOo3.1.1-15) @@ -624,7 +624,7 @@ Package: libreoffice-report-builder-bin Section: misc -Architecture: alpha amd64 armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386 +Architecture: alpha amd64 hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386 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 @@ -769,7 +769,7 @@ Package: libreoffice-sdbc-postgresql Section: misc -Architecture: alpha amd64 armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386 +Architecture: alpha amd64 hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386 Depends: ${shlibs:Depends}, libreoffice-core, ${misc:Depends} Conflicts: ure (<< 1.5.1+OOo3.1.1-15) Suggests: postgresql (>= 8.4) @@ -783,7 +783,7 @@ Package: libreoffice-mysql-connector Section: misc -Architecture: alpha amd64 armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386 +Architecture: alpha amd64 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) @@ -796,7 +796,7 @@ LibreOffice without any wrapper layer such as ODBC or JDBC. Package: libreoffice-evolution -Architecture: alpha amd64 armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386 +Architecture: alpha amd64 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 -Nru libreoffice-3.4.4/debian/patches/arm-hard-float.diff libreoffice-3.4.4/debian/patches/arm-hard-float.diff --- libreoffice-3.4.4/debian/patches/arm-hard-float.diff 1970-01-01 00:00:00.000000000 +0000 +++ libreoffice-3.4.4/debian/patches/arm-hard-float.diff 2011-12-06 16:17:57.000000000 +0000 @@ -0,0 +1,47 @@ +Index: libreoffice-3.4.4/libreoffice-build/patches/dev300/apply +=================================================================== +--- libreoffice-3.4.4.orig/libreoffice-build/patches/dev300/apply 2011-12-06 16:16:12.554852914 +0000 ++++ libreoffice-3.4.4/libreoffice-build/patches/dev300/apply 2011-12-06 16:17:53.144869558 +0000 +@@ -1415,3 +1415,6 @@ + [TemporaryHacks] + disable-rhino.diff + bsh-hardcode-path.diff ++ ++[Fixes] ++arm-hard-float.diff +Index: libreoffice-3.4.4/libreoffice-build/patches/dev300/arm-hard-float.diff +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ libreoffice-3.4.4/libreoffice-build/patches/dev300/arm-hard-float.diff 2011-12-06 16:07:04.004636246 +0000 +@@ -0,0 +1,31 @@ ++--- /home/doko/lo/libreoffice-3.4.4/libreoffice-build/build/libreoffice-3.4.3.2/bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx.old 2011-05-19 11:22:55.000000000 +0000 +++++ /home/doko/lo/libreoffice-3.4.4/libreoffice-build/build/libreoffice-3.4.3.2/bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx 2011-12-06 16:03:55.000000000 +0000 ++@@ -152,7 +152,10 @@ ++ ++ void MapReturn(sal_uInt32 r0, sal_uInt32 r1, typelib_TypeDescriptionReference * pReturnType, sal_uInt32* pRegisterReturn) ++ { ++-#if !defined(__ARM_EABI__) && !defined(__SOFTFP__) +++#if defined(__ARM_PCS_VFP) +++ register float fret asm("d0"); +++ register double dret asm("d0"); +++#elif !defined(__ARM_EABI__) && !defined(__SOFTFP__) ++ register float fret asm("f0"); ++ register double dret asm("f0"); ++ #endif ++@@ -173,14 +176,14 @@ ++ pRegisterReturn[0] = r0; ++ break; ++ case typelib_TypeClass_FLOAT: ++-#if defined(__ARM_EABI__) || defined(__SOFTFP__) +++#if (!defined(__ARM_PCS_VFP) && defined(__ARM_EABI__)) || defined(__SOFTFP__) ++ pRegisterReturn[0] = r0; ++ #else ++ *(float*)pRegisterReturn = fret; ++ #endif ++ break; ++ case typelib_TypeClass_DOUBLE: ++-#if defined(__ARM_EABI__) || defined(__SOFTFP__) +++#if (!defined(__ARM_PCS_VFP) && defined(__ARM_EABI__)) || defined(__SOFTFP__) ++ pRegisterReturn[1] = r1; ++ pRegisterReturn[0] = r0; ++ #else diff -Nru libreoffice-3.4.4/debian/patches/series libreoffice-3.4.4/debian/patches/series --- libreoffice-3.4.4/debian/patches/series 2011-11-11 16:10:36.000000000 +0000 +++ libreoffice-3.4.4/debian/patches/series 2011-12-06 16:15:12.000000000 +0000 @@ -32,3 +32,4 @@ disable-test-apply.diff update-from-libreoffice-3.4.3.2-to-libreoffice-3.4.4.2.diff fdo42749.diff +arm-hard-float.diff diff -Nru libreoffice-3.4.4/debian/rules libreoffice-3.4.4/debian/rules --- libreoffice-3.4.4/debian/rules 2011-11-11 16:10:36.000000000 +0000 +++ libreoffice-3.4.4/debian/rules 2011-12-06 16:13:21.000000000 +0000 @@ -344,8 +344,8 @@ endif ifeq "$(ENABLE_OPENGL)" "y" - # doesn't make that much sense on armel and mips(el), does it? :) - OOO_OGLTRANS_ARCHS = $(filter-out armel mips%, $(OOO_ARCHS)) + # doesn't make that much sense on armel, armhf and mips(el), does it? :) + OOO_OGLTRANS_ARCHS = $(filter-out armel armhf mips%, $(OOO_ARCHS)) ifeq (,$(filter $(ARCH),$(OOO_OGLTRANS_ARCHS))) ENABLE_OPENGL=n endif @@ -367,9 +367,9 @@ OOO_ARCH_DEP_EXTENSIONS_ARCHS := $(OOO_ARCHS) -OOO_BASE_ARCHS := $(filter-out armel,$(OOO_JAVA_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_JAVA_ARCHS)) +OOO_REPORTDESIGN_ARCHS := $(filter-out armel armhf,$(OOO_JAVA_ARCHS)) $(eval $(call gen_no_archs,OOO_REPORTDESIGN_ARCHS)) ifneq (,$(findstring $(ARCH),$(OOO_NO_BASE_ARCHS))) @@ -462,7 +462,7 @@ PATCHSET=Ubuntu ENABLE_LOMENUBAR:=n # lp#725250 MIR lo-menubar - USE_LZMA_COMPRESS=$(if $(filter-out armel,$(ARCH)),y,n) + USE_LZMA_COMPRESS=$(if $(filter-out armel armhf,$(ARCH)),y,n) # migrated flags from the old libreoffice-build/distro-config dir CONFIGURE_FLAGS += \ @@ -577,7 +577,7 @@ endif # fails their tests -ifeq "$(ARCH)" "armel" +ifneq (,$(filter $(ARCH), armel armhf)) ENABLE_GRAPHITE=n SYSTEM_STUFF := $(filter-out graphite, $(SYSTEM_STUFF)) endif @@ -588,7 +588,7 @@ ifeq "$(ENABLE_GRAPHITE)" "y" ifneq (,$(filter graphite, $(SYSTEM_STUFF))) - BUILD_DEPS += , libgraphite2-dev (>= 0.9.3) [!armel !sparc] + BUILD_DEPS += , libgraphite2-dev (>= 0.9.3) [!armel !armhf !sparc] endif else CONFIGURE_FLAGS += --disable-graphite @@ -781,7 +781,7 @@ endif ifeq "$(JDK)" "java-gcj-compat" JAVA_HOME=/usr/lib/jvm/java-gcj - ifneq (,$(findstring armel,$(OOO_JAVA_ARCHS))) + ifneq (,$(findstring armel ,$(OOO_JAVA_ARCHS))) BUILD_DEPS += , gcj-4.3 (>= 4.3.1-2) [armel] endif endif @@ -1918,7 +1918,7 @@ EPM=yes PKGFORMAT=archive WITH_LANG="en-US" dmake openoffice; \ fi # smoketest -ifeq "$(ARCH)" "armel" +ifneq (,$(filter $(ARCH), armel armhf)) cd $(SOURCE_TREE)/smoketestoo_native && \ patch -p1 < $(CURDIR)/debian/smoketest/patches/smoketest-disable-db-insert-delete-seek-tests.diff endif @@ -1933,7 +1933,7 @@ # doesn't get cleaned up.. (at least the dirs, the contents are gone) cd $(CURDIR)/debian/smoketest && \ find . -noleaf -maxdepth 1 ! -name "patches" ! -name "." -exec rm -rf {} \; -ifeq "$(ARCH)" "armel" +ifneq (,$(filter $(ARCH), armel armhf)) cd $(SOURCE_TREE)/smoketestoo_native && \ patch -p1 -R < $(CURDIR)/debian/smoketest/patches/smoketest-disable-db-insert-delete-seek-tests.diff endif diff -Nru libreoffice-3.4.4/debian/scripts/vars.armhf libreoffice-3.4.4/debian/scripts/vars.armhf --- libreoffice-3.4.4/debian/scripts/vars.armhf 1970-01-01 00:00:00.000000000 +0000 +++ libreoffice-3.4.4/debian/scripts/vars.armhf 2011-12-06 16:10:36.000000000 +0000 @@ -0,0 +1,2 @@ +LIBSUFFIX=lr +PLATFORMID=linux_arm_eabihf