From 55b9193452de04f336b72a98d9d9240e28135d88 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dylan=20A=C3=AFssi?= <dylan.aissi@collabora.com>
Date: Tue, 4 Feb 2025 09:57:29 +0100
Subject: [PATCH] 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
infrastructure/apertis-docker-images@e954d2be

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>
---
 package-source-builder/overlay/usr/bin/ci-buildpackage | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/package-source-builder/overlay/usr/bin/ci-buildpackage b/package-source-builder/overlay/usr/bin/ci-buildpackage
index 465e175..970fdc8 100755
--- a/package-source-builder/overlay/usr/bin/ci-buildpackage
+++ b/package-source-builder/overlay/usr/bin/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