[libreoffice] 01/07: debian/tests/patches/java-subsequentcheck-standalone.diff: refreshed (from Ubuntu)

[Rene Engelhard]

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

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

commit 6adb3d551cb705dde48ba6dee187313b2844c6af
Author: Rene Engelhard <rene at rene-engelhard.de>
Date:   Tue Jun 13 00:13:29 2017 +0200

    debian/tests/patches/java-subsequentcheck-standalone.diff: refreshed (from Ubuntu)
---
 changelog                                          |  5 +++-
 tests/patches/java-subsequentcheck-standalone.diff | 28 +++++-----------------
 2 files changed, 10 insertions(+), 23 deletions(-)

diff --git a/changelog b/changelog
index 55decc5..da67f4c 100644
--- a/changelog
+++ b/changelog
@@ -5,7 +5,10 @@ libreoffice (1:5.3.4~rc1-1) UNRELEASED; urgency=medium
   * debian/patches/odk-settings-JAVA_PROC_TYPE.diff: set correct
     JAVA_PROC_TYPE for arm{el,hf}, mips* and ppc64el
 
- -- Rene Engelhard <rene at debian.org>  Thu, 01 Jun 2017 20:46:05 +0200
+  * merge from Ubuntu:
+    - debian/tests/patches/java-subsequentcheck-standalone.diff: refreshed
+
+ -- Rene Engelhard <rene at debian.org>  Tue, 13 Jun 2017 00:12:38 +0200
 
 libreoffice (1:5.3.3-2) experimental; urgency=medium
 
diff --git a/tests/patches/java-subsequentcheck-standalone.diff b/tests/patches/java-subsequentcheck-standalone.diff
index 275efa4..148bfb3 100644
--- a/tests/patches/java-subsequentcheck-standalone.diff
+++ b/tests/patches/java-subsequentcheck-standalone.diff
@@ -3,6 +3,7 @@ From: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
 Date: Wed, 28 Jan 2015 12:11:16 +0100
 Subject: [PATCH] run subsequentcheck standalone against installed version as
  integration test
+Last-Update: 2017-05-17
 
 Forwarded: partially, where there is generic use for it
 ---
@@ -16,11 +17,9 @@ Forwarded: partially, where there is generic use for it
  7 files changed, 27 insertions(+), 5 deletions(-)
  create mode 100644 solenv/gbuild/extensions/post_SkipBuild.mk
 
-diff --git a/jurt/Module_jurt.mk b/jurt/Module_jurt.mk
-index 89fb397..6b27f24 100644
 --- a/jurt/Module_jurt.mk
 +++ b/jurt/Module_jurt.mk
-@@ -22,7 +22,7 @@ $(eval $(call gb_Module_add_targets,jurt,\
+@@ -22,7 +22,7 @@ $(eval $(call gb_Module_add_targets,jurt
  ))
  endif
  
@@ -29,11 +28,9 @@ index 89fb397..6b27f24 100644
      CustomTarget_test_urp \
      InternalUnoApi_test_urp \
      JunitTest_bridgefactory \
-diff --git a/postprocess/Module_postprocess.mk b/postprocess/Module_postprocess.mk
-index 5775cfa..b2f6d44 100644
 --- a/postprocess/Module_postprocess.mk
 +++ b/postprocess/Module_postprocess.mk
-@@ -12,13 +12,13 @@ $(eval $(call gb_Module_Module,postprocess))
+@@ -12,13 +12,13 @@ $(eval $(call gb_Module_Module,postproce
  # UGLY: postprocess_XCDS variable from CustomTarget_registry
  # is reused in Package_registry!
  
@@ -49,8 +46,6 @@ index 5775cfa..b2f6d44 100644
  	Package_registry \
  ))
  
-diff --git a/solenv/gbuild/JavaClassSet.mk b/solenv/gbuild/JavaClassSet.mk
-index 58a16d9..35a2110 100644
 --- a/solenv/gbuild/JavaClassSet.mk
 +++ b/solenv/gbuild/JavaClassSet.mk
 @@ -39,7 +39,7 @@ $(call gb_Helper_abbreviate_dirs,\
@@ -62,11 +57,9 @@ index 58a16d9..35a2110 100644
  			-d $(call gb_JavaClassSet_get_classdir,$(2)) \
  			@$$RESPONSEFILE &&) \
  		rm -f $$RESPONSEFILE &&) \
-diff --git a/solenv/gbuild/JunitTest.mk b/solenv/gbuild/JunitTest.mk
-index 8370603..efe2660 100644
 --- a/solenv/gbuild/JunitTest.mk
 +++ b/solenv/gbuild/JunitTest.mk
-@@ -54,7 +54,7 @@ $(call gb_JunitTest_get_target,%) :
+@@ -55,7 +55,7 @@ $(call gb_JunitTest_get_target,%) :
  	$(CLEAN_CMD)
  
  define gb_JunitTest_JunitTest
@@ -75,11 +68,9 @@ index 8370603..efe2660 100644
  $(call gb_JunitTest_get_target,$(1)) : CLASSES :=
  $(eval $(call gb_JunitTest_JunitTest_platform,$(1)))
  
-diff --git a/solenv/gbuild/Module.mk b/solenv/gbuild/Module.mk
-index 253564c..0aad310 100644
 --- a/solenv/gbuild/Module.mk
 +++ b/solenv/gbuild/Module.mk
-@@ -292,15 +292,16 @@
+@@ -336,15 +336,16 @@ endef
  # has order dependency on AllModulesButInstsetNative to be able to run
  # subsequentcheck in the same make process on "make check"
  define gb_Module_add_subsequentcheck_target
@@ -99,9 +90,6 @@ index 253564c..0aad310 100644
  endef
  
  define gb_Module_add_stagingcheck_target
-diff --git a/solenv/gbuild/extensions/post_SkipBuild.mk b/solenv/gbuild/extensions/post_SkipBuild.mk
-new file mode 100644
-index 0000000..7f8c18a
 --- /dev/null
 +++ b/solenv/gbuild/extensions/post_SkipBuild.mk
 @@ -0,0 +1,18 @@
@@ -123,11 +111,9 @@ index 0000000..7f8c18a
 +gb_JunitTest_use_jar =
 +
 +# vim: set noet sw=4 ts=4:
-diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk
-index d4539d3..5bfeb06 100644
 --- a/solenv/gbuild/platform/unxgcc.mk
 +++ b/solenv/gbuild/platform/unxgcc.mk
-@@ -290,6 +290,7 @@ $(call gb_JunitTest_get_target,$(1)) : DEFS := \
+@@ -289,6 +289,7 @@ $(call gb_JunitTest_get_target,$(1)) : D
  	-Dorg.openoffice.test.arg.workdir=$(call gb_JunitTest_get_userdir,$(1)) \
  	-Dorg.openoffice.test.arg.postprocesscommand=$(SRCDIR)/solenv/bin/gdb-core-bt.sh \
  	-Dorg.openoffice.test.arg.soffice="$(gb_JunitTest_SOFFICEARG)" \
@@ -135,5 +121,3 @@ index d4539d3..5bfeb06 100644
  
  endef
  
--- 
-1.9.1

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