From d1a9c2ccc05c0d64dba1342d2b121c265d0786d7 Mon Sep 17 00:00:00 2001 From: Peter Michael Green Date: Fri, 15 Jan 2021 10:23:06 +0000 Subject: [PATCH] Commit Debian 3.0 (quilt) metadata [dgit (9.12) quilt-fixup] --- ...1c96e44282e63413b3555bcef626c3a-1610706180 | 40 +++++++++++++++++++ debian/patches/series | 1 + 2 files changed, 41 insertions(+) create mode 100644 debian/patches/auto-1:1.44.0-1+rpi1-4b5577a431c96e44282e63413b3555bcef626c3a-1610706180 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 new file mode 100644 index 00000000..aaa04aef --- /dev/null +++ b/debian/patches/auto-1:1.44.0-1+rpi1-4b5577a431c96e44282e63413b3555bcef626c3a-1610706180 @@ -0,0 +1,40 @@ +From: Peter Michael Green +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 +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 +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 +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/series b/debian/patches/series index ed8589fa..99945458 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -17,3 +17,4 @@ 0018-Fix-documentation-generation-for-out-of-tree-builds.patch 0019-Add-support-for-YARA-4.patch 0019-Fix-out-of-tree-build-for-po.patch +auto-1:1.44.0-1+rpi1-4b5577a431c96e44282e63413b3555bcef626c3a-1610706180 -- 2.30.2