diff --git a/debian/changelog b/debian/changelog index 3a95442e..08cfcd45 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +ostree (2022.3-1) UNRELEASED; urgency=medium + + * New upstream release + - Drop patches that were applied upstream + + -- Dan Nicholson Wed, 08 Jun 2022 16:54:16 +0000 + ostree (2022.2-3) unstable; urgency=medium * d/rules: Correct argument used to disable gjs on s390x diff --git a/debian/patches/s390x-se-luks-gencpio-Fix-shebang-syntax.patch b/debian/patches/s390x-se-luks-gencpio-Fix-shebang-syntax.patch deleted file mode 100644 index 6c758ffb..00000000 --- a/debian/patches/s390x-se-luks-gencpio-Fix-shebang-syntax.patch +++ /dev/null @@ -1,25 +0,0 @@ -From: Simon McVittie -Date: Mon, 7 Mar 2022 21:06:48 +0000 -Subject: s390x-se-luks-gencpio: Fix shebang syntax - -An indented `#!` is technically meaningless, although many shells will -run text files with the shell if asked to execute them. - -Signed-off-by: Simon McVittie -Applied-upstream: 2022.3, commit:084f8913f02340831e91c4e39f6037af6ceb63e4 ---- - src/libostree/s390x-se-luks-gencpio | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/libostree/s390x-se-luks-gencpio b/src/libostree/s390x-se-luks-gencpio -index f0ad24e..729aff6 100755 ---- a/src/libostree/s390x-se-luks-gencpio -+++ b/src/libostree/s390x-se-luks-gencpio -@@ -1,5 +1,5 @@ -- #!/usr/bin/bash -- # This script creates new initramdisk with LUKS config within -+#!/usr/bin/bash -+# This script creates new initramdisk with LUKS config within - set -euo pipefail - - old_initrd=$1 diff --git a/debian/patches/s390x-se-luks-gencpio-Use-interoperable-path-for-bash.patch b/debian/patches/s390x-se-luks-gencpio-Use-interoperable-path-for-bash.patch deleted file mode 100644 index 0eb3a422..00000000 --- a/debian/patches/s390x-se-luks-gencpio-Use-interoperable-path-for-bash.patch +++ /dev/null @@ -1,23 +0,0 @@ -From: Simon McVittie -Date: Mon, 7 Mar 2022 21:07:25 +0000 -Subject: s390x-se-luks-gencpio: Use interoperable path for bash - -On OSs that do not consistently merge /usr/bin with /bin, the path to -bash has traditionally been /bin/bash. - -Signed-off-by: Simon McVittie -Applied-upstream: 2022.3, commit:a9a0110f440d10a4c9f51bf0f0ab9a7b3b79e2c5 ---- - src/libostree/s390x-se-luks-gencpio | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/libostree/s390x-se-luks-gencpio b/src/libostree/s390x-se-luks-gencpio -index 729aff6..7c94a44 100755 ---- a/src/libostree/s390x-se-luks-gencpio -+++ b/src/libostree/s390x-se-luks-gencpio -@@ -1,4 +1,4 @@ --#!/usr/bin/bash -+#!/bin/bash - # This script creates new initramdisk with LUKS config within - set -euo pipefail - diff --git a/debian/patches/series b/debian/patches/series index 53aaf1d6..b73e566a 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1 @@ debian/Skip-test-pull-repeated-during-CI.patch -s390x-se-luks-gencpio-Fix-shebang-syntax.patch -s390x-se-luks-gencpio-Use-interoperable-path-for-bash.patch -test-prune-Read-to-the-end-of-cut-1-output.patch diff --git a/debian/patches/test-prune-Read-to-the-end-of-cut-1-output.patch b/debian/patches/test-prune-Read-to-the-end-of-cut-1-output.patch deleted file mode 100644 index 636656e9..00000000 --- a/debian/patches/test-prune-Read-to-the-end-of-cut-1-output.patch +++ /dev/null @@ -1,29 +0,0 @@ -From: Simon McVittie -Date: Mon, 7 Mar 2022 19:52:25 +0000 -Subject: test-prune: Read to the end of cut(1) output - -If we use head(1) to take only the first two lines, then cut(1) and -earlier pipeline entries are killed by SIGPIPE (if they have not already -terminated), and that's flagged as an error under `set -o pipefail`. -Use an equivalent sed command to take exactly the second line, but -without SIGPIPE. - -Signed-off-by: Simon McVittie -Applied-upstream: 2022.3, commit:92ca2c7794afd06c1f3a602b53ac5e51ec34bfd4 ---- - tests/test-prune.sh | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tests/test-prune.sh b/tests/test-prune.sh -index 20904f3..bbb77a2 100755 ---- a/tests/test-prune.sh -+++ b/tests/test-prune.sh -@@ -350,7 +350,7 @@ tap_ok --commit-only and --delete-commit - # Test --delete-commit when it creates orphaned commits - reinitialize_commit_only_test_repo - # get the current HEAD's parent on dev branch --COMMIT_TO_DELETE=$(${CMD_PREFIX} ostree --repo=repo log dev | grep ^commit | cut -f 2 -d' ' | head -n 2 | tail -n 1) -+COMMIT_TO_DELETE=$(${CMD_PREFIX} ostree --repo=repo log dev | grep ^commit | cut -f 2 -d' ' | sed -ne '2p') - ${CMD_PREFIX} ostree --repo=repo prune --commit-only --refs-only --delete-commit=$COMMIT_TO_DELETE - # we deleted a commit that orphaned another, so we lose two commits - assert_repo_has_n_commits repo 4