[libreoffice] 01/04: Merge remote-tracking branch 'origin/debian-experimental-5.4' into debian-experimental-6.0
Rene Engelhard
rene at moszumanska.debian.org
Thu Jul 13 22:16:26 UTC 2017
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch debian-experimental-6.0
in repository libreoffice.
commit 2c7444c8c265319d8016a62b7bac53e37f1ad236
Merge: 3e0aa11 8ec51d3
Author: Rene Engelhard <rene at debian.org>
Date: Thu Jul 13 23:58:13 2017 +0200
Merge remote-tracking branch 'origin/debian-experimental-5.4' into debian-experimental-6.0
changelog | 38 +++++++----
control | 23 +++----
control.in | 3 +-
control.nlpsolver.in | 2 +-
control.ogltrans.in | 2 +-
control.systray.in | 2 +-
patches/debian-branding.diff | 13 ----
patches/fix-m68k-build-again.diff | 76 ----------------------
patches/mediwiki-oor-replace.diff | 16 -----
patches/series | 2 -
rules | 26 ++++++--
shlibs.override.orcus | 4 +-
tests/control | 18 +++---
tests/junit-subsequentcheck | 21 ++++--
tests/odk-build-examples | 38 +++++++++++
tests/patches/odk-build-examples-standalone.diff | 50 +++++++++++++++
tests/sdk-examples | 82 ------------------------
tests/uicheck | 16 ++++-
18 files changed, 190 insertions(+), 242 deletions(-)
diff --cc changelog
index 09f06c9,fe6487d..dec7171
--- a/changelog
+++ b/changelog
@@@ -1,29 -1,30 +1,36 @@@
+libreoffice (1:6.0.0~alpha0~git20170622-1) UNRELEASED; urgency=medium
+
+ * New upstream snapshot
+
+ -- Rene Engelhard <rene at debian.org> Thu, 18 May 2017 12:54:08 +0200
+
- libreoffice (1:5.4.0~rc2~git20170702-1) UNRELEASED; urgency=medium
+ libreoffice (1:5.4.0~rc2-1) UNRELEASED; urgency=medium
- * New upstream snapshot
+ * New upstream release candidate
- * debian/patches/sdk-cat-sed-bin.diff: fix bin/distro-install-sdk;
- cat and sed are in /bin... How did this ever work?
- * debian/patches/fix-m68k-build-again.diff: as name says; remove
- somehow misapplied upstream patch and reapply 5.3s m68k-alignment.diff
+ * debian/patches/mediawiki-oor-replace.diff: back to ="fuse" for Paths.xcu
+ as otherwise it overwrites Template paths and breaks the python wizards
+ (closes: #867209)
- * debian/tests/control, debian/tests/sdk-examples: resemble upstream
- build-examples check. Build all examples mentioned there.
+ * debian/tests/control, debian/uitest: improve, we can only run the test
+ now; remove build-needed
+ * debian/tests/control, debian/tests/sdk-examples: move ...
+ * debian/tests/control, debian/tests/odk-build-examples: ... here and use
+ upstreams odk/build-examples check directly.
(Needs zip, python3-uno and libreoffice-officbean as new test Depends:)
- * debian/tests/sdk-examples: actually set -e...
+ * debian/tests/odk-build-examples: actually set -e...
* debian/rules, debian/tests/control: remove extra hackery to add our
- Build-Depends-(Indep-): to debian/tests/control.in; misses some packages
+ Build-Depends(-Indep): to debian/tests/control.in; misses some packages
(e.g. ant) and it should work at least since autopktest 3.16 from Jul 2015;
use @builddeps@ instead
- * debian/tests/control, debian/tests/*uno-import.diff: split; make pyuno-import
- test import pyuno while uno-import does import uno (the uichecks do the former).
- add python3 Depends: for safety
+ * debian/tests/control, debian/tests/*uno-import.diff: split; make
+ pyuno-import test import pyuno while uno-import does import uno
+ (the uichecks do the former). Add python3 dependency for safety.
+ * debian/test/control: sort by importance
+ * debian/tests/: unapply patch after the make (or on error) so that the
+ next test can patch it...
+ * debian/tests/*: more cleanups for newer autopkgtests; use allow-stderr
+ instead of manual 2>&1
* debian/rules:
- be consequent and set RUN_PYTESTS=n (and RUN_MAKE_UICHECK=n) where we set
diff --cc patches/series
index 0f601fa,ff03270..02c7c2d
--- a/patches/series
+++ b/patches/series
@@@ -31,4 -30,4 +30,3 @@@ no-openssl.dif
disable-sc_subsequent_filters_test-with-internal-cppunit.diff
cppunit-optional.diff
disable-unused-test-programs.diff
- fix-m68k-build-again.diff
-gb_SUPPRESS_TESTS.diff
diff --cc rules
index 6cce2eb,2faf5b7..5d56f2a
--- a/rules
+++ b/rules
@@@ -264,7 -264,12 +264,15 @@@ ifneq (nocheck,$(findstring nocheck,$(D
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 "$(DEB_HOST_ARCH_ENDIAN)" "big"
+ RUN_MAKE_CHECK=n
+ else
RUN_MAKE_CHECK=y
++<<<<<<< HEAD
++=======
+ endif
+ RUN_MAKE_UICHECK=y
++>>>>>>> origin/debian-experimental-5.4
ifeq "$(DEB_HOST_ARCH)" "i386"
ENABLE_JUNIT4=y
endif
@@@ -276,7 -281,12 +284,15 @@@
endif
else
ifeq "$(JDK)" "openjdk"
+ ifeq "$(DEB_HOST_ARCH_ENDIAN)" "big"
+ RUN_MAKE_CHECK=n
+ else
RUN_MAKE_CHECK=y
++<<<<<<< HEAD
++=======
+ endif
+ RUN_MAKE_UICHECK=y
++>>>>>>> origin/debian-experimental-5.4
ifeq "$(DEB_HOST_ARCH)" "i386"
ENABLE_JUNIT4=y
endif
diff --cc tests/uicheck
index fff93fc,6615e78..0f9855a
--- a/tests/uicheck
+++ b/tests/uicheck
@@@ -47,5 -54,7 +54,8 @@@ export LANG=en_US.UTF-
export LC_ALL=en_US.UTF-8
make -rk \
OOO_TEST_SOFFICE=${OOO_TEST_SOFFICE} \
+ bridges_SELECTED_BRIDGE=foo \
- uicheck verbose=t 2>&1
+ uicheck verbose=t
+
+ unapply
+
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
More information about the Pkg-openoffice-commits
mailing list