From e48d27b4e73e31e9a118b17277784e47b844a5b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luis=20Guzm=C3=A1n?= Date: Mon, 28 Apr 2025 21:18:36 +0000 Subject: [PATCH] gnupg2: lower dependency of gpg-wks-server from desktop environment --- ...r_dependency_to_match_later_releases.patch | 35 +++++++++++++++++++ helpers/make-gnupg2 | 3 +- 2 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 helpers/DATA/gnupg2/001-reduce_gpg-wks-server_dependency_to_match_later_releases.patch diff --git a/helpers/DATA/gnupg2/001-reduce_gpg-wks-server_dependency_to_match_later_releases.patch b/helpers/DATA/gnupg2/001-reduce_gpg-wks-server_dependency_to_match_later_releases.patch new file mode 100644 index 0000000..b53a6d4 --- /dev/null +++ b/helpers/DATA/gnupg2/001-reduce_gpg-wks-server_dependency_to_match_later_releases.patch @@ -0,0 +1,35 @@ +diff --git a/debian/control b/debian/control +index c6a9778..ca0b1f0 100644 +--- a/debian/control ++++ b/debian/control +@@ -254,8 +254,6 @@ Depends: + gpg-agent (>= ${source:Version}), + gpg-wks-client (<< ${source:Version}.1~), + gpg-wks-client (>= ${source:Version}), +- gpg-wks-server (<< ${source:Version}.1~), +- gpg-wks-server (>= ${source:Version}), + gpgsm (<< ${source:Version}.1~), + gpgsm (>= ${source:Version}), + gpgv (<< ${source:Version}.1~), +@@ -265,6 +263,8 @@ Depends: + Recommends: + ${shlibs:Recommends}, + Suggests: ++ gpg-wks-server (<< ${source:Version}.1~), ++ gpg-wks-server (>= ${source:Version}), + parcimonie, + xloadimage, + Breaks: +diff --git a/debian/control b/debian/control +index ca0b1f0..dc1d5cd 100644 +--- a/debian/control ++++ b/debian/control +@@ -279,6 +279,8 @@ Breaks: + python-apt (<= 1.1.0~beta4), + python-gnupg (<< 0.3.8-3), + python3-apt (<= 1.1.0~beta4), ++Conflicts: ++ gpg-wks-server (<= 2.2.27-3ubuntu2.3+11.0trisquel0), + Replaces: + gnupg2 (<< 2.1.11-7+exp1), + Description: GNU privacy guard - a free PGP replacement diff --git a/helpers/make-gnupg2 b/helpers/make-gnupg2 index 5523cb8..ff522b3 100644 --- a/helpers/make-gnupg2 +++ b/helpers/make-gnupg2 @@ -23,10 +23,11 @@ # such packages from Debian in order to build the required udeb packages. ## -VERSION=0 +VERSION=1 NETINST=true . ./config +patch_p1 $DATA/001-reduce_gpg-wks-server_dependency_to_match_later_releases.patch changelog "Fetch and build as udeb dependency for debian-installer." package