[libreoffice] 01/02: revert applying disable-flaky-tests.diff, as it's (obviously) pre-applied in the source and thus the patch fails

[Rene Engelhard]

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

rene pushed a commit to branch master
in repository libreoffice.

commit 70d3ce4a9a2f604641e59689c5d35452cc8ed557
Author: Rene Engelhard <rene at debian.org>
Date:   Fri Dec 23 19:45:41 2016 +0100

    revert applying disable-flaky-tests.diff, as it's (obviously) pre-applied in the source and thus the patch fails
---
 changelog                   | 10 +++++++---
 tests/junit-subsequentcheck |  3 ---
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/changelog b/changelog
index ce84a95..d3e5e0c 100644
--- a/changelog
+++ b/changelog
@@ -1,8 +1,12 @@
 libreoffice (1:5.2.4-2) UNRELEASED; urgency=medium
 
-  * ENABLE_GDRIVE=n for jessie-backports on armhf/arm64 as we don't have
-    chromium there yet...
-
+  * debian/tests/junit-subsequentcheck:
+    - revert applying disable-flaky-tests.diff, as it's (obviously)
+      pre-applied in the source and thus the patch fails.
+  * debian/rules:
+    - ENABLE_GDRIVE=n for jessie-backports on armhf/arm64 as we don't have
+      chromium there yet...
+ 
  -- Rene Engelhard <rene at debian.org>  Fri, 23 Dec 2016 19:05:43 +0100
 
 libreoffice (1:5.2.4-1) unstable; urgency=medium
diff --git a/tests/junit-subsequentcheck b/tests/junit-subsequentcheck
index 3d4a234..a0ec91d 100755
--- a/tests/junit-subsequentcheck
+++ b/tests/junit-subsequentcheck
@@ -14,9 +14,6 @@ WORKDIR=`mktemp -d`
 echo "====== Patching the tree to only build Java-based unittests against an existing installation ======"
 patch -p1 < ./debian/tests/patches/java-subsequentcheck-standalone.diff
 
-echo "====== Disabling (flaky) tests ======="
-patch -p1 < ./debian/patches/disable-flaky-tests.diff
-
 echo
 echo "====== Generating configuration ======="
 rm -f config_host.mk

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