From: Peter Michael Green <plugwash@raspbian.org>
Date: Tue, 29 Mar 2022 19:15:22 +0000 (+0000)
Subject: Manual merge of version 1.46.1-4+rpi1 and 1.48.0-1 to produce 1.48.0-1+rpi1
X-Git-Tag: archive/raspbian/1.48.0-1+rpi1^0
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=772417f1b5802b5b594e59d15a8dfc6f6d15dba5;p=guestfs-tools.git

Manual merge of version 1.46.1-4+rpi1 and 1.48.0-1 to produce 1.48.0-1+rpi1
---

772417f1b5802b5b594e59d15a8dfc6f6d15dba5
diff --cc debian/changelog
index 8776ddb,2099a75..e17c544
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,8 -1,10 +1,17 @@@
- guestfs-tools (1.46.1-4+rpi1) bookworm-staging; urgency=medium
++guestfs-tools (1.48.0-1+rpi1) bookworm-staging; urgency=medium
 +
++  [changes brought forward from 1.46.1-4+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Fri, 28 Jan 2022 00:01:59 +0000]
 +  * Disable testsuite and remove test-only build-dependencies.
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Fri, 28 Jan 2022 00:01:59 +0000
++ -- Peter Michael Green <plugwash@raspbian.org>  Tue, 29 Mar 2022 19:14:39 +0000
++
+ guestfs-tools (1.48.0-1) unstable; urgency=medium
+ 
+   * New upstream version 1.48.0
+   * Run tests on more architectures: ppc64el, s390x
+   * Fix watch file
+ 
+  -- Hilko Bengen <bengen@debian.org>  Tue, 15 Mar 2022 11:10:37 +0100
  
  guestfs-tools (1.46.1-4) unstable; urgency=medium