[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[libreoffice] 03/04: disable tests for now



This is an automated email from the git hooks/post-receive script.

rene pushed a commit to branch debian-experimental-5.1
in repository libreoffice.

commit a80ad5bcf3e10ff47d81fe350dd048987accb9f8
Author: Rene Engelhard <rene@debian.org>
Date:   Sat Sep 19 15:23:24 2015 +0200

    disable tests for now
---
 changelog |  1 +
 control   | 10 ----------
 rules     |  8 ++++----
 3 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/changelog b/changelog
index 8c45f62..e756afe 100644
--- a/changelog
+++ b/changelog
@@ -20,6 +20,7 @@ libreoffice (1:5.1.0~alpha1~git20150914-1) UNRELEASED; urgency=medium
   * debian/rules:
      - gtk3 is on per default now (closes: #799399, #681180)
      - build only en-US for now
+     - disable the tests for now
 
  -- Rene Engelhard <rene@debian.org>  Fri, 04 Sep 2015 09:52:38 +0200
 
diff --git a/control b/control
index 5a0a34d..892700b 100644
--- a/control
+++ b/control
@@ -21,20 +21,15 @@ Build-Depends: ant (>= 1.7.0) [!mips64eb],
                fastjar,
                firebird-dev (>= 2.5.2.26540.ds4-2) [!hppa !mips !powerpc !powerpcspe !ppc64 !s390 !s390x !sparc],
                flex (>= 2.3.35),
-               fontconfig,
-               fonts-crosextra-carlito,
-               fonts-liberation,
                g++-5 [hppa ia64 s390 sparc kfreebsd-amd64 kfreebsd-i386],
                g++-mingw-w64-i686 [i386 amd64],
                gcc-5 [hppa ia64 s390 sparc kfreebsd-amd64 kfreebsd-i386],
                gcj-jdk [hppa ia64 s390 sparc kfreebsd-amd64 kfreebsd-i386],
                gcj-native-helper [hppa ia64 s390 sparc kfreebsd-amd64 kfreebsd-i386],
-               gdb,
                gettext,
                gperf,
                java-common (>= 0.49),
                javahelper (>= 0.37~),
-               junit4 (>= 4.8.2-2),
                kdelibs5-dev (>= 4:4.3.4),
                libabw-dev (>= 0.1),
                libarchive-zip-perl,
@@ -1312,17 +1307,12 @@ Depends: ant (>= 1.7.0),
          fastjar,
          firebird-dev (>= 2.5.2.26540.ds4-2),
          flex (>= 2.3.35),
-         fontconfig,
          fontforge,
-         fonts-crosextra-carlito,
-         fonts-liberation,
          g++-mingw-w64-i686,
-         gdb,
          gettext,
          gperf,
          java-common (>= 0.49),
          javahelper (>= 0.37~),
-         junit4 (>= 4.8.2-2),
          kdelibs5-dev (>= 4:4.3.4),
          libabw-dev (>= 0.1),
          libarchive-zip-perl,
diff --git a/rules b/rules
index 6285f86..99bb15e 100755
--- a/rules
+++ b/rules
@@ -270,13 +270,13 @@ PACKAGE_LOKIT=y
 ifeq "$(ENABLE_JAVA)" "y"
   ifeq "$(JDK)" "default"
     ifeq "$(shell LANG=C /usr/lib/jvm/default-java/bin/java -version 2>&1 | tail -n 1 | awk '{ print $$1 }')" "OpenJDK"
-      RUN_MAKE_CHECK=y
-      RUN_PYTESTS=y
+      RUN_MAKE_CHECK=n
+      RUN_PYTESTS=n
       ifeq "$(DEB_HOST_ARCH)" "i386"
-	ENABLE_JUNIT4=y
+	ENABLE_JUNIT4=n
       endif
       ifeq "$(DEB_HOST_ARCH)" "amd64"
-	ENABLE_JUNIT4=y
+	ENABLE_JUNIT4=n
       endif
     endif
   else

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git


Reply to: