diff -Nru sbuild-0.85.0ubuntu1/debian/changelog sbuild-0.85.0ubuntu2/debian/changelog --- sbuild-0.85.0ubuntu1/debian/changelog 2023-01-18 13:06:24.000000000 +0000 +++ sbuild-0.85.0ubuntu2/debian/changelog 2023-03-29 15:18:02.000000000 +0100 @@ -1,7 +1,18 @@ +sbuild (0.85.0ubuntu2) lunar; urgency=medium + + * d/t/unshare: Updated test-pkg_1.0_all.deb content for zstd to match + output from zstd 1.5.4 + * d/t/control: Fix obsolete dependency on lsb-release (should now be + lsb-release-minimal) + * d/control: Fix obsolete dependency on lsb-base (should now be + sysvinit-utils) + * Bump standards version to 4.6.2 + + -- Dave Jones Wed, 29 Mar 2023 15:18:02 +0100 + sbuild (0.85.0ubuntu1) lunar; urgency=medium [ Dave Jones ] - * Merge from Debian unstable (LP: #2003201). Remaining changes: - Fix autopkgtest `unshare-qemuwrapper` on lunar-proposed - d/t/unshare-qemuwrapper: copy apt preferences into the vm's chroot. @@ -11,13 +22,11 @@ causing symlinks to files not ending in .dsc to no longer be buildable. - d/t/build-procenv: Make skippable when mknod fails, as in unprivileged container case (as Ubuntu's autopkgtest uses in the armhf case) - * Removed obsolete patches: - debian/tests/unshare: Run the test, but skip it if user namespaces are not supported - unshare test requires isolation-machine to execute [ Benjamin Drung ] - * d/t/get_default_release.py: Rely on VERSION_CODENAME from /etc/os-release on non-Debian systems if the variable is set. * d/t/check-unshare-support: Add a check for unshare support. If unshare is diff -Nru sbuild-0.85.0ubuntu1/debian/control sbuild-0.85.0ubuntu2/debian/control --- sbuild-0.85.0ubuntu1/debian/control 2023-01-18 13:06:24.000000000 +0000 +++ sbuild-0.85.0ubuntu2/debian/control 2023-03-29 15:18:02.000000000 +0100 @@ -19,7 +19,7 @@ libmime-lite-perl, libyaml-tiny-perl, python3-all -Standards-Version: 4.6.0 +Standards-Version: 4.6.2 Rules-Requires-Root: no Vcs-Browser: https://salsa.debian.org/debian/sbuild Vcs-Git: https://salsa.debian.org/debian/sbuild.git @@ -104,7 +104,7 @@ dupload, libsbuild-perl, libyaml-tiny-perl, - lsb-base (>= 3.0-6), + sysvinit-utils (>= 3.05-4~), sbuild (<< ${source:Version}.1~), sbuild (>= ${source:Version}), schroot, diff -Nru sbuild-0.85.0ubuntu1/debian/tests/control sbuild-0.85.0ubuntu2/debian/tests/control --- sbuild-0.85.0ubuntu1/debian/tests/control 2023-01-18 13:06:24.000000000 +0000 +++ sbuild-0.85.0ubuntu2/debian/tests/control 2023-03-29 15:18:02.000000000 +0100 @@ -1,5 +1,5 @@ Tests: build-procenv -Depends: apt (>= 1.1~exp2), apt-utils, debootstrap, distro-info, lsb-release, @ +Depends: apt (>= 1.1~exp2), apt-utils, debootstrap, distro-info, lsb-release-minimal, @ Restrictions: needs-root skippable Tests: unshare diff -Nru sbuild-0.85.0ubuntu1/debian/tests/unshare sbuild-0.85.0ubuntu2/debian/tests/unshare --- sbuild-0.85.0ubuntu1/debian/tests/unshare 2023-01-18 13:06:24.000000000 +0000 +++ sbuild-0.85.0ubuntu2/debian/tests/unshare 2023-03-29 15:17:42.000000000 +0100 @@ -82,15 +82,15 @@ cat << END | base64 -d > "${AUTOPKGTEST_TMP}/expected" ITxhcmNoPgpkZWJpYW4tYmluYXJ5ICAgMTQ2NzMxMDUxMiAgMCAgICAgMCAgICAgMTAwNjQ0ICA0 ICAgICAgICAgYAoyLjAKY29udHJvbC50YXIuenN0IDE0NjczMTA1MTIgIDAgICAgIDAgICAgIDEw -MDY0NCAgMzUzICAgICAgIGAKKLUv/QBoxQoARhM8I0CJOAcb48sCWwjai6bSHX+FHGgAleqQ7Qv9 -Vh+TxyhuursDNAA0ADEAHbUP6ZSPlgvla0kklqVxGoXCecsNtyGS1bu8fs6O1Wq+FOZ5HEdxmCbx -MMtSVtM8ykIkAYyDpB2hAROYeBOYLlIpidRAwCPk0nNVFA+xNnR5wN5LrrppO0djAqYkyyG4LrIm -sOlBHQLbZ9L1kY3nHe0UDhA1LsUV9Qm6ibfxfHQOhLM7blEL2EtqDzG043W8YFPFYMwhbXABiyWN -vUaoEXKY7axSKl87WS9oX1+U1cvIX1bd8grZ+LitI+qeRt+G7r1THe0BKSCAZsaKFwOHAnO/Y4GM -gAIBDCtw5x2uGDPaChGsyIVKxs5Sh1w5mIL1OjNKY+M7NlYpw8Jc1gtIDkHYPtptOJOCbkDqDGiw -1Kjs3OJ4QJM8TXcwWGN/AMn35Y6FJAhTAeaTcwMKZGF0YS50YXIuenN0ICAgIDE0NjczMTA1MTIg -IDAgICAgIDAgICAgIDEwMDY0NCAgNzcgICAgICAgIGAKKLUv/QBoJQIAlAIuLwAwNzU1ADAAMTI3 -MzUyNjA2Njc3MjAAIDUAdXN0YXIgIAByb290AAogIDH1zwYcBgzI/sCTr+VhgQQwBTCfhBsK +MDY0NCAgMzUwICAgICAgIGAKKLUv/WQAJ4UKAGaUPR8wr3OfaHLzW/rmP8HOkcTnBovOY5D8n9NV +ChqKoIoEOAA2ADMAzopgga7cn9jayFtG8+YMBo4DRRCBEMVJW84nYFrPSdtPt2vWoLfmkaQoaqIH +GkiP05oGQVLTBEwTX2AjUHGM21UqnMGik5ELKa6Yih0Kr5JXEWZU/US5JdyFi3E/Mc36ccPrUYRr +GOeTnLBSfgS9fL3PvqvOkYV8fzWkHFC5Toxm2C0JLToh31d4Oe4O6auccHGx+cnSkE5IGc7K+nHD +PQ/NMZB5rpIrR1Zyue+Uq2V6vvq9V991hfscqc3iTh4367dnyayv8/WEYWTqsyWMDyMgoGbE6BwD +hwLivu4QntW4sszQa2iwIhcqWTtLH3LhYBas18yojQ3csbdKAYvwL9k62jmcZUHtgA22GpVdWRwP +aJJn6A4Gq+wPmHxdflhYgjAFMJ+wG3l8cGxkYXRhLnRhci56c3QgICAgMTQ2NzMxMDUxMiAgMCAg +ICAgMCAgICAgMTAwNjQ0ICA3OSAgICAgICAgYAootS/9ZAAnDQIA0sIJEMCnA7Qs/x3bV/QmIfh6 +PwWjUsxVhqCTvrqW2V7Eot1IE/e77AEECSCQmwfPBhwGBrB/kHoYkACmAPOJugHP3myvCg== END ;; *)