Update debian/patches for new upstream.

diff --git a/debian/changelog b/debian/changelog
index 795b0123f900d16ec923a4383fa9858c35b0ceb4..2ec541dc981ca18bb9dd429b9d941a5581569a96 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,7 +5,7 @@ libguestfs (1:1.46.2-4+rpi1) bookworm-staging; urgency=medium
   * Disable dh_missing
   * Partiall fix clean target.
 
- -- Raspbian forward porter <root@raspbian.org>  Wed, 26 Jan 2022 06:35:33 +0000
+ -- Peter Michael Green <plugwash@raspbian.org>  Wed, 26 Jan 2022 06:35:33 +0000
 
 libguestfs (1:1.46.2-4) unstable; urgency=medium
 

diff --git a/debian/patches/auto-1:1.44.0-1+rpi1-4b5577a431c96e44282e63413b3555bcef626c3a-1610706180 b/debian/patches/auto-1:1.44.0-1+rpi1-4b5577a431c96e44282e63413b3555bcef626c3a-1610706180
deleted file mode 100644 (file)
index aaa04ae..0000000
--- a/debian/patches/auto-1:1.44.0-1+rpi1-4b5577a431c96e44282e63413b3555bcef626c3a-1610706180
+++ /dev/null
@@ -1,40 +0,0 @@
-From: Peter Michael Green <plugwash@raspbian.org>
-Subject: Automatically generated patch (1:1.44.0-1+rpi1)
-
-Last (up to) 3 git changes, FYI:
-
-commit 4b5577a431c96e44282e63413b3555bcef626c3a
-Merge: c0a5932a ff2897d1
-Author: Peter Michael Green <plugwash@raspbian.org>
-Date:   Fri Jan 15 10:17:15 2021 +0000
-
-    Manual merge of version 1:1.42.0-11+rpi1 and 1:1.44.0-1 to produce 1:1.44.0-1+rpi1
-
-commit ff2897d1c2df028404138d0a5c185b1165599e58
-Merge: d179bba8 e29e9caa
-Author: Hilko Bengen <bengen@debian.org>
-Date:   Sun Jan 10 12:25:43 2021 +0000
-
-    Merge libguestfs (1:1.44.0-1) import into refs/heads/workingbranch
-
-commit d179bba82616b6cb82a0ffb96ebb4c7100414f9d
-Author: Hilko Bengen <bengen@debian.org>
-Date:   Sun Jan 10 02:33:22 2021 +0100
-
-    Fix out-of-tree build for po/*
-    
-    
-    Gbp-Pq: Name 0019-Fix-out-of-tree-build-for-po.patch
----
-
---- libguestfs-1.44.0.orig/m4/guestfs-appliance.m4
-+++ libguestfs-1.44.0/m4/guestfs-appliance.m4
-@@ -118,7 +118,7 @@ AC_ARG_WITH([distro],
-         [AS_CASE([$DISTRO], [REDHAT | SUSE | OPENMANDRIVA | MAGEIA ], [true],
-                             [*], [false])])
-     AM_CONDITIONAL([HAVE_DPKG],
--        [AS_CASE([$DISTRO], [DEBIAN | UBUNTU ], [true],
-+        [AS_CASE([$DISTRO], [DEBIAN | UBUNTU | RASPBIAN ], [true],
-                             [*], [false])])
-     AM_CONDITIONAL([HAVE_PACMAN],
-         [AS_CASE([$DISTRO], [ARCHLINUX | FRUGALWARE ], [true],

diff --git a/debian/patches/recognise-raspbian.diff b/debian/patches/recognise-raspbian.diff
new file mode 100644 (file)
index 0000000..8c09a1d
--- /dev/null
+++ b/debian/patches/recognise-raspbian.diff
@@ -0,0 +1,11 @@
+--- libguestfs-1.46.2.orig/m4/guestfs-appliance.m4
++++ libguestfs-1.46.2/m4/guestfs-appliance.m4
+@@ -120,7 +120,7 @@ AM_CONDITIONAL([HAVE_RPM],
+     [AS_CASE([$DISTRO], [REDHAT | SUSE | OPENMANDRIVA | MAGEIA ], [true],
+                         [*], [false])])
+ AM_CONDITIONAL([HAVE_DPKG],
+-    [AS_CASE([$DISTRO], [DEBIAN | UBUNTU ], [true],
++    [AS_CASE([$DISTRO], [DEBIAN | UBUNTU | RASPBIAN ], [true],
+                         [*], [false])])
+ AM_CONDITIONAL([HAVE_PACMAN],
+     [AS_CASE([$DISTRO], [ARCHLINUX | FRUGALWARE ], [true],

diff --git a/debian/patches/series b/debian/patches/series
index 0701d937fe551fd49ded432894c4f95a5db2f8e4..1749f678f708987fa58fbe738647aa9c9d59a11e 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -17,4 +17,4 @@ Fix-out-of-tree-build-for-po.patch
 Update-packagelist-as-haxdump-has-been-moved-to-bsdextrau.patch
 Fix-golang-bindtest-and-check-mli.sh-for-out-of-tree-buil.patch
 Set-special-CPU-type-on-RISCV64.patch
-auto-1:1.44.0-1+rpi1-4b5577a431c96e44282e63413b3555bcef626c3a-1610706180
+recognise-raspbian.diff