diff --git a/debian/changelog b/debian/changelog index 55314db6..e96debff 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +ostree (2021.6-1) UNRELEASED; urgency=medium + + * New upstream release + - Drop patch that was applied upstream + + -- Simon McVittie Mon, 13 Dec 2021 11:39:08 +0000 + ostree (2021.5-1) unstable; urgency=medium * New upstream release diff --git a/debian/patches/series b/debian/patches/series index bad905f4..b73e566a 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1 @@ -test-commit-sign.sh-Skip-a-unit-test-when-running-as-an-i.patch debian/Skip-test-pull-repeated-during-CI.patch diff --git a/debian/patches/test-commit-sign.sh-Skip-a-unit-test-when-running-as-an-i.patch b/debian/patches/test-commit-sign.sh-Skip-a-unit-test-when-running-as-an-i.patch deleted file mode 100644 index 8d4be8d4..00000000 --- a/debian/patches/test-commit-sign.sh-Skip-a-unit-test-when-running-as-an-i.patch +++ /dev/null @@ -1,31 +0,0 @@ -From: Simon McVittie -Date: Tue, 5 Oct 2021 23:51:37 +0100 -Subject: test-commit-sign.sh: Skip a unit test when running as an - installed-test - -Signed-off-by: Simon McVittie -Forwarded: https://github.com/ostreedev/ostree/pull/2459 -Applied-upstream: 2021.6, commit:92ed1857ae49a5e4d16bea345b6b5bf6671bf990 ---- - tests/test-commit-sign.sh | 8 ++++++-- - 1 file changed, 6 insertions(+), 2 deletions(-) - -diff --git a/tests/test-commit-sign.sh b/tests/test-commit-sign.sh -index c3f9ce6..e175919 100755 ---- a/tests/test-commit-sign.sh -+++ b/tests/test-commit-sign.sh -@@ -88,8 +88,12 @@ assert_file_has_content_literal show.txt 'Found 1 signature' - echo "ok pull verify" - - # Run tests written in C --${OSTREE_UNINSTALLED}/tests/test-commit-sign-sh-ext --echo "ok extra C tests" -+if [ -n "${OSTREE_UNINSTALLED:-}" ]; then -+ ${OSTREE_UNINSTALLED}/tests/test-commit-sign-sh-ext -+ echo "ok extra C tests" -+else -+ echo "ok # SKIP test only available when running uninstalled" -+fi - - # Clean things up and reinit - rm repo -rf