This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch master
in repository libreoffice.
commit c16e432575ca5f1ebc2a090a4c9dcb53f84e76ce
Author: Rene Engelhard <r...@debian.org>
Date: Mon Mar 7 23:06:20 2016 +0100
merge updated tests/patches/java-subsequentcheck-standalone.diff from Ubuntu
---
changelog | 2 ++
tests/patches/java-subsequentcheck-standalone.diff | 12 +++++++-----
2 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/changelog b/changelog
index ef6fdd7..b992077 100644
--- a/changelog
+++ b/changelog
@@ -8,6 +8,8 @@ libreoffice (1:5.1.1~rc3-2) unstable; urgency=medium
* debian/rules, debian/test/*: stop adding -dbgsym to the test Depends:,
ci.debian.net doesn't have the debug archive in sources.list -> fail
* merge from Ubuntu:
+ - update autopkgtest runner patch, removing unhelpful build system deps for
+ out-of-tree integration testing
- (re)add build version for "About LibreOffice"
-- Rene Engelhard <r...@debian.org> Mon, 07 Mar 2016 20:31:50 +0100
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
