From 68c09bc831a9ad85d90d25d70467f3237c9406d7 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Sun, 14 Apr 2024 15:47:32 +0200
Subject: Merging debian version 0.85.7.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 debian/changelog | 19 +++++++++++++++++++
 debian/control   |  3 ++-
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 63a6aee..358f631 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,22 @@
+sbuild (0.85.7) unstable; urgency=medium
+
+  [ Santiago Ruano Rincón ]
+  * Remove deprecation note about the sudo chroot mode
+
+  [ Christian Kastner ]
+  * sbuild-qemu: Use 4M OVMF images if available
+
+  [ Jochen Sprickerhof ]
+  * Add --{no-,}enable-network and ENABLE_NETWORK options
+  * Unshare: use dumb-init for build
+  * Run post-build-failed-commands before cleanup
+  * Add myself to uploaders
+
+  [ Boyuan Yang ]
+  * "directory" is available for "--extra-package" (Closes: #1040978)
+
+ -- Jochen Sprickerhof <jspricke@debian.org>  Fri, 12 Apr 2024 18:50:09 +0200
+
 sbuild (0.85.6-0.0~progress7.99u1) graograman-backports; urgency=medium
 
   * Initial reupload to graograman-backports.
diff --git a/debian/control b/debian/control
index aa6f281..2251636 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,8 @@ XSBC-Original-Uploaders: Johannes Schauer Marin Rodrigues <josch@debian.org>,
            Francesco Paolo Lovergine <frankie@debian.org>,
            Wookey <wookey@debian.org>,
            Michael Stapelberg <stapelberg@debian.org>,
-           Christian Kastner <ckk@debian.org>
+           Christian Kastner <ckk@debian.org>,
+           Jochen Sprickerhof <jspricke@debian.org>,
 Bugs: mailto:maintainers@lists.progress-linux.org
 Build-Depends: debhelper-compat (= 13)
 Build-Depends-Indep: dh-python,
-- 
cgit v1.2.3