From de005a58e687b159faf1b50f4099f102e8be96fb Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Tue, 19 Sep 2017 10:37:36 +0100 Subject: [PATCH] Replace patch with the version applied upstream in 2017.12 --- debian/changelog | 6 ++++++ ...ts-Fix-JavaScript-tests-with-gjs-1.50.0.patch} | 15 +++++++++------ debian/patches/series | 2 +- 3 files changed, 16 insertions(+), 7 deletions(-) rename debian/patches/{Fix-JavaScript-tests-with-gjs-1.50.0.patch => 2017.12/tests-Fix-JavaScript-tests-with-gjs-1.50.0.patch} (74%) diff --git a/debian/changelog b/debian/changelog index 467cd3f9..8e7ba67e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +ostree (2017.11-2) UNRELEASED; urgency=medium + + * Replace patch with the version applied upstream in 2017.12 + + -- Simon McVittie Tue, 19 Sep 2017 10:37:12 +0100 + ostree (2017.11-1) unstable; urgency=medium * New upstream release diff --git a/debian/patches/Fix-JavaScript-tests-with-gjs-1.50.0.patch b/debian/patches/2017.12/tests-Fix-JavaScript-tests-with-gjs-1.50.0.patch similarity index 74% rename from debian/patches/Fix-JavaScript-tests-with-gjs-1.50.0.patch rename to debian/patches/2017.12/tests-Fix-JavaScript-tests-with-gjs-1.50.0.patch index f92ff12e..d909e61f 100644 --- a/debian/patches/Fix-JavaScript-tests-with-gjs-1.50.0.patch +++ b/debian/patches/2017.12/tests-Fix-JavaScript-tests-with-gjs-1.50.0.patch @@ -1,25 +1,28 @@ From: Simon McVittie Date: Fri, 15 Sep 2017 15:32:55 +0100 -Subject: Fix JavaScript tests with gjs 1.50.0 +Subject: tests: Fix JavaScript tests with gjs 1.50.0 In recent gjs, you can't declare a variable with "let" multiple times. Signed-off-by: Simon McVittie +Closes: #1178 +Approved by: cgwalters +Forwarded: https://github.com/ostreedev/ostree/pull/1178 +Applied-upstream: 2017.12, commit:1b430a776486d68be2d16a0ec53ad5512c604988 --- - tests/corrupt-repo-ref.js | 2 +- + tests/corrupt-repo-ref.js | 1 - tests/test-sysroot.js | 6 +++--- - 2 files changed, 4 insertions(+), 4 deletions(-) + 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/tests/corrupt-repo-ref.js b/tests/corrupt-repo-ref.js -index c5f2806..a2085f3 100755 +index c5f2806..bcde86b 100755 --- a/tests/corrupt-repo-ref.js +++ b/tests/corrupt-repo-ref.js -@@ -47,7 +47,7 @@ function listObjectChecksumsRecurse(dir, allObjects) { +@@ -47,7 +47,6 @@ function listObjectChecksumsRecurse(dir, allObjects) { e.close(null); } -let [,commit] = repo.resolve_rev(refToCorrupt, false); -+repo.resolve_rev(refToCorrupt, false); let [,root,commit] = repo.read_commit(refToCorrupt, null); let allObjects = {}; allObjects[commit + '.commit'] = true; diff --git a/debian/patches/series b/debian/patches/series index d3bc5c55..83f098ba 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1 @@ -Fix-JavaScript-tests-with-gjs-1.50.0.patch +2017.12/tests-Fix-JavaScript-tests-with-gjs-1.50.0.patch