packaging
/
ostree
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
This commit is contained in:
Simon McVittie 2018-02-22 22:56:35 +00:00
parent ca7bc15aa4
commit b3fd20e518
7 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
debian/changelog vendored
View File

@ -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 <smcv@debian.org> Thu, 22 Feb 2018 22:55:11 +0000
ostree (2018.2-1) unstable; urgency=medium ostree (2018.2-1) unstable; urgency=medium
* New upstream release * New upstream release

1
debian/patches/debian/Use-Python-3-for-tests.patch → debian/patches/Use-Python-3-for-tests.patch vendored
View File

@ -3,6 +3,7 @@ Date: Wed, 17 Jan 2018 14:07:32 +0000
Subject: Use Python 3 for tests Subject: Use Python 3 for tests
Signed-off-by: Simon McVittie <smcv@debian.org> Signed-off-by: Simon McVittie <smcv@debian.org>
Forwarded: https://github.com/ostreedev/ostree/pull/1463
--- ---
tests/bootloader-entries-crosscheck.py | 2 +- tests/bootloader-entries-crosscheck.py | 2 +-
tests/test-basic-user-only.sh | 2 +- tests/test-basic-user-only.sh | 2 +-

2
debian/patches/series vendored
View File

@ -2,4 +2,4 @@ test-concurrency-Use-Python-3-syntax-for-octal.patch
test-concurrency-Replace-range-with-xrange.patch test-concurrency-Replace-range-with-xrange.patch
test-concurrency-Explicitly-use-floor-division.patch test-concurrency-Explicitly-use-floor-division.patch
tests-bootloader-entries-crosscheck-Use-Python-3-friendly.patch tests-bootloader-entries-crosscheck-Use-Python-3-friendly.patch
debian/Use-Python-3-for-tests.patch Use-Python-3-for-tests.patch

2
debian/patches/test-concurrency-Explicitly-use-floor-division.patch vendored
View File

@ -7,7 +7,7 @@ semantics for division when the division feature is imported from the
future. future.
Signed-off-by: Simon McVittie <smcv@debian.org> Signed-off-by: Simon McVittie <smcv@debian.org>
Forwarded: https://github.com/ostreedev/ostree/pull/1457 Applied-upstream: 2018.3, commit:98b597b465a556f3ad5b16478d7edee3037fbd4d
--- ---
tests/test-concurrency.py | 9 +++++---- tests/test-concurrency.py | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-) 1 file changed, 5 insertions(+), 4 deletions(-)

2
debian/patches/test-concurrency-Replace-range-with-xrange.patch vendored
View File

@ -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. Python 2, it just uses a bit more memory.
Signed-off-by: Simon McVittie <smcv@debian.org> Signed-off-by: Simon McVittie <smcv@debian.org>
Forwarded: https://github.com/ostreedev/ostree/pull/1457 Applied-upstream: 2018.3, commit:02dc5e2dd47d1be0eb73d2f7e5b588f04c572390
--- ---
tests/test-concurrency.py | 10 +++++----- tests/test-concurrency.py | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-) 1 file changed, 5 insertions(+), 5 deletions(-)

2
debian/patches/test-concurrency-Use-Python-3-syntax-for-octal.patch vendored
View File

@ -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. This also works in Python 2.7, and is a little clearer.
Signed-off-by: Simon McVittie <smcv@debian.org> Signed-off-by: Simon McVittie <smcv@debian.org>
Forwarded: https://github.com/ostreedev/ostree/pull/1457 Applied-upstream: 2018.3, commit:9933de232304f47e2be09c72906cc5183d9bbfda
--- ---
tests/test-concurrency.py | 2 +- tests/test-concurrency.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-) 1 file changed, 1 insertion(+), 1 deletion(-)

2
debian/patches/tests-bootloader-entries-crosscheck-Use-Python-3-friendly.patch vendored
View File

@ -6,7 +6,7 @@ This is a little clearer than a strcmp()-style negative/zero/positive
return, and also works in Python 2. return, and also works in Python 2.
Signed-off-by: Simon McVittie <smcv@debian.org> Signed-off-by: Simon McVittie <smcv@debian.org>
Forwarded: https://github.com/ostreedev/ostree/pull/1457 Applied-upstream: 2018.3, commit:6cabeaed3f45c8f3e05fb5e1152bfa5b96a3bc79
--- ---
tests/bootloader-entries-crosscheck.py | 6 +++--- tests/bootloader-entries-crosscheck.py | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-) 1 file changed, 3 insertions(+), 3 deletions(-)