From d4b413a6997c6bf3530428e52993769cdca7e4e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dylan=20A=C3=AFssi?= <dylan.aissi@collabora.com> Date: Thu, 31 Oct 2024 15:47:26 +0100 Subject: [PATCH 1/2] ci-buildpackage: drop the use of wrap-and-sort MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This was a workaround for odd nodes packages that apt was not able to parse. See https://gitlab.apertis.org/infrastructure/apertis-docker-images/-/commit/e954d2be4e0e2b451f8da2bbd8d57afc5be58895 This is no longer required since it was fixed in apt: https://salsa.debian.org/apt-team/apt/-/merge_requests/167 Having this workaround leads to other apt failures to resolve dependencies (because of conflicts between rustc and rustc-web). Signed-off-by: Dylan Aïssi <dylan.aissi@collabora.com> --- tools/ci-buildpackage | 6 ------ 1 file changed, 6 deletions(-) diff --git a/tools/ci-buildpackage b/tools/ci-buildpackage index 465e175..970fdc8 100755 --- a/tools/ci-buildpackage +++ b/tools/ci-buildpackage @@ -11,17 +11,11 @@ set -ex export DEBIAN_FRONTEND=noninteractive -# Works around node-* packages having Build-Depends apt can't parse -wrap-and-sort -f debian/control - apt-get -qy update apt-get -qy -o APT::Get::Build-Dep-Automatic=yes \ -o Acquire::http::Pipeline-Depth=0 \ build-dep "$(pwd)" -# Revert changes made by `wrap-and-sort` -git checkout debian/ - dpkg-checkbuilddeps dversion="$(dpkg-parsechangelog -S Version)" -- GitLab From ea9987f3c962ecced686f816da249243964e81a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dylan=20A=C3=AFssi?= <dylan.aissi@collabora.com> Date: Wed, 15 Jan 2025 18:23:04 +0100 Subject: [PATCH 2/2] Release apertis-dev-tools version 0.2024.18 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Dylan Aïssi <dylan.aissi@collabora.com> --- debian/changelog | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/debian/changelog b/debian/changelog index 8d384c1..7e4b9b6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +apertis-dev-tools (0.2024.18) apertis; urgency=medium + + * ci-buildpackage: drop the use of wrap-and-sort. + This was a workaround for odd nodes packages that apt was not able + to parse. This is no longer required since it was fixed in apt 2.3.10. + Moreover, this workaround leads to other apt failures to resolve + dependencies (because of conflicts between rustc and rustc-web). + + -- Dylan Aïssi <dylan.aissi@collabora.com> Wed, 15 Jan 2025 18:21:42 +0100 + apertis-dev-tools (0.2024.17) apertis; urgency=medium * apertis-pkg-merge-local: Add new tool. -- GitLab