From: Peter Michael Green Date: Thu, 27 Jan 2022 09:09:31 +0000 (+0000) Subject: Manual merge of version 1:1.44.1-5+rpi1 and 1:1.46.2-4 to produce 1:1.46.2-4+rpi1 X-Git-Tag: archive/raspbian/1%1.46.2-4+rpi1~1 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=f40fdbc31825aeeeb80f4cc13a02ec16c9bb0a4b;p=libguestfs.git Manual merge of version 1:1.44.1-5+rpi1 and 1:1.46.2-4 to produce 1:1.46.2-4+rpi1 --- f40fdbc31825aeeeb80f4cc13a02ec16c9bb0a4b diff --cc debian/changelog index 44125102,d390599c..795b0123 --- a/debian/changelog +++ b/debian/changelog @@@ -1,11 -1,54 +1,63 @@@ - libguestfs (1:1.44.1-5+rpi1) bookworm-staging; urgency=medium ++libguestfs (1:1.46.2-4+rpi1) bookworm-staging; urgency=medium + + [changes brought forward from 1:1.42.0-11+rpi1 by Peter Michael Green 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. + - -- Raspbian forward porter Tue, 28 Sep 2021 22:01:51 +0000 ++ -- Raspbian forward porter Wed, 26 Jan 2022 06:35:33 +0000 ++ + libguestfs (1:1.46.2-4) unstable; urgency=medium + + * Bump Standards-Version, DH compat level, don't require root for build + * Remove grub-pc build-dependency (=libguestfs0 runtime dependency) + Closes: #1002893 + + -- Hilko Bengen Sat, 01 Jan 2022 18:32:00 +0100 + + libguestfs (1:1.46.2-3) unstable; urgency=medium + + * Add: grub-pc build-dependency + * Add patch to set CPU type on riscv64 + + -- Hilko Bengen Thu, 30 Dec 2021 21:07:04 +0100 + + libguestfs (1:1.46.2-2) unstable; urgency=medium + + * Switch to exfatprogs (Closes: #992286) + * Update build dependencies for appliance + * Rework patches + * Determine Python3 versions using py3versions --supported (Lintian) + + -- Hilko Bengen Mon, 27 Dec 2021 01:55:09 +0100 + + libguestfs (1:1.46.2-1) unstable; urgency=medium + + * New upstream version 1.46.2 + * Some virt-* programs are now part of guestfs-tools (different soruce + package) + * Update patches + * Update build-dependencies, replace genisoimage with xorriso + (Closes: #982234) + * Put guestfish, guestmount into separate packages again + + -- Hilko Bengen Sat, 25 Dec 2021 02:17:59 +0100 + + libguestfs (1:1.44.2-1.1) unstable; urgency=medium + + * Non-maintainer upload. + * debian/rules: use the appropriate way to get the Ruby versions to build + for (Closes: #998636) + + -- Antonio Terceiro Sat, 04 Dec 2021 12:11:35 -0300 + + libguestfs (1:1.44.2-1) unstable; urgency=medium + + * New upstream version 1.44.2 + * Use PCRE2 instead of PCRE + * Update patches, drop number prefixes + + -- Hilko Bengen Sat, 25 Sep 2021 17:51:52 +0200 libguestfs (1:1.44.1-5) unstable; urgency=medium diff --cc debian/patches/series index 60ba1a9d,bec672b3..0701d937 --- a/debian/patches/series +++ b/debian/patches/series @@@ -1,24 -1,19 +1,20 @@@ - 0001-perl-Fix-out-of-tree-build-by-generating-symlinks.patch - 0002-golang-Fix-for-out-of-tree-builds.patch - 0003-Do-not-use-DTB-for-armel.patch - 0004-Generate-tarballs-for-supermin-appliance-using-repro.patch - 0005-Run-gzip-inside-of-tar-zcf-with-n.patch - 0006-Make-php-buildable-with-builddir-srcdir.patch - 0009-Fix-sbin-reboot-requirements.patch - 0010-Add-fdisk-to-appliance-list.patch - 0013-Add-libtinfo-to-guestfsd-fixes-FTBFS-on-architecture.patch - 0013-Fix-up-perl-path-in-installed-scripts.patch - 0015-Change-cryptsetop-cryptsetup-bin-in-appliance.patch - 0016-Properly-handle-autogenerated-config.ml-files-in-bui.patch - 0017-python-Recognize-python-X.Y-embed-flavor-introduced-.patch - 0018-Link-.mli-files-corresponding-to-autorgenerated-.ml-.patch - 0016-Check-for-caml_alloc_initialized_string-existence-ev.patch - 0017-Make-sure-that-generated-ocaml-link.sh-is-used-in-ou.patch - 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 - 0020-Update-packagelist-as-haxdump-has-been-moved-to-bsde.patch - 0021-appliance-Fix-searching-for-shared-libraries-on-usr-.patch - 0022-launch-board-model-for-RISC-V.patch - 0023-golang-Fix-bindings-for-golang-1.16.patch + perl-Fix-out-of-tree-build-by-generating-symlinks.patch + Do-not-use-DTB-for-armel.patch + Generate-tarballs-for-supermin-appliance-using-reproducib.patch + Run-gzip-inside-of-tar-zcf-with-n.patch + Make-php-buildable-with-builddir-srcdir.patch + Fix-sbin-reboot-requirements.patch + Add-fdisk-to-appliance-list.patch + Add-libtinfo-to-guestfsd-fixes-FTBFS-on-architectures-tha.patch + Fix-up-perl-path-in-installed-scripts.patch + Change-cryptsetop-cryptsetup-bin-in-appliance.patch + Properly-handle-autogenerated-config.ml-files-in-builddir.patch + python-Recognize-python-X.Y-embed-flavor-introduced-with-.patch + Link-.mli-files-corresponding-to-autorgenerated-.ml-files.patch + Check-for-caml_alloc_initialized_string-existence-even-if.patch + Make-sure-that-generated-ocaml-link.sh-is-used-in-out-of-.patch + 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 diff --cc m4/guestfs-appliance.m4 index b0bd9795,db67c691..0bbdd7b9 --- a/m4/guestfs-appliance.m4 +++ b/m4/guestfs-appliance.m4 @@@ -114,16 -115,16 +115,16 @@@ AC_ARG_WITH([distro] AC_MSG_ERROR([/etc/os-release not available, please specify the distro using --with-distro=DISTRO]) fi ] - AM_CONDITIONAL([HAVE_RPM], - [AS_CASE([$DISTRO], [REDHAT | SUSE | OPENMANDRIVA | MAGEIA ], [true], - [*], [false])]) - AM_CONDITIONAL([HAVE_DPKG], - [AS_CASE([$DISTRO], [DEBIAN | UBUNTU | RASPBIAN ], [true], - [*], [false])]) - AM_CONDITIONAL([HAVE_PACMAN], - [AS_CASE([$DISTRO], [ARCHLINUX | FRUGALWARE ], [true], - [*], [false])]) ) + 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], + [*], [false])]) AC_SUBST([DISTRO]) dnl Add extra packages to the appliance.