[SCM] LibreOffice packaging repository branch, master, updated. libreoffice_3.5.2-3-13-g8e73211

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

The following commit has been merged in the master branch:
commit 11a41fc7b82b954ed68cde8aef1ff5b9f616b5a9
Author: Rene Engelhard <rene@debian.org>
Date:   Thu Apr 12 19:01:52 2012 +0200

    Revert "disable junit tests on OpenJDK7-using archs, building fails"
    
    This reverts commit 64e5248c280b0bd7aa5c5a80b24cd9397f94ad12.

diff --git a/changelog b/changelog
index 296fbbd..3a5f35c 100644
--- a/changelog
+++ b/changelog
@@ -10,6 +10,7 @@ libreoffice (1:3.5.2-4) UNRELEASED; urgency=low
     - readd gcc-$(GCC_VERSION), g++-$(GCC_VERSION) build-deps if
       GCC_VERSION != ""....
     - actually add epoch to libqt4-dev builddeps...
+    - revert JDK7 test workaround from last upload again
   * debian/python{,3}-uno.preinst.in: only run extension stuff when upgrading
     from version where the extension was here ...
   * debian/libreoffice-script-provider-python.preinst.in: ... and copy
diff --git a/rules b/rules
index 246a569..4428d63 100755
--- a/rules
+++ b/rules
@@ -206,9 +206,6 @@ ifeq "$(ENABLE_JAVA)" "y"
     else
       ENABLE_JUNIT4=n
     endif
-    ifeq "$(JAVA_MAINVER)" "7"
-      ENABLE_JUNIT4=n
-    endif
   endif
 else
   RUN_MAKE_CHECK=n

-- 
LibreOffice packaging repository