This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch master
in repository libreoffice.
commit f5385262d3a651ad4ed91b5007646e699eeb2364
Author: Rene Engelhard <r...@debian.org>
Date: Thu Aug 11 20:30:55 2016 +0200
clean up test disabling, disable on sparc64. Add missing <!nocheck> for
junit4
Conflicts:
changelog
---
changelog | 7 +++++--
control | 10 +++++-----
rules | 31 ++++++++++++++++++-------------
tests/control | 2 +-
4 files changed, 29 insertions(+), 21 deletions(-)
diff --git a/changelog b/changelog
index f1c9797..f93700a 100644
--- a/changelog
+++ b/changelog
@@ -1,4 +1,4 @@
-libreoffice (1:5.2.0-2) UNRELEASED; urgency=medium
+libreoffice (1:5.2.0-2) unstable; urgency=medium
* debian/patches/make-package-modules-not-suck.diff: move animcore into
DRAW (closes: #833181)
@@ -18,8 +18,11 @@ libreoffice (1:5.2.0-2) UNRELEASED; urgency=medium
new -systray package (if enabled)
* debian/control.lang.in: suggest libreoffice-hyphenation-fi at -l10n-fi
(provided by libreoffice-voikko)
+ * debian/rules:
+ - clean up test disabling, disable on sparc64. Add missing <!nocheck>
+ for junit4
- -- Rene Engelhard <r...@debian.org> Wed, 10 Aug 2016 10:02:27 +0200
+ -- Rene Engelhard <r...@debian.org> Sun, 14 Aug 2016 20:51:51 +0200
libreoffice (1:5.2.0-1) unstable; urgency=medium
diff --git a/control b/control
index bd4d5aa..7150a81 100644
--- a/control
+++ b/control
@@ -24,20 +24,20 @@ Build-Depends: ant (>= 1.7.0) [!mips64],
fastjar,
firebird-dev (>= 2.5.2.26540.ds4-2) [!hppa !m68k !mips !mips64
!powerpc !powerpcspe !ppc64 !s390 !s390x !sparc !sparc64],
flex (>= 2.3.35),
- fontconfig <!nocheck>,
- fonts-crosextra-carlito <!nocheck>,
- fonts-liberation <!nocheck>,
+ fontconfig [!hppa !ia64 !s390 !sparc !sparc64] <!nocheck>,
+ fonts-crosextra-carlito [!hppa !ia64 !s390 !sparc !sparc64]
<!nocheck>,
+ fonts-liberation [!hppa !ia64 !s390 !sparc !sparc64] <!nocheck>,
g++-6 [hppa ia64 s390 sparc],
gcc-6 [hppa ia64 s390 sparc],
gcj-jdk [hppa ia64 s390 sparc],
gcj-native-helper [hppa ia64 s390 sparc],
- gdb [!kfreebsd-any] <!nocheck>,
+ gdb [!hppa !ia64 !s390 !sparc !sparc64] <!nocheck>,
gettext,
gobject-introspection (>= 1.32.0),
gperf,
java-common (>= 0.49),
javahelper (>= 0.37~),
- junit4 (>= 4.8.2-2) [!kfreebsd-any],
+ junit4 (>= 4.8.2-2) [!hppa !ia64 !s390 !sparc !sparc64]
<!nocheck>,
kdelibs5-dev (>= 4:4.3.4),
libabw-dev (>= 0.1),
libarchive-zip-perl,
diff --git a/rules b/rules
index cb9e686..f29d2d5 100755
--- a/rules
+++ b/rules
@@ -267,10 +267,10 @@ else
PACKAGE_SDK_DOCS=y
endif
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"
- ifeq (,$(findstring kfreebsd,$(DEB_HOST_ARCH)))
RUN_MAKE_CHECK=y
ifeq "$(DEB_HOST_ARCH)" "i386"
ENABLE_JUNIT4=y
@@ -278,12 +278,10 @@ ifeq "$(ENABLE_JAVA)" "y"
ifeq "$(DEB_HOST_ARCH)" "amd64"
ENABLE_JUNIT4=y
endif
- endif
RUN_PYTESTS=y
endif
else
ifeq "$(JDK)" "openjdk"
- ifeq (,$(findstring kfreebsd,$(DEB_HOST_ARCH)))
RUN_MAKE_CHECK=y
ifeq "$(DEB_HOST_ARCH)" "i386"
ENABLE_JUNIT4=y
@@ -291,7 +289,6 @@ ifeq "$(ENABLE_JAVA)" "y"
ifeq "$(DEB_HOST_ARCH)" "amd64"
ENABLE_JUNIT4=y
endif
- endif
RUN_PYTESTS=y
else
RUN_MAKE_CHECK=n
@@ -312,6 +309,15 @@ ifeq "$(ENABLE_JAVA)" "y"
# ifneq (,$(findstring s390,$(DEB_HOST_ARCH)))
# export DISABLE_CVE_TESTS=TRUE
# endif
+ ifneq (,$(findstring kfreebsd-amd64,$(DEB_HOST_ARCH)))
+ export RUN_MAKE_CHECK=n
+ endif
+ ifneq (,$(findstring kfreebsd-i386,$(DEB_HOST_ARCH)))
+ export RUN_MAKE_CHECK=n
+ endif
+ ifneq (,$(findstring sparc64,$(DEB_HOST_ARCH)))
+ export RUN_MAKE_CHECK=n
+ endif
else
RUN_MAKE_CHECK=n
ENABLE_JUNIT4=n
@@ -617,6 +623,9 @@ $(eval $(call gen_no_archs,OOO_BASE_ARCHS))
OOO_REPORTDESIGN_ARCHS := $(filter-out $(OOO_GCJ_JDK_ARCHS),$(OOO_JAVA_ARCHS))
$(eval $(call gen_no_archs,OOO_REPORTDESIGN_ARCHS))
+OOO_CHECK_ARCHS := $(filter-out $(OOO_GCJ_JDK_ARCHS) sparc64,$(OOO_ARCHS))
+$(eval $(call gen_no_archs,OOO_CHECK_ARCHS))
+
ifneq (,$(findstring $(DEB_HOST_ARCH),$(OOO_NO_BASE_ARCHS)))
ifneq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH),$(OOO_BASE_ARCHS)))
PACKAGE_BASE=n
@@ -928,19 +937,15 @@ endif
ifneq (,$(filter cppunit, $(SYSTEM_STUFF)))
BUILD_DEPS += , libcppunit-dev (>= $(CPPUNIT_MINVER))
endif
-ifeq "$(RUN_MAKE_CHECK)" "y"
- BUILD_DEPS += , gdb [!kfreebsd-any] <!nocheck>
- BUILD_DEPS += , fontconfig <!nocheck>
- BUILD_DEPS += , fonts-liberation <!nocheck>
- BUILD_DEPS += , fonts-crosextra-carlito <!nocheck>
+ BUILD_DEPS += , gdb$(OOO_NO_CHECK_ARCHS) <!nocheck>
+ BUILD_DEPS += , fontconfig$(OOO_NO_CHECK_ARCHS) <!nocheck>
+ BUILD_DEPS += , fonts-liberation$(OOO_NO_CHECK_ARCHS) <!nocheck>
+ BUILD_DEPS += , fonts-crosextra-carlito$(OOO_NO_CHECK_ARCHS) <!nocheck>
ifeq "$(ENABLE_JUNIT4)" "y"
- BUILD_DEPS += , junit4 $(JUNIT_MIN_VER) [!kfreebsd-any]
+ BUILD_DEPS += , junit4 $(JUNIT_MIN_VER)$(OOO_NO_CHECK_ARCHS) <!nocheck>
else
CONFIGURE_FLAGS += --without-junit
endif
-else
- CONFIGURE_FLAGS += --without-junit
-endif
ifneq "$(BUILD_ONLY_EN_US)" "y"
ifeq (lang=,$(findstring lang=,$(DEB_BUILD_OPTIONS)))
diff --git a/tests/control b/tests/control
index 622d02c..87b03c1 100644
--- a/tests/control
+++ b/tests/control
@@ -1,5 +1,5 @@
Tests: junit-subsequentcheck
-Depends: libreoffice, libreoffice-subsequentcheckbase,
libreoffice-sdbc-hsqldb, autoconf, automake, bc, bison, bzip2, fastjar, flex
(>= 2.3.35), gperf, libarchive-zip-perl, libcups2-dev, libfontconfig1-dev,
libfreetype6-dev (>= 2.2.0), libice-dev, libsm-dev, libx11-dev, libxaw7-dev,
libxext-dev, libxinerama-dev, libxkbfile-dev, libxrender-dev, libxt-dev,
libxtst-dev, pkg-config, unzip, x11proto-render-dev, xsltproc, zip, zlib1g-dev
, libgltf-dev (>= 0.0.2-4) , opencollada-dev (>= 0.1.0~2 [...]
+Depends: libreoffice, libreoffice-subsequentcheckbase,
libreoffice-sdbc-hsqldb, autoconf, automake, bc, bison, bzip2, fastjar, flex
(>= 2.3.35), gperf, libarchive-zip-perl, libcups2-dev, libfontconfig1-dev,
libfreetype6-dev (>= 2.2.0), libice-dev, libsm-dev, libx11-dev, libxaw7-dev,
libxext-dev, libxinerama-dev, libxkbfile-dev, libxrender-dev, libxt-dev,
libxtst-dev, pkg-config, unzip, x11proto-render-dev, xsltproc, zip, zlib1g-dev
, libgltf-dev (>= 0.0.2-4) , opencollada-dev (>= 0.1.0~2 [...]
Tests: pyuno-import
Depends: python3-uno
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-openoffice/libreoffice.git
