From: Peter Michael Green <plugwash@raspbian.org>
Date: Sat, 1 Feb 2025 16:47:08 +0000 (+0000)
Subject: Manual merge of version 1:1.52.2-5+rpi1 and 1:1.52.2-7 to produce 1:1.52.2-7+rpi1
X-Git-Tag: archive/raspbian/1%1.52.2-7+rpi1~2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=66f183469cb1c280ca753678c8dd270f9d319888;p=libguestfs.git

Manual merge of version 1:1.52.2-5+rpi1 and 1:1.52.2-7 to produce 1:1.52.2-7+rpi1
---

66f183469cb1c280ca753678c8dd270f9d319888
diff --cc debian/changelog
index c2835830,d62f3138..7497bdd9
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,18 -1,16 +1,32 @@@
- libguestfs (1:1.52.2-5+rpi1) trixie-staging; urgency=medium
++libguestfs (1:1.52.2-7+rpi1) trixie-staging; urgency=medium
 +
 +  [changes brought forward from 1:1.42.0-11+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Thu, 12 Nov 2020 16:03:00 +0000]
 +  * Add raspbian to the list of distros with dpkg.
 +  * Disable dh_missing
 +  * Partiall fix clean target.
 +
 +  [changes introduced in 1:1.46.2-11+rpi1 by Peter Michael Green]
 +  * Remove testsuite-specific build-dependencies.
 +  * Disable testsuite.
 +
 +  [changes introduced in 1:1.50.1-4+rpi1 by Peter Michael Green]
 +  * Add build-conflicts on rustc.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Wed, 06 Nov 2024 08:40:49 +0000
++ -- Peter Michael Green <plugwash@raspbian.org>  Sat, 01 Feb 2025 16:46:24 +0000
++
+ libguestfs (1:1.52.2-7) unstable; urgency=medium
+ 
+   * Add build support for loongarch64.
+     Thanks to Dandan Zhang (Closes: #1090732)
+ 
+  -- Hilko Bengen <bengen@debian.org>  Tue, 24 Dec 2024 12:46:25 +0100
+ 
+ libguestfs (1:1.52.2-6) unstable; urgency=medium
+ 
+   [ Chris Hofstaedtler ]
+   * Stop running quickcheck on i386 (Closes: #1085438)
+ 
+  -- Hilko Bengen <bengen@debian.org>  Sun, 10 Nov 2024 17:55:58 +0100
  
  libguestfs (1:1.52.2-5) unstable; urgency=medium
  
diff --cc debian/control
index 0e693ad4,75dea694..60e09ded
--- a/debian/control
+++ b/debian/control
@@@ -54,6 -54,14 +55,8 @@@ Build-Depends: dpkg-dev (>= 1.22.5), de
    flex, bison,
    golang-go [i386 amd64 armel armhf arm64 mips mipsel mips64el ppc64el],
    dh-php, php-all-dev | php5-dev,
+ # for testing (make quickcheck)
 -  linux-image-amd64 [amd64] <!nocheck>,
 -  linux-image-armmp [armhf] <!nocheck>,
 -  linux-image-arm64 [arm64] <!nocheck>,
 -  linux-image-powerpc64le [ppc64el] <!nocheck>,
 -  linux-image-riscv64 [riscv64] <!nocheck>,
 -  linux-image-s390x [s390x] <!nocheck>,
+   linux-image-loong64 [loong64] <!nocheck>,
  #-# appliance start
    acl,
    attr,