From d0e6bd9bb7a04b44f83cdf601a7480ecf38b7420 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Sat, 23 Jun 2018 16:43:51 +0100 Subject: [PATCH] Mark patch as applied upstream --- debian/changelog | 2 +- ...hi-Fail-immediately-if-we-can-t-talk-to-D-Bus-or-Avahi.patch | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 4ba2c877..ad187f6b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,7 @@ ostree (2018.6-3) UNRELEASED; urgency=medium * d/p/avahi-Fail-immediately-if-we-can-t-talk-to-D-Bus-or-Avahi.patch: - Mark as forwarded + Mark as applied upstream -- Simon McVittie Sat, 23 Jun 2018 13:15:28 +0100 diff --git a/debian/patches/avahi-Fail-immediately-if-we-can-t-talk-to-D-Bus-or-Avahi.patch b/debian/patches/avahi-Fail-immediately-if-we-can-t-talk-to-D-Bus-or-Avahi.patch index b4c9d389..a6559ca3 100644 --- a/debian/patches/avahi-Fail-immediately-if-we-can-t-talk-to-D-Bus-or-Avahi.patch +++ b/debian/patches/avahi-Fail-immediately-if-we-can-t-talk-to-D-Bus-or-Avahi.patch @@ -10,6 +10,7 @@ when we try to use the client. Bug: https://github.com/ostreedev/ostree/issues/1618 Signed-off-by: Simon McVittie Forwarded: https://github.com/ostreedev/ostree/pull/1639 +Applied-upstream: 2018.7, commit:https://github.com/ostreedev/ostree/commit/e120a6b1198aaa785533c76316898f15a804dae1 --- src/libostree/ostree-repo-finder-avahi.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)