[libreoffice] 41/152: update autopkgtest runner patch, removing unhelpful build system deps for out-of-tree integration testing

[Rene Engelhard]

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

rene pushed a commit to tag libreoffice_3.5.0_rc3-0ubuntu2
in repository libreoffice.

commit 0f9e7e882515f1e4710d99b02ee182e5c3cf2261
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Wed Feb 10 18:34:00 2016 +0100

    update autopkgtest runner patch, removing unhelpful build system deps for out-of-tree integration testing
---
 changelog                                          |  7 +++++++
 tests/patches/java-subsequentcheck-standalone.diff | 12 +++++++-----
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/changelog b/changelog
index 03d3d64..2377f81 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,10 @@
+libreoffice (1:5.1.0~rc3-0ubuntu2) xenial; urgency=medium
+
+  * update autopkgtest runner patch, removing unhelpful build system deps for
+    out-of-tree integration testing
+
+ -- Bjoern Michaelsen <bjoern.michaelsen at canonical.com>  Wed, 10 Feb 2016 18:30:45 +0100
+
 libreoffice (1:5.1.0~rc3-0ubuntu1) xenial; urgency=medium
 
   * bump to rc3
diff --git a/tests/patches/java-subsequentcheck-standalone.diff b/tests/patches/java-subsequentcheck-standalone.diff
index b415396..275efa4 100644
--- a/tests/patches/java-subsequentcheck-standalone.diff
+++ b/tests/patches/java-subsequentcheck-standalone.diff
@@ -79,7 +79,7 @@ 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
-@@ -278,6 +278,7 @@ endef
+@@ -292,15 +292,16 @@
  # 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
@@ -87,15 +87,18 @@ index 253564c..0aad310 100644
  $(call gb_Module__read_targetfile,$(1),$(2),subsequentcheck target)
  
  $(call gb_Module_get_subsequentcheck_target,$(1)) : $$(gb_Module_CURRENTTARGET)
-@@ -285,6 +286,8 @@ $$(gb_Module_CURRENTTARGET) :| \
- 	$(call gb_Postprocess_get_target,AllModulesButInstsetNative)
+ $$(gb_Module_CURRENTTARGET) :| \
+-	$(call gb_Postprocess_get_target,AllModulesButInstsetNative) \
+-    $(call gb_Package_get_target,instsetoo_native_setup) \
+-    $(call gb_Package_get_target,instsetoo_native_setup_ure)
++	$(call gb_Postprocess_get_target,AllModulesButInstsetNative)
  $(call gb_Module_get_clean_target,$(1)) : $$(gb_Module_CURRENTCLEANTARGET)
  
 +endif
 +
  endef
  
- define gb_Module_add_perfcheck_target
+ 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
@@ -134,4 +137,3 @@ index d4539d3..5bfeb06 100644
  
 -- 
 1.9.1
-

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