From b3fd20e5181593d18328ced2cd2368eb43bcd27b Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Thu, 22 Feb 2018 22:56:35 +0000 Subject: [PATCH] Update patch status * d/p/{debian/,}Use-Python-3-for-tests.patch: Mark patch as forwarded. It was previously considered Debian-specific, but upstream seem interested. * Mark all other patches as applied upstream for 2018.3 --- debian/changelog | 9 +++++++++ debian/patches/{debian => }/Use-Python-3-for-tests.patch | 1 + debian/patches/series | 2 +- .../test-concurrency-Explicitly-use-floor-division.patch | 2 +- .../test-concurrency-Replace-range-with-xrange.patch | 2 +- .../test-concurrency-Use-Python-3-syntax-for-octal.patch | 2 +- ...loader-entries-crosscheck-Use-Python-3-friendly.patch | 2 +- 7 files changed, 15 insertions(+), 5 deletions(-) rename debian/patches/{debian => }/Use-Python-3-for-tests.patch (96%) diff --git a/debian/changelog b/debian/changelog index 9dd08405..b24a5423 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +ostree (2018.2-2) UNRELEASED; urgency=medium + + * d/p/{debian/,}Use-Python-3-for-tests.patch: + Mark patch as forwarded. It was previously considered + Debian-specific, but upstream seem interested. + * Mark all other patches as applied upstream for 2018.3 + + -- Simon McVittie Thu, 22 Feb 2018 22:55:11 +0000 + ostree (2018.2-1) unstable; urgency=medium * New upstream release diff --git a/debian/patches/debian/Use-Python-3-for-tests.patch b/debian/patches/Use-Python-3-for-tests.patch similarity index 96% rename from debian/patches/debian/Use-Python-3-for-tests.patch rename to debian/patches/Use-Python-3-for-tests.patch index 46486795..9a640a13 100644 --- a/debian/patches/debian/Use-Python-3-for-tests.patch +++ b/debian/patches/Use-Python-3-for-tests.patch @@ -3,6 +3,7 @@ Date: Wed, 17 Jan 2018 14:07:32 +0000 Subject: Use Python 3 for tests Signed-off-by: Simon McVittie +Forwarded: https://github.com/ostreedev/ostree/pull/1463 --- tests/bootloader-entries-crosscheck.py | 2 +- tests/test-basic-user-only.sh | 2 +- diff --git a/debian/patches/series b/debian/patches/series index 066a53d7..d60a7cb8 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -2,4 +2,4 @@ test-concurrency-Use-Python-3-syntax-for-octal.patch test-concurrency-Replace-range-with-xrange.patch test-concurrency-Explicitly-use-floor-division.patch tests-bootloader-entries-crosscheck-Use-Python-3-friendly.patch -debian/Use-Python-3-for-tests.patch +Use-Python-3-for-tests.patch diff --git a/debian/patches/test-concurrency-Explicitly-use-floor-division.patch b/debian/patches/test-concurrency-Explicitly-use-floor-division.patch index 439ffe9e..5855a312 100644 --- a/debian/patches/test-concurrency-Explicitly-use-floor-division.patch +++ b/debian/patches/test-concurrency-Explicitly-use-floor-division.patch @@ -7,7 +7,7 @@ semantics for division when the division feature is imported from the future. Signed-off-by: Simon McVittie -Forwarded: https://github.com/ostreedev/ostree/pull/1457 +Applied-upstream: 2018.3, commit:98b597b465a556f3ad5b16478d7edee3037fbd4d --- tests/test-concurrency.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/debian/patches/test-concurrency-Replace-range-with-xrange.patch b/debian/patches/test-concurrency-Replace-range-with-xrange.patch index 98b7e00c..f0753465 100644 --- a/debian/patches/test-concurrency-Replace-range-with-xrange.patch +++ b/debian/patches/test-concurrency-Replace-range-with-xrange.patch @@ -6,7 +6,7 @@ range in Python 3 does what xrange did in Python 2. This still works in Python 2, it just uses a bit more memory. Signed-off-by: Simon McVittie -Forwarded: https://github.com/ostreedev/ostree/pull/1457 +Applied-upstream: 2018.3, commit:02dc5e2dd47d1be0eb73d2f7e5b588f04c572390 --- tests/test-concurrency.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/debian/patches/test-concurrency-Use-Python-3-syntax-for-octal.patch b/debian/patches/test-concurrency-Use-Python-3-syntax-for-octal.patch index 41f173c1..096bf2dc 100644 --- a/debian/patches/test-concurrency-Use-Python-3-syntax-for-octal.patch +++ b/debian/patches/test-concurrency-Use-Python-3-syntax-for-octal.patch @@ -5,7 +5,7 @@ Subject: test-concurrency: Use Python 3 syntax for octal This also works in Python 2.7, and is a little clearer. Signed-off-by: Simon McVittie -Forwarded: https://github.com/ostreedev/ostree/pull/1457 +Applied-upstream: 2018.3, commit:9933de232304f47e2be09c72906cc5183d9bbfda --- tests/test-concurrency.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/patches/tests-bootloader-entries-crosscheck-Use-Python-3-friendly.patch b/debian/patches/tests-bootloader-entries-crosscheck-Use-Python-3-friendly.patch index 00a25f29..03568210 100644 --- a/debian/patches/tests-bootloader-entries-crosscheck-Use-Python-3-friendly.patch +++ b/debian/patches/tests-bootloader-entries-crosscheck-Use-Python-3-friendly.patch @@ -6,7 +6,7 @@ This is a little clearer than a strcmp()-style negative/zero/positive return, and also works in Python 2. Signed-off-by: Simon McVittie -Forwarded: https://github.com/ostreedev/ostree/pull/1457 +Applied-upstream: 2018.3, commit:6cabeaed3f45c8f3e05fb5e1152bfa5b96a3bc79 --- tests/bootloader-entries-crosscheck.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)