[libreoffice] 04/06: re-enable checks
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 7d82ad956b9bd017526454291b2393ac4d7b2720
Author: Rene Engelhard <rene@debian.org>
Date: Tue Nov 17 19:46:11 2015 +0100
re-enable checks
---
changelog | 1 +
control | 10 ++++++++++
rules | 8 ++++----
3 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/changelog b/changelog
index 5f8307f..774d335 100644
--- a/changelog
+++ b/changelog
@@ -13,6 +13,7 @@ libreoffice (1:5.1.0~beta1~git20151114-1) UNRELEASED; urgency=medium
* debian/rules:
- fix up .desktop (closes: #804669), remove (D|d)ev and version from
Icon= and Exec=
+ - re-enable checks
-- Rene Engelhard <rene@debian.org> Mon, 19 Oct 2015 22:57:36 +0200
diff --git a/control b/control
index c23c107..a79cf50 100644
--- a/control
+++ b/control
@@ -22,16 +22,21 @@ Build-Depends: ant (>= 1.7.0) [!mips64],
fastjar,
firebird-dev (>= 2.5.2.26540.ds4-2) [!hppa !mips !mips64 !powerpc !powerpcspe !ppc64 !s390 !s390x !sparc],
flex (>= 2.3.35),
+ fontconfig,
+ fonts-crosextra-carlito,
+ fonts-liberation,
g++-5 [hppa ia64 s390 sparc],
g++-mingw-w64-i686 [i386 amd64],
gcc-5 [hppa ia64 s390 sparc],
gcj-jdk [hppa ia64 s390 sparc],
gcj-native-helper [hppa ia64 s390 sparc],
+ gdb,
gettext,
gobject-introspection (>= 1.32.0),
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,
@@ -4436,13 +4441,18 @@ 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,
gobject-introspection (>= 1.32.0),
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 837bc30..0cb35a1 100755
--- a/rules
+++ b/rules
@@ -286,13 +286,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=n
- RUN_PYTESTS=n
+ RUN_MAKE_CHECK=y
+ RUN_PYTESTS=y
ifeq "$(DEB_HOST_ARCH)" "i386"
- ENABLE_JUNIT4=n
+ ENABLE_JUNIT4=y
endif
ifeq "$(DEB_HOST_ARCH)" "amd64"
- ENABLE_JUNIT4=n
+ ENABLE_JUNIT4=y
endif
endif
else
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: