From 5148760e6b8bb8858dd9c3185e6417aea94235fe Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Thu, 19 Jan 2017 13:23:43 +0000 Subject: [PATCH] 2016.15-3 --- debian/changelog | 4 ++-- .../Fix-TAP-syntax-in-test-basic-user.sh-and-run-it.patch | 2 ++ debian/patches/Make-corrupt-repo-ref.js-executable.patch | 2 ++ ...ed-test-snippets-remove-shebang-and-make-non-executa.patch | 2 ++ 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 32a8cfee..5f05d69b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -ostree (2016.15-3) UNRELEASED; urgency=medium +ostree (2016.15-3) unstable; urgency=medium * debian/control: Don't run gjs tests on sparc64. gjs doesn't seem to work there at all (#827815) @@ -21,7 +21,7 @@ ostree (2016.15-3) UNRELEASED; urgency=medium * d/p/Fix-TAP-syntax-in-test-basic-user.sh-and-run-it.patch: Run an additional test, which was previously installed but not run - -- Simon McVittie Sun, 15 Jan 2017 14:37:12 +0000 + -- Simon McVittie Thu, 19 Jan 2017 13:23:32 +0000 ostree (2016.15-2) unstable; urgency=medium diff --git a/debian/patches/Fix-TAP-syntax-in-test-basic-user.sh-and-run-it.patch b/debian/patches/Fix-TAP-syntax-in-test-basic-user.sh-and-run-it.patch index c498f922..76994c35 100644 --- a/debian/patches/Fix-TAP-syntax-in-test-basic-user.sh-and-run-it.patch +++ b/debian/patches/Fix-TAP-syntax-in-test-basic-user.sh-and-run-it.patch @@ -10,6 +10,8 @@ In its initial commit, Alexander Larsson wrote but we now (a) use /var/tmp, and (b) explicitly skip the test if xattr support is unavailable. So it should be OK to run now. + +Forwarded: https://github.com/ostreedev/ostree/pull/652 --- Makefile-tests.am | 2 +- tests/test-basic-user.sh | 3 --- diff --git a/debian/patches/Make-corrupt-repo-ref.js-executable.patch b/debian/patches/Make-corrupt-repo-ref.js-executable.patch index 89a1ce3b..37fd6574 100644 --- a/debian/patches/Make-corrupt-repo-ref.js-executable.patch +++ b/debian/patches/Make-corrupt-repo-ref.js-executable.patch @@ -6,6 +6,8 @@ Debian's Lintian packaging consistency check complains that it isn't executable but has a #! line. In fact it's reasonable to run this script directly, so make it executable, and put it in a _scripts variable so it will be installed executable. + +Forwarded: https://github.com/ostreedev/ostree/pull/652 --- Makefile-tests.am | 8 +++++--- tests/corrupt-repo-ref.js | 0 diff --git a/debian/patches/Sourced-test-snippets-remove-shebang-and-make-non-executa.patch b/debian/patches/Sourced-test-snippets-remove-shebang-and-make-non-executa.patch index 73ff7130..a497255d 100644 --- a/debian/patches/Sourced-test-snippets-remove-shebang-and-make-non-executa.patch +++ b/debian/patches/Sourced-test-snippets-remove-shebang-and-make-non-executa.patch @@ -7,6 +7,8 @@ packaging consistency check complain that #! is only useful in executable scripts. But in fact they are not useful to execute directly (they rely on setup being done in the script that sources them), so just chmod them -x. + +Forwarded: https://github.com/ostreedev/ostree/pull/652 --- tests/admin-test.sh | 3 ++- tests/archive-test.sh | 4 ++--