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

Mark all patches as applied upstream for 2018.3 

This includes one that was previously considered to be Debian-specific
(moving to Python 3 for tests).
This commit is contained in:
Simon McVittie 2018-02-24 11:19:47 +00:00
parent b3fd20e518
commit bf27f50211
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
debian/changelog vendored
View File

@ -1,9 +1,8 @@
ostree (2018.2-2) UNRELEASED; urgency=medium ostree (2018.2-2) UNRELEASED; urgency=medium
* d/p/{debian/,}Use-Python-3-for-tests.patch: * Mark all patches as applied upstream for 2018.3, including one
Mark patch as forwarded. It was previously considered that was previously considered to be Debian-specific (moving to
Debian-specific, but upstream seem interested. Python 3 for tests)
* Mark all other patches as applied upstream for 2018.3
-- Simon McVittie <smcv@debian.org> Thu, 22 Feb 2018 22:55:11 +0000 -- Simon McVittie <smcv@debian.org> Thu, 22 Feb 2018 22:55:11 +0000

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

@ -3,7 +3,11 @@ 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>
Closes: #1463
Approved by: cgwalters
Forwarded: https://github.com/ostreedev/ostree/pull/1463 Forwarded: https://github.com/ostreedev/ostree/pull/1463
[smcv: Remove ci/* changes: those files are not in tarball releases]
Applied-upstream: 2018.3, commit:971265e4e48f2ff512633b27c90569315ff168ff
--- ---
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 +-