[Git][libreoffice-team/libreoffice/libreoffice][debian-experimental-6.1] 9 commits: back to libreoffice-6-0 branch; update patches
Rene Engelhard
rene at debian.org
Sun Jan 28 12:17:17 UTC 2018
Rene Engelhard pushed to branch debian-experimental-6.1 at Debian LibreOffice Maintainers / libreoffice / libreoffice
Commits:
e4f09d01 by Rene Engelhard at 2018-01-27T14:18:25+01:00
back to libreoffice-6-0 branch; update patches
- - - - -
a7499443 by Rene Engelhard at 2018-01-27T14:21:55+01:00
Merge branch 'debian-experimental-6.0' of salsa.debian.org:libreoffice-team/libreoffice/libreoffice into debian-experimental-6.0
- - - - -
18a27d4d by Rene Engelhard at 2018-01-27T14:23:00+01:00
Merge tag 'libreoffice_6.0.0_rc3-1'
tag libreoffice 1:6.0.0~rc3-1
- - - - -
096adcc4 by Rene Engelhard at 2018-01-28T11:00:21+01:00
debian/patches/disable-flaky-tests.diff: disable ODFEncryptiomGPG test
- - - - -
962ffc8d by Rene Engelhard at 2018-01-28T11:50:54+01:00
make lintian happy wrt unused patch files for the tests
W: libreoffice source: patch-file-present-but-not-mentioned-in-series disable-db-tests.diff
W: libreoffice source: patch-file-present-but-not-mentioned-in-series smoketest-disable-extension-tests.diff
just move them to debian/tests/patches
- - - - -
4531c46b by Rene Engelhard at 2018-01-28T11:34:46+00:00
merge from Ubuntu: debian/patches/apparmor-fixes.diff: allow JVM execution
- - - - -
972ac84b by Rene Engelhard at 2018-01-28T12:57:56+01:00
oops, actually also commit the rules parts
- - - - -
0f613237 by Rene Engelhard at 2018-01-28T12:59:07+01:00
Merge remote-tracking branch 'origin/master' into debian-experimental-6.0
- - - - -
741f10da by Rene Engelhard at 2018-01-28T13:16:31+01:00
Merge remote-tracking branch 'origin/debian-experimental-6.0' into debian-experimental-6.1
- - - - -
5 changed files:
- changelog
- patches/disable-flaky-tests.diff
- rules
- patches/disable-db-tests.diff → tests/patches/disable-db-tests.diff
- patches/smoketest-disable-extension-tests.diff → tests/patches/smoketest-disable-extension-tests.diff
Changes:
=====================================
changelog
=====================================
--- a/changelog
+++ b/changelog
@@ -16,6 +16,26 @@ libreoffice (1:6.1.0~alpha1~git20180127-1) UNRELEASED; urgency=medium
-- Rene Engelhard <rene at debian.org> Tue, 07 Nov 2017 20:59:01 +0100
+libreoffice (1:6.0.1~rc1~git20181028-1) UNRELEASED; urgency=medium
+
+ * New upstream snapshot
+
+ -- Rene Engelhard <rene at debian.org> Sat, 13 Jan 2018 13:34:41 +0100
+
+libreoffice (1:6.0.0~rc3-3) UNRELEASED; urgency=medium
+
+ * merge from Ubuntu:
+ - debian/patches/apparmor-fixes.diff: allow JVM execution
+
+ -- Rene Engelhard <rene at debian.org> Sun, 28 Jan 2018 11:33:38 +0000
+
+libreoffice (1:6.0.0~rc3-2) experimental; urgency=medium
+
+ * debian/patches/disable-flaky-tests.diff: disable ODFEncryptiomGPG test;
+ the signing parts work, so...
+
+ -- Rene Engelhard <rene at debian.org> Sat, 27 Jan 2018 14:37:23 +0100
+
libreoffice (1:6.0.0~rc3-1) experimental; urgency=medium
* New upstream release candidate
=====================================
patches/disable-flaky-tests.diff
=====================================
--- a/patches/disable-flaky-tests.diff
+++ b/patches/disable-flaky-tests.diff
@@ -212,3 +212,40 @@ index 4d65beeb90c4..f3d71501c41a 100644
DECLARE_OOXMLIMPORT_TEST(testTdf113946, "tdf113946.docx")
{
+--- a/xmlsecurity/qa/unit/signing/signing.cxx-old 2018-01-27 18:21:08.228434985 +0100
++++ b/xmlsecurity/qa/unit/signing/signing.cxx 2018-01-27 18:21:37.428824309 +0100
+@@ -114,7 +114,7 @@
+ /// Test a typical broken ODF signature where the XML dsig hash is corrupted.
+ void testODFBrokenDsigGPG();
+ /// Test loading an encrypted ODF document
+- void testODFEncryptedGPG();
++// void testODFEncryptedGPG();
+ #endif
+ CPPUNIT_TEST_SUITE(SigningTest);
+ CPPUNIT_TEST(testDescription);
+@@ -143,7 +143,7 @@
+ CPPUNIT_TEST(testODFUntrustedGoodGPG);
+ CPPUNIT_TEST(testODFBrokenStreamGPG);
+ CPPUNIT_TEST(testODFBrokenDsigGPG);
+- CPPUNIT_TEST(testODFEncryptedGPG);
++// CPPUNIT_TEST(testODFEncryptedGPG);
+ #endif
+ CPPUNIT_TEST_SUITE_END();
+
+@@ -743,14 +743,14 @@
+ CPPUNIT_ASSERT_EQUAL(static_cast<int>(SignatureState::BROKEN), static_cast<int>(pObjectShell->GetDocumentSignatureState()));
+ }
+
+-void SigningTest::testODFEncryptedGPG()
++/*void SigningTest::testODFEncryptedGPG()
+ {
+ createDoc(m_directories.getURLFromSrc(DATA_DIRECTORY) + "encryptedGPG.odt");
+ SfxBaseModel* pBaseModel = dynamic_cast<SfxBaseModel*>(mxComponent.get());
+ CPPUNIT_ASSERT(pBaseModel);
+ SfxObjectShell* pObjectShell = pBaseModel->GetObjectShell();
+ CPPUNIT_ASSERT(pObjectShell);
+-}
++}*/
+
+ #endif
+
=====================================
rules
=====================================
--- a/rules
+++ b/rules
@@ -2031,11 +2031,11 @@ endif
check:
ifeq "$(RUN_MAKE_CHECK)" "y"
ifneq (,$(findstring $(DEB_HOST_ARCH),$(OOO_NO_BASE_ARCHS)))
- patch -p1 < $(CURDIR)/debian/patches/disable-db-tests.diff
+ patch -p1 < $(CURDIR)/debian/tests/patches/disable-db-tests.diff
endif
ifeq (,$(findstring $(DEB_HOST_ARCH),$(OOO_EXTENSIONS_ARCHS)))
cd $(SOURCE_TREE)/smoketest && \
- patch -p1 < $(CURDIR)/debian/patches/smoketest-disable-extension-tests.diff
+ patch -p1 < $(CURDIR)/debian/tests/patches/smoketest-disable-extension-tests.diff
endif
PATH=$(BUILD_PATH) LD_LIBRARY_PATH=$(BUILD_LD_LIBRARY_PATH) \
@@ -2072,11 +2072,11 @@ endif
$(MAKE) -k check || PARALLELISM=1 $(MAKE) check && \
rm -rf $$t
ifneq (,$(findstring $(DEB_HOST_ARCH),$(OOO_NO_BASE_ARCHS)))
- patch -p1 -R < $(CURDIR)/debian/patches/disable-db-tests.diff
+ patch -p1 -R < $(CURDIR)/debian/tests/patches/disable-db-tests.diff
endif
ifeq (,$(findstring $(DEB_HOST_ARCH),$(OOO_EXTENSIONS_ARCHS)))
cd $(SOURCE_TREE)/smoketest && \
- patch -p1 -R < $(CURDIR)/debian/patches/smoketest-disable-extension-tests.diff
+ patch -p1 -R < $(CURDIR)/debian/tests/patches/smoketest-disable-extension-tests.diff
endif
endif
=====================================
patches/disable-db-tests.diff → tests/patches/disable-db-tests.diff
=====================================
=====================================
patches/smoketest-disable-extension-tests.diff → tests/patches/smoketest-disable-extension-tests.diff
=====================================
View it on GitLab: https://salsa.debian.org/libreoffice-team/libreoffice/libreoffice/compare/584e850836f8307ee8d62f1b38f33d533a0c64cd...741f10daf0daecc0cdbd17050e1ee0da6fc97e27
---
View it on GitLab: https://salsa.debian.org/libreoffice-team/libreoffice/libreoffice/compare/584e850836f8307ee8d62f1b38f33d533a0c64cd...741f10daf0daecc0cdbd17050e1ee0da6fc97e27
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.alioth.debian.org/pipermail/pkg-openoffice-commits/attachments/20180128/f99e4299/attachment-0001.html>
More information about the Pkg-openoffice-commits
mailing list