[SCM] LibreOffice packaging repository branch, master, updated. libreoffice_3.5.4-3-6-g8bc00d9

["Rene Engelhard" <rene@debian.org>]

The following commit has been merged in the master branch:
commit 8dafdb1a4b149af18049cc414a74381d30755067
Author: Rene Engelhard <rene@debian.org>
Date:   Thu Jun 7 17:33:34 2012 +0200

    run junit tests on all archs

diff --git a/changelog b/changelog
index c756388..694b35a 100644
--- a/changelog
+++ b/changelog
@@ -8,6 +8,7 @@ libreoffice (1:3.5.4-4) UNRELEASED; urgency=low
   * debian/rules:
     - reenable Base on armel; apparently also fixed by
       yyinput-fix-for-unsigned-char.diff 
+    - remove i386/amd64 special-casing, run junit checks on all archs
 
  -- Rene Engelhard <rene@debian.org>  Thu, 07 Jun 2012 01:05:26 +0200
 
diff --git a/rules b/rules
index 5df535d..d9ed484 100755
--- a/rules
+++ b/rules
@@ -202,16 +202,7 @@ PACKAGE_SDK=y
 ifeq "$(ENABLE_JAVA)" "y"
   ifeq "$(JDK)" "openjdk"
     RUN_MAKE_CHECK=y
-    ifneq (,$(findstring i386,$(DEB_HOST_ARCH)))
-      ENABLE_JUNIT4=y
-    else
-      ENABLE_JUNIT4=n
-    endif
-    ifneq (,$(findstring amd64,$(DEB_HOST_ARCH)))
-      ENABLE_JUNIT4=y
-    else
-      ENABLE_JUNIT4=n
-    endif
+    ENABLE_JUNIT4=y
   endif
 else
   RUN_MAKE_CHECK=n

-- 
LibreOffice packaging repository