diff --git a/debian/changelog b/debian/changelog index 8bc06ba3..bd2be187 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +ostree (2017.15-2) UNRELEASED; urgency=medium + + * d/p/2018.1/tests-Don-t-assume-uid-primary-gid.patch: Mark as applied + upstream in 2018.1 + + -- Simon McVittie Thu, 04 Jan 2018 12:58:50 +0000 + ostree (2017.15-1) unstable; urgency=medium * New upstream release diff --git a/debian/patches/tests-Don-t-assume-uid-primary-gid.patch b/debian/patches/2018.1/tests-Don-t-assume-uid-primary-gid.patch similarity index 94% rename from debian/patches/tests-Don-t-assume-uid-primary-gid.patch rename to debian/patches/2018.1/tests-Don-t-assume-uid-primary-gid.patch index 25c1bdbc..299c5584 100644 --- a/debian/patches/tests-Don-t-assume-uid-primary-gid.patch +++ b/debian/patches/2018.1/tests-Don-t-assume-uid-primary-gid.patch @@ -9,6 +9,7 @@ range was created without a corresponding group or vice versa. Signed-off-by: Simon McVittie Forwarded: https://github.com/ostreedev/ostree/pull/1390 +Applied-upstream: 2018.1, commit:https://github.com/ostreedev/ostree/commit/f63e62fbd272edbdd9695a10d841fc6b5eb69df8 --- tests/test-basic-user.sh | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/debian/patches/series b/debian/patches/series index 555b640c..c5896f0c 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1 @@ -tests-Don-t-assume-uid-primary-gid.patch +2018.1/tests-Don-t-assume-uid-primary-gid.patch