diff -pruN 2.4.7-17/debian/changelog 2.4.7-17ubuntu3/debian/changelog
--- 2.4.7-17/debian/changelog	2025-04-28 16:13:47.000000000 +0000
+++ 2.4.7-17ubuntu3/debian/changelog	2025-05-09 19:07:52.000000000 +0000
@@ -1,3 +1,42 @@
+gnupg2 (2.4.7-17ubuntu3) questing; urgency=medium
+
+  * Do not build tpm2daemon on i386
+
+ -- Julian Andres Klode <juliank@ubuntu.com>  Fri, 09 May 2025 21:07:52 +0200
+
+gnupg2 (2.4.7-17ubuntu2) questing; urgency=medium
+
+  * Disable swtpm, libss2-dev build-dep on i386
+
+ -- Julian Andres Klode <juliank@ubuntu.com>  Fri, 09 May 2025 20:15:39 +0200
+
+gnupg2 (2.4.7-17ubuntu1) questing; urgency=medium
+
+  * Merge with Debian unstable. Remaining changes:
+    - Honor http_proxy= environment variables by default in the systemd user
+      session dirmngr service
+    - Stop building gpg-wks-server, gpg-wks-client on i386
+    - gnupg: Demote gnupg-l10n to Recommends
+    - Demote all Recommends: gnupg to Suggests
+    - Demote gpg-wks-client to Recommends instead
+    - gpg{,sm}: Recommend gpg-agent, dirmngr
+    - Don't build the gpgv-win32 package which only debian-installer uses
+  * Dropped changes, merged in Debian:
+    - Cherry-pick Debian commit on git c4d2593b178de88ce22004d78a116f977f9bc5d6
+    - revert-rfc4880bis.patch; Debian imported more elaborate freepg patchset
+    - Dropped build dependencies for t64 rebuilds; those have been dealt with
+      using build profiles in Debian.
+    - Do not use keyboxd by default (merged in Debian)
+    - Suggest keyboxd, keyboxd is now in the gpg package.
+    - debian/migrate-pubring-from-classic-gpg: Add 2.4 to allowlist
+    - d/tests/simple-tests: Use RSA keys for now.
+  * Dropped changes, merged upstream:
+    - CVE-2025-30258 security patchews
+    - FTBFS fixes, all applied upstream
+    - The --assert-pubkey_algo feature patch
+
+ -- Julian Andres Klode <juliank@ubuntu.com>  Fri, 09 May 2025 19:31:41 +0200
+
 gnupg2 (2.4.7-17) unstable; urgency=medium
 
   * re-enable piuparts in salsa-ci, keyboxd package is no more.
@@ -284,6 +323,174 @@ gnupg2 (2.4.4-3) experimental; urgency=l
 
  -- Andreas Metzler <ametzler@debian.org>  Sat, 09 Mar 2024 09:13:09 +0100
 
+gnupg2 (2.4.4-2ubuntu24) questing; urgency=medium
+
+  * Cherry-pick Debian commit on git c4d2593b178de88ce22004d78a116f977f9bc5d6,
+    to fix autopkgtests failures with new debian-archive-keyring 
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Thu, 01 May 2025 21:01:27 +0200
+
+gnupg2 (2.4.4-2ubuntu23) plucky; urgency=medium
+
+  * SECURITY UPDATE: verification DoS via crafted subkey data
+    - debian/patches/CVE-2025-30258-1.patch: lookup key for merging/
+      inserting only by primary key in g10/getkey.c, g10/import.c,
+      g10/keydb.h.
+    - debian/patches/CVE-2025-30258-2.patch: remove a signature check
+      function wrapper in g10/mainproc.c, g10/packet.h, g10/sig-check.c.
+    - debian/patches/CVE-2025-30258-3.patch: fix a verification DoS due to
+      a malicious subkey in the keyring in g10/getkey.c, g10/gpg.h,
+      g10/keydb.h, g10/mainproc.c, g10/packet.h, g10/sig-check.c.
+    - debian/patches/CVE-2025-30258-4.patch: fix regression for the recent
+      malicious subkey DoS fix in g10/getkey.c, g10/packet.h.
+    - debian/patches/CVE-2025-30258-5.patch: fix double free of internal
+      data in g10/sig-check.c.
+    - CVE-2025-30258
+
+ -- Marc Deslauriers <marc.deslauriers@ubuntu.com>  Fri, 28 Mar 2025 11:23:49 -0400
+
+gnupg2 (2.4.4-2ubuntu22) plucky; urgency=medium
+
+  * Don't build the gpgv-win32 package which only debian-installer uses
+
+ -- Adrien Nader <adrien.nader@canonical.com>  Fri, 10 Jan 2025 14:24:01 +0100
+
+gnupg2 (2.4.4-2ubuntu21) plucky; urgency=medium
+
+  * revert-rfc4880bis.patch: Revert the "LibrePGP" changes that introduce
+    the standards-incompatible v5 keyformat and others by default.
+
+ -- Julian Andres Klode <juliank@ubuntu.com>  Wed, 04 Dec 2024 10:25:09 +0100
+
+gnupg2 (2.4.4-2ubuntu20) plucky; urgency=medium
+
+  * debian/patches/fix-disable-exec-ftbfs.patch: Fix FTBFS on amd64 by
+    dropping this previous patch which appears to not be needed anymore.
+  * debian/patches/fix-return-in-void-function.patch: Add minimal patch to
+    remove erroneous return statement in g10/photid.c which results in
+    FTBFS due to -Wreturn-mismatch (LP: #2090843)
+
+ -- Alex Murray <alex.murray@canonical.com>  Tue, 03 Dec 2024 10:40:26 +1030
+
+gnupg2 (2.4.4-2ubuntu19) plucky; urgency=medium
+
+  * Rebuild against latest libassuan
+
+ -- Jeremy Bícha <jbicha@ubuntu.com>  Thu, 21 Nov 2024 10:40:56 -0500
+
+gnupg2 (2.4.4-2ubuntu18) oracular; urgency=medium
+
+  * debian/patches/fix-disable-exec-ftbfs.patch: Fix FTBFS. Minor fix when
+    building with --disable-exec. Also remove get_max_fds() from
+    exechelp-w32.c since this function definition is already part of
+    gpg-error.h
+
+ -- Nishit Majithia <nishit.majithia@canonical.com>  Thu, 22 Aug 2024 12:28:14 +0530
+
+gnupg2 (2.4.4-2ubuntu17) noble; urgency=medium
+
+  * No-change rebuild against libnpth0t64
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Sat, 06 Apr 2024 16:25:03 +0000
+
+gnupg2 (2.4.4-2ubuntu16) noble; urgency=medium
+
+  * No-change rebuild for CVE-2024-3094
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Sun, 31 Mar 2024 00:07:54 +0000
+
+gnupg2 (2.4.4-2ubuntu15) noble; urgency=medium
+
+  * Also drop build dependency on libcurl4-gnutls-dev.
+
+ -- Matthias Klose <doko@ubuntu.com>  Thu, 07 Mar 2024 10:32:56 +0100
+
+gnupg2 (2.4.4-2ubuntu13) noble; urgency=medium
+
+  * Old drop build dependency on ghostscript, only used in maintainer mode.
+  * Rebuild with gnutls28 t64 packages.
+
+ -- Matthias Klose <doko@ubuntu.com>  Wed, 06 Mar 2024 09:31:32 +0100
+
+gnupg2 (2.4.4-2ubuntu11) noble; urgency=medium
+
+  * Drop imagemagick & transfig build dependency,
+    only used in maintainer mode.
+
+ -- Matthias Klose <doko@ubuntu.com>  Tue, 05 Mar 2024 10:39:06 +0100
+
+gnupg2 (2.4.4-2ubuntu9) noble; urgency=medium
+
+  * d/p/no-keyboxd.patch: Do not use keyboxd by default
+  * gpg{,sm}: Recommend gpg-agent, dirmngr; suggest keyboxd
+
+ -- Julian Andres Klode <juliank@ubuntu.com>  Fri, 01 Mar 2024 09:25:55 +0100
+
+gnupg2 (2.4.4-2ubuntu8) noble; urgency=medium
+
+  * Regenerate status-codes.h and reenable --assert-pubkey_algo (LP: #2055193)
+
+ -- Julian Andres Klode <juliank@ubuntu.com>  Wed, 28 Feb 2024 13:35:53 +0100
+
+gnupg2 (2.4.4-2ubuntu7) noble; urgency=medium
+
+  * Fix a typo: Syntax error in Recommends: gpg-wks-client
+
+ -- Julian Andres Klode <juliank@ubuntu.com>  Thu, 22 Feb 2024 19:36:17 +0100
+
+gnupg2 (2.4.4-2ubuntu6) noble; urgency=medium
+
+  * Demote gpg-wks-client to Recommends instead
+
+ -- Julian Andres Klode <juliank@ubuntu.com>  Thu, 22 Feb 2024 19:19:54 +0100
+
+gnupg2 (2.4.4-2ubuntu5) noble; urgency=medium
+
+  * Do not depend on gpg-wks-client on i386
+
+ -- Julian Andres Klode <juliank@ubuntu.com>  Thu, 22 Feb 2024 19:06:44 +0100
+
+gnupg2 (2.4.4-2ubuntu4) noble; urgency=medium
+
+  * Stop building gpg-wks-server, gpg-wks-client on i386
+
+ -- Julian Andres Klode <juliank@ubuntu.com>  Wed, 21 Feb 2024 16:22:49 +0100
+
+gnupg2 (2.4.4-2ubuntu3) noble; urgency=medium
+
+  * debian/migrate-pubring-from-classic-gpg: Add 2.4 to allowlist
+  * d/tests/simple-tests: Use RSA keys for now.
+    'default' key type does not work in batch mode anymore due to needing two
+    subkeys (ed25519 for signing, and cv25519 for encryption).
+  * gnupg: Demote gpg-wks-server to Suggests.
+    We don't want this installed by default, it pulls in an mta, and we don't
+    host wks servers by default.
+  * gnupg: Demote gnupg-l10n to Recommends.
+    Translations are nice, but I want to be able to remove them on
+    an English system without breaking Depends.
+  * Demote all Recommends: gnupg to Suggests.
+    If we selectively install a specific part of gpg it should not
+    by default pull in the entire suite again.
+
+ -- Julian Andres Klode <juliank@ubuntu.com>  Fri, 16 Feb 2024 11:03:09 +0100
+
+gnupg2 (2.4.4-2ubuntu2) noble; urgency=medium
+
+  * Disable add-option-assert-pubkey_algo.patch for now
+
+ -- Julian Andres Klode <juliank@ubuntu.com>  Tue, 13 Feb 2024 12:08:30 +0100
+
+gnupg2 (2.4.4-2ubuntu1) noble; urgency=medium
+
+  * Merge with Debian experimental. Remaining changes:
+    - Honor http_proxy= environment variables by default in the systemd
+      user session dirmngr service.
+    - Drop the gpgv-win32 test
+  * The dirmngr change now patches debian/dirmngr.user.service directly
+  * Import upstream patch gpg: Add option --assert-pubkey_algo
+
+ -- Julian Andres Klode <juliank@ubuntu.com>  Tue, 13 Feb 2024 10:44:42 +0100
+
 gnupg2 (2.4.4-2) experimental; urgency=low
 
   * Fix binary-all FTBFS by running a regular build for arch-all builds.
@@ -624,6 +831,20 @@ gnupg2 (2.2.40-2) unstable; urgency=medi
 
  -- Andreas Metzler <ametzler@debian.org>  Wed, 13 Mar 2024 18:27:10 +0100
 
+gnupg2 (2.2.40-1.1ubuntu1) lunar; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - Drop the gpgv-win32 test
+    - Honor http_proxy= environment variables by default in the systemd
+      user session dirmngr service.
+      (debian/patches/dirmngr-honor-http-proxy.patch)
+    - Export GPG_AGENT_INFO in the systemd-environment-generator too.
+    - Don't declare diffutils as a test dependency, this package is
+      essential so always installed; and the dependency declaration breaks
+      cross-arch testing.
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Tue, 28 Mar 2023 08:39:57 +0200
+
 gnupg2 (2.2.40-1.1) unstable; urgency=medium
 
   * Non-maintainer upload.
@@ -632,6 +853,26 @@ gnupg2 (2.2.40-1.1) unstable; urgency=me
 
  -- Andreas Metzler <ametzler@debian.org>  Sun, 26 Mar 2023 15:03:05 +0200
 
+gnupg2 (2.2.40-1ubuntu2) lunar; urgency=medium
+
+  * No-change rebuild against libldap-2
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Thu, 15 Dec 2022 19:48:12 +0000
+
+gnupg2 (2.2.40-1ubuntu1) lunar; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - Drop the gpgv-win32 test
+    - Honor http_proxy= environment variables by default in the systemd
+      user session dirmngr service.
+      (debian/patches/dirmngr-honor-http-proxy.patch)
+    - Export GPG_AGENT_INFO in the systemd-environment-generator too.
+    - Don't declare diffutils as a test dependency, this package is
+      essential so always installed; and the dependency declaration breaks
+      cross-arch testing.
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Fri, 04 Nov 2022 19:58:52 +0100
+
 gnupg2 (2.2.40-1) unstable; urgency=medium
 
   * new upstream version
@@ -656,6 +897,23 @@ gnupg2 (2.2.38-1) unstable; urgency=medi
 
  -- Daniel Kahn Gillmor <dkg@fifthhorseman.net>  Thu, 01 Sep 2022 18:25:24 -0400
 
+gnupg2 (2.2.35-3ubuntu1) kinetic; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - Drop the gpgv-win32 test
+    - Honor http_proxy= environment variables by default in the systemd
+      user session dirmngr service.
+      (debian/patches/dirmngr-honor-http-proxy.patch)
+    - Export GPG_AGENT_INFO in the systemd-environment-generator too.
+    - Don't declare diffutils as a test dependency, this package is
+      essential so always installed; and the dependency declaration breaks
+      cross-arch testing.
+  * Dropped changes, included upstream:
+    - debian/patches/CVE-2022-34903.patch: Fix garbled status messages in
+      NOTATION_DATA in g10/cpr.c.
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Mon, 15 Aug 2022 18:01:56 -0700
+
 gnupg2 (2.2.35-3) unstable; urgency=high
 
   * fix security error from large notations (Thanks, Demi Marie Obenour)
@@ -704,6 +962,35 @@ gnupg2 (2.2.27-4) unstable; urgency=medi
 
  -- Daniel Kahn Gillmor <dkg@fifthhorseman.net>  Wed, 20 Apr 2022 19:03:29 -0400
 
+gnupg2 (2.2.27-3ubuntu3) kinetic; urgency=medium
+
+  * SECURITY UPDATE: signature forgery via injection into the status line
+    - debian/patches/CVE-2022-34903.patch: Fix garbled status messages in
+      NOTATION_DATA in g10/cpr.c.
+    - CVE-2022-34903
+
+ -- Marc Deslauriers <marc.deslauriers@ubuntu.com>  Mon, 04 Jul 2022 12:17:43 -0400
+
+gnupg2 (2.2.27-3ubuntu2) jammy; urgency=medium
+
+  * No-change rebuild for ppc64el baseline bump.
+
+ -- Łukasz 'sil2100' Zemczak <lukasz.zemczak@ubuntu.com>  Wed, 23 Mar 2022 14:55:24 +0100
+
+gnupg2 (2.2.27-3ubuntu1) jammy; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - Drop the gpgv-win32 test
+    - Honor http_proxy= environment variables by default in the systemd
+      user session dirmngr service.
+      (debian/patches/dirmngr-honor-http-proxy.patch)
+    - Export GPG_AGENT_INFO in the systemd-environment-generator too.
+    - Don't declare diffutils as a test dependency, this package is
+      essential so always installed; and the dependency declaration breaks
+      cross-arch testing.
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Wed, 29 Dec 2021 15:59:57 -0800
+
 gnupg2 (2.2.27-3) unstable; urgency=medium
 
   * Avoid network interaction in generator. Closes: #993578
@@ -714,6 +1001,23 @@ gnupg2 (2.2.27-3) unstable; urgency=medi
 
  -- Christoph Biedl <debian.axhn@manchmal.in-ulm.de>  Sat, 18 Dec 2021 14:04:20 +0100
 
+gnupg2 (2.2.27-2ubuntu1) jammy; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - Drop the gpgv-win32 test
+    - Honor http_proxy= environment variables by default in the systemd
+      user session dirmngr service.
+      (debian/patches/dirmngr-honor-http-proxy.patch)
+    - Export GPG_AGENT_INFO in the systemd-environment-generator too.
+    - Don't declare diffutils as a test dependency, this package is
+      essential so always installed; and the dependency declaration breaks
+      cross-arch testing.
+  * Dropped changes, included upstream:
+    - d/p/dirmngr-handle-EAFNOSUPPORT-at-connect_server.patch:
+      Fix IPv6 connectivity for dirmngr.
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Mon, 01 Nov 2021 11:19:52 -0700
+
 gnupg2 (2.2.27-2) unstable; urgency=medium
 
   * Add a NEWS entry about the end of support for ~/.gnupg/options.
@@ -760,6 +1064,39 @@ gnupg2 (2.2.26-1) UNRELEASED; urgency=me
 
  -- NIIBE Yutaka <gniibe@fsij.org>  Thu, 07 Jan 2021 09:07:21 +0900
 
+gnupg2 (2.2.20-1ubuntu4) impish; urgency=medium
+
+  * No-change rebuild due to OpenLDAP soname bump.
+
+ -- Sergio Durigan Junior <sergio.durigan@canonical.com>  Mon, 21 Jun 2021 17:48:27 -0400
+
+gnupg2 (2.2.20-1ubuntu3) hirsute; urgency=medium
+
+  * No-change rebuild to drop the udeb package.
+
+ -- Matthias Klose <doko@ubuntu.com>  Mon, 22 Feb 2021 10:33:34 +0100
+
+gnupg2 (2.2.20-1ubuntu2) hirsute; urgency=medium
+
+  * d/p/dirmngr-handle-EAFNOSUPPORT-at-connect_server.patch:
+    - Fix IPv6 connectivity for dirmngr (LP: #1910432)
+
+ -- Heitor Alves de Siqueira <halves@canonical.com>  Sat, 16 Jan 2021 14:53:14 +0000
+
+gnupg2 (2.2.20-1ubuntu1) groovy; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - Drop the gpgv-win32 test
+    - Honor http_proxy= environment variables by default in the systemd
+      user session dirmngr service.
+      (debian/patches/dirmngr-honor-http-proxy.patch)
+    - Export GPG_AGENT_INFO in the systemd-environment-generator too.
+    - Don't declare diffutils as a test dependency, this package is
+      essential so always installed; and the dependency declaration breaks
+      cross-arch testing.
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Fri, 01 May 2020 14:58:28 -0700
+
 gnupg2 (2.2.20-1) unstable; urgency=medium
 
   * New upstream release
@@ -767,6 +1104,25 @@ gnupg2 (2.2.20-1) unstable; urgency=medi
 
  -- Daniel Kahn Gillmor <dkg@fifthhorseman.net>  Mon, 23 Mar 2020 15:05:13 -0400
 
+gnupg2 (2.2.19-3ubuntu2) focal; urgency=medium
+
+  * Don't declare diffutils as a test dependency, this package is essential
+    so always installed; and the dependency declaration breaks
+    cross-arch testing.
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Tue, 10 Mar 2020 11:50:46 -0700
+
+gnupg2 (2.2.19-3ubuntu1) focal; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - Drop the gpgv-win32 test
+    - Honor http_proxy= environment variables by default in the systemd
+      user session dirmngr service.
+      (debian/patches/dirmngr-honor-http-proxy.patch)
+    - Export GPG_AGENT_INFO in the systemd-environment-generator too.
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Tue, 10 Mar 2020 10:59:47 +0100
+
 gnupg2 (2.2.19-3) unstable; urgency=medium
 
   * d/copyright update years
@@ -806,6 +1162,17 @@ gnupg2 (2.2.19-1) unstable; urgency=medi
 
  -- Daniel Kahn Gillmor <dkg@fifthhorseman.net>  Wed, 08 Jan 2020 10:33:12 -0500
 
+gnupg2 (2.2.17-3ubuntu1) focal; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - Drop the gpgv-win32 test
+    - Honor http_proxy= environment variables by default in the systemd
+      user session dirmngr service.
+      (debian/patches/dirmngr-honor-http-proxy.patch)
+    - Export GPG_AGENT_INFO in the systemd-environment-generator too.
+
+ -- Dimitri John Ledkov <xnox@ubuntu.com>  Wed, 20 Nov 2019 16:26:23 +0000
+
 gnupg2 (2.2.17-3) unstable; urgency=medium
 
   * avoid data loss when using keyservers (see https://dev.gnupg.org/T4628)
@@ -911,6 +1278,30 @@ gnupg2 (2.2.13-1) unstable; urgency=medi
 
  -- Daniel Kahn Gillmor <dkg@fifthhorseman.net>  Sat, 02 Mar 2019 11:50:15 -0500
 
+gnupg2 (2.2.12-1ubuntu3) disco; urgency=medium
+
+  * Drop the gpgv-win32 test, and add some simple tests for gpg{,v} instead
+
+ -- Julian Andres Klode <juliank@ubuntu.com>  Wed, 30 Jan 2019 11:39:21 +0100
+
+gnupg2 (2.2.12-1ubuntu2) disco; urgency=medium
+
+  * No-change rebuild for readline soname change.
+
+ -- Matthias Klose <doko@ubuntu.com>  Mon, 14 Jan 2019 20:09:13 +0000
+
+gnupg2 (2.2.12-1ubuntu1) disco; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - Honor http_proxy= environment variables by default in the systemd
+      user session dirmngr service. LP: #1625848
+      (debian/patches/dirmngr-honor-http-proxy.patch)
+    - Export GPG_AGENT_INFO in the systemd-environment-generator too.
+  * debian/tests/gpgv-win32: Create /run/user/$(id -u) if it does not
+    exist - wine hardcodes that location.
+
+ -- Julian Andres Klode <juliank@ubuntu.com>  Tue, 08 Jan 2019 10:19:49 +0100
+
 gnupg2 (2.2.12-1) unstable; urgency=medium
 
   * New upstream release
@@ -982,6 +1373,16 @@ gnupg2 (2.2.9-1) unstable; urgency=mediu
 
  -- Daniel Kahn Gillmor <dkg@fifthhorseman.net>  Thu, 19 Jul 2018 14:02:31 -0400
 
+gnupg2 (2.2.8-3ubuntu1) cosmic; urgency=medium
+
+  * Sync with Debian. Remaining changes:
+    - Honor http_proxy= environment variables by default in the systemd
+      user session dirmngr service. LP: #1625848
+      (debian/patches/dirmngr-honor-http-proxy.patch)
+    - Export GPG_AGENT_INFO in the systemd-environment-generator too.
+
+ -- Jeremy Bicha <jbicha@ubuntu.com>  Mon, 03 Sep 2018 20:43:20 -0400
+
 gnupg2 (2.2.8-3) unstable; urgency=medium
 
   * Ensure arch: all gnupg package supports binMNUs
@@ -1003,6 +1404,23 @@ gnupg2 (2.2.8-2) unstable; urgency=mediu
 
  -- Daniel Kahn Gillmor <dkg@fifthhorseman.net>  Wed, 20 Jun 2018 06:56:09 -0400
 
+gnupg2 (2.2.8-1ubuntu1) cosmic; urgency=low
+
+  * Merge from Debian unstable to fix CVE-2018-12020.  Remaining changes:
+    - Honor http_proxy= environment variables by default in the systemd
+      user session dirmngr service. LP: #1625848
+      (debian/patches/dirmngr-honor-http-proxy.patch)
+    - Export GPG_AGENT_INFO in the systemd-environment-generator too.
+  * dropped due to applied in debian:
+    - debian/gnupg2.udev:
+      - udev rules to set ACLs on SCM smartcard readers.
+      - Add udev rules to give gpg access to some smartcard readers;
+        Debian #543217. (applied in scdaemon in 2.1.11-7+exp1)
+  * dropped (no longer needed):
+    - Add breaks for software-properties-common at 0.96.24.3 or lower.
+
+ -- Steve Beattie <sbeattie@ubuntu.com>  Wed, 13 Jun 2018 11:44:59 -0700
+
 gnupg2 (2.2.8-1) unstable; urgency=medium
 
   * New upstream release
@@ -1047,6 +1465,25 @@ gnupg2 (2.2.4-2) unstable; urgency=mediu
 
  -- Daniel Kahn Gillmor <dkg@fifthhorseman.net>  Mon, 05 Feb 2018 23:07:21 -0500
 
+gnupg2 (2.2.4-1ubuntu1) bionic; urgency=medium
+
+  * Merge from Debian unstable, remaining changes:
+    - debian/gnupg2.udev:
+      - Add udev rules to give gpg access to some smartcard readers;
+        Debian #543217.
+      - udev rules to set ACLs on SCM smartcard readers.
+    - Add breaks for software-properties-common at 0.96.24.3 or lower.
+    - Honor http_proxy= environment variables by default in the systemd
+      user session dirmngr service. LP: #1625848
+    - Export GPG_AGENT_INFO in the systemd-environment-generator too.
+
+  * Dropped changes:
+    - Removed user session upstart support.
+    - Removed gpg-agent.service changes, use Debian's environment generator instead.
+    - Patch to set GNUPGHOME for tests, fixed in debian/upstream.
+
+ -- Dimitri John Ledkov <xnox@ubuntu.com>  Thu, 11 Jan 2018 13:33:17 +0000
+
 gnupg2 (2.2.4-1) unstable; urgency=medium
 
   * New upstream release
@@ -1446,6 +1883,85 @@ gnupg2 (2.1.15-2) unstable; urgency=medi
 
  -- Daniel Kahn Gillmor <dkg@fifthhorseman.net>  Wed, 31 Aug 2016 12:37:48 -0400
 
+gnupg2 (2.1.15-1ubuntu8) artful; urgency=medium
+
+  * debian/patches/0005-set-gnupghome-for-tests.patch:
+    - set GNUPGHOME to a directory under the build directory as the
+      default value relies on $HOME which shouldn't be used during
+      the package build. LP: #1722939.
+
+ -- Tiago Stürmer Daitx <tiago.daitx@ubuntu.com>  Wed, 11 Oct 2017 20:20:46 +0000
+
+gnupg2 (2.1.15-1ubuntu7) zesty; urgency=medium
+
+  * gpg-agent.conf: use XDG_RUNTIME_DIR for ssh-agent socket, in the
+    upstart user session job too. LP: #1675925.
+
+ -- Dimitri John Ledkov <xnox@ubuntu.com>  Wed, 29 Mar 2017 16:15:15 +0100
+
+gnupg2 (2.1.15-1ubuntu6) yakkety; urgency=medium
+
+  * gpg-agent.service: use XDG_RUNTIME_DIR for ssh-agent socket, instead
+    of GNUPGHOME. LP: #1631320.
+
+ -- Dimitri John Ledkov <xnox@ubuntu.com>  Fri, 07 Oct 2016 11:20:28 +0100
+
+gnupg2 (2.1.15-1ubuntu5) yakkety; urgency=medium
+
+  * gpg-agent.service: Properly escape "\$10" to avoid warning. (LP: #1615726)
+
+ -- Martin Pitt <martin.pitt@ubuntu.com>  Thu, 06 Oct 2016 23:10:50 +0200
+
+gnupg2 (2.1.15-1ubuntu4) yakkety; urgency=medium
+
+  * Honor http_proxy= environment variables by default, in the newly
+    generated dirmngr.conf files. Existing users behing proxies should set
+    honor-http-proxy in $GNUPGHOME/dirmngr.conf, see
+    /usr/share/gnupg/dirmngr-conf.skel. LP: #1625848
+
+ -- Dimitri John Ledkov <xnox@ubuntu.com>  Wed, 21 Sep 2016 02:23:54 +0100
+
+gnupg2 (2.1.15-1ubuntu3) yakkety; urgency=medium
+
+  * No-change rebuild for readline soname change.
+
+ -- Matthias Klose <doko@ubuntu.com>  Sat, 17 Sep 2016 12:02:46 +0000
+
+gnupg2 (2.1.15-1ubuntu2) yakkety; urgency=medium
+
+  * Add breaks for software-properties-common at 0.96.24.3 or lower.
+
+ -- Dimitri John Ledkov <xnox@ubuntu.com>  Thu, 01 Sep 2016 11:34:12 +0100
+
+gnupg2 (2.1.15-1ubuntu1) yakkety; urgency=medium
+
+  * gnupg is now 2.1. LP: #1615039
+  * Merge from Debian unstable, remaining changes:
+    - debian/systemd-user/gpg-agent.service:
+      - Set the environment variables in ExecStartPre - Post has a race
+        condition as other SSH agent providers can start up after ExecStart
+        finishes. The ExecStopPost commands are run in the case of failure, to
+        unset them.
+      - Be Before= gnome-keyring-ssh and ssh-agent - if someone has explicitly
+        asked for gpg-agent to be their SSH agent then we want to win.
+      - Set $SSH_AGENT_LAUNCHER so that we can avoid executing gpgconf in the
+        ExecStopPost.
+      - Ignore initctl failures - eventually this will go away.
+    - debian/upstart-user/:
+      - Add upstart user session jobs
+      - Add upstart override for the upstart user session jobs, when user
+        systemd is present
+    - debian/Xsession.d/90gpg-agent:
+      - Don't run if we have a systemd user instance. We want to phase out
+        the Xsession.d scripts, and use the systemd/upstart scripts so that
+        things also work under Mir.
+    - debian/gnupg2.udev:
+      - Add udev rules to give gpg access to some smartcard readers;
+        Debian #543217.
+      - udev rules to set ACLs on SCM smartcard readers.
+
+ -- Dimitri John Ledkov <xnox@ubuntu.com>  Wed, 31 Aug 2016 13:35:55 +0100
+
 gnupg2 (2.1.15-1) unstable; urgency=medium
 
   * new upstream release
@@ -1613,6 +2129,58 @@ gnupg2 (2.1.11-6+exp1) experimental; urg
 
  -- Daniel Kahn Gillmor <dkg@fifthhorseman.net>  Mon, 28 Mar 2016 23:27:43 -0400
 
+gnupg2 (2.1.11-6ubuntu4) yakkety; urgency=medium
+
+  * debian/user/gpg-agent.service:
+    - Set the environment variables in ExecStartPre - Post has a race
+      condition as other SSH agent providers can start up after ExecStart
+      finishes. The ExecStopPost commands are run in the case of failure, to
+      unset them.
+    - Be Before= gnome-keyring-ssh and ssh-agent - if someone has explicitly
+      asked for gpg-agent to be their SSH agent then we want to win.
+    - Set $SSH_AGENT_LAUNCHER so that we can avoid executing gpgconf in the
+      ExecStopPost.
+    - Ignore initctl failures - eventually this will go away.
+
+ -- Iain Lane <iain@orangesquash.org.uk>  Thu, 04 Aug 2016 11:16:01 +0100
+
+gnupg2 (2.1.11-6ubuntu3) yakkety; urgency=medium
+
+  * debian/user/: Add systemd user unit and upstart override for gpg-agent.
+  * debian/gnupg-agent.xsession: Don't run if we have a systemd user instance.
+    We want to phase out the Xsession.d scripts, and use the systemd/upstart
+    scripts so that things also work under Mir.
+
+ -- Martin Pitt <martin.pitt@ubuntu.com>  Tue, 19 Jul 2016 17:35:01 +0200
+
+gnupg2 (2.1.11-6ubuntu2) xenial; urgency=medium
+
+  * Fix upstart user-session integration with new pinentry:
+  - restart gpg-agent, once dbus is started, such that agent has DBUS
+    session environemnt set and can connect to the pinentry-gnome3 Closes:
+    #790316 Closes: #795368 LP: #1566928
+  - use gpgconf to launch/kill gpg-agent and to check settings
+
+ -- Dimitri John Ledkov <xnox@ubuntu.com>  Fri, 08 Apr 2016 08:55:10 +0100
+
+gnupg2 (2.1.11-6ubuntu1) xenial; urgency=medium
+
+  * Adds support for --pinentry= argument for gpgme1.0 (LP: #1564234)
+  * Merge with debian, remaining changes:
+    - Add udev rules to give gpg access to some smartcard readers;
+      Debian #543217.
+    - debian/gnupg2.udev: udev rules to set ACLs on SCM smartcard readers.
+    - Add upstart user job for gpg-agent.
+  * Dropped no longer applicable changes in merge:
+    - Drop sh prefix from openpgp test environment as it leads to exec
+      invocations of sh /bin/bash leading to syntax errors from sh.  Fixes
+      FTBFS detected in Ubuntu saucy archive rebuild.
+    - debian/control: drop dirmngr to Suggests as it is in universe.
+    - gcc5-fix.patch: add upstream fix for an optimization issue when
+      compiling with gcc 5.
+
+ -- Mario Limonciello <mario_limonciello@dell.com>  Wed, 30 Mar 2016 23:20:09 -0500
+
 gnupg2 (2.1.11-6) unstable; urgency=medium
 
   * avoid FTBFS with patch from upstream (Closes: #814842)
@@ -1817,6 +2385,27 @@ gnupg2 (2.1.0~beta895-1) experimental; u
 
  -- Daniel Kahn Gillmor <dkg@fifthhorseman.net>  Wed, 29 Oct 2014 17:53:06 -0400
 
+gnupg2 (2.0.28-3ubuntu2) xenial; urgency=medium
+
+  * debian/gcc5-fix.patch: add upstream fix for an optimization issue when
+    compiling with gcc 5. (LP: #1501634)
+
+ -- Marc Deslauriers <marc.deslauriers@ubuntu.com>  Tue, 09 Feb 2016 16:11:42 -0500
+
+gnupg2 (2.0.28-3ubuntu1) wily; urgency=low
+
+  * Merge from Debian, remaining changes:
+    - Drop sh prefix from openpgp test environment as it leads to exec
+      invocations of sh /bin/bash leading to syntax errors from sh.  Fixes
+      FTBFS detected in Ubuntu saucy archive rebuild.
+    - Add udev rules to give gpg access to some smartcard readers;
+      Debian #543217.
+    - debian/gnupg2.udev: udev rules to set ACLs on SCM smartcard readers.
+    - Add upstart user job for gpg-agent.
+    - debian/control: drop dirmngr to Suggests as it is in universe.
+
+ -- Iain Lane <iain@orangesquash.org.uk>  Mon, 13 Jul 2015 13:18:38 +0100
+
 gnupg2 (2.0.28-3) unstable; urgency=medium
 
   * pass DBUS_SESION_BUS_ADDRESS to the agent for gnome3.
diff -pruN 2.4.7-17/debian/control 2.4.7-17ubuntu3/debian/control
--- 2.4.7-17/debian/control	2025-04-28 16:10:39.000000000 +0000
+++ 2.4.7-17ubuntu3/debian/control	2025-05-09 19:07:52.000000000 +0000
@@ -1,7 +1,8 @@
 Source: gnupg2
 Section: utils
 Priority: optional
-Maintainer: Debian GnuPG Maintainers <pkg-gnupg-maint@lists.alioth.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian GnuPG Maintainers <pkg-gnupg-maint@lists.alioth.debian.org>
 Uploaders:
  Eric Dorland <eric@debian.org>,
  Daniel Kahn Gillmor <dkg@fifthhorseman.net>,
@@ -30,23 +31,14 @@ Build-Depends:
  libreadline-dev <!pkg.gnupg2.gpgvonly>,
  librsvg2-bin <!nodoc>,
  libsqlite3-dev <!pkg.gnupg2.gpgvonly>,
- libtss2-dev <!pkg.gnupg2.gpgvonly>,
+ libtss2-dev [!i386] <!pkg.gnupg2.gpgvonly>,
  libusb-1.0-0-dev [!hurd-any] <!pkg.gnupg2.gpgvonly>,
  openssh-client <!nocheck !pkg.gnupg2.gpgvonly>,
  pkgconf,
- swtpm [amd64 arm64 armel armhf i386 mips64el ppc64el riscv64 s390x] <!nocheck !pkg.gnupg2.gpgvonly>,
+ swtpm [amd64 arm64 armel armhf mips64el ppc64el riscv64 s390x] <!nocheck !pkg.gnupg2.gpgvonly>,
  texinfo <!nodoc>,
  unicode-data,
  zlib1g-dev | libz-dev,
-Build-Depends-Indep:
- binutils-multiarch [!amd64 !i386] <!pkg.gnupg2.gpgvonly>,
- libassuan-mingw-w64-dev (>= 2.5.0) <!pkg.gnupg2.gpgvonly>,
- libgcrypt-mingw-w64-dev (>= 1.9.1) <!pkg.gnupg2.gpgvonly>,
- libgpg-error-mingw-w64-dev (>= 1.50-4~) <!pkg.gnupg2.gpgvonly>,
- libksba-mingw-w64-dev (>= 1.6.3) <!pkg.gnupg2.gpgvonly>,
- libnpth-mingw-w64-dev (>= 1.2) <!pkg.gnupg2.gpgvonly>,
- libz-mingw-w64-dev <!pkg.gnupg2.gpgvonly>,
- mingw-w64 <!pkg.gnupg2.gpgvonly>,
 Vcs-Git: https://salsa.debian.org/debian/gnupg2.git
 Vcs-Browser: https://salsa.debian.org/debian/gnupg2
 Homepage: https://www.gnupg.org/
@@ -99,9 +91,9 @@ Depends:
  ${misc:Depends},
  ${shlibs:Depends},
 Recommends:
- gnupg (= ${source:Version}),
  ${shlibs:Recommends},
 Suggests:
+ gnupg (= ${source:Version}),
  dbus-user-session,
  libpam-systemd,
  pinentry-gnome3,
@@ -127,7 +119,7 @@ Description: GNU privacy guard - cryptog
  fail.
 
 Package: gpg-wks-server
-Architecture: any
+Architecture: amd64 arm64 armhf ppc64el riscv64 s390x
 Multi-Arch: foreign
 Build-Profiles: <!pkg.gnupg2.gpgvonly>
 Depends:
@@ -137,8 +129,9 @@ Depends:
  ${misc:Depends},
  ${shlibs:Depends},
 Recommends:
- gnupg (= ${source:Version}),
  ${shlibs:Recommends},
+Suggests:
+ gnupg (= ${source:Version}),
 Description: GNU privacy guard - Web Key Service server
  GnuPG is GNU's tool for secure communication and data storage.
  It can be used to encrypt data and to create digital signatures.
@@ -155,7 +148,7 @@ Description: GNU privacy guard - Web Key
  For more information see: https://wiki.gnupg.org/WKS
 
 Package: gpg-wks-client
-Architecture: any
+Architecture: amd64 arm64 armhf ppc64el riscv64 s390x
 Multi-Arch: foreign
 Build-Profiles: <!pkg.gnupg2.gpgvonly>
 Depends:
@@ -165,8 +158,9 @@ Depends:
  ${misc:Depends},
  ${shlibs:Depends},
 Recommends:
- gnupg (= ${source:Version}),
  ${shlibs:Recommends},
+Suggests:
+ gnupg (= ${source:Version}),
 Description: GNU privacy guard - Web Key Service client
  GnuPG is GNU's tool for secure communication and data storage.
  It can be used to encrypt data and to create digital signatures.
@@ -210,8 +204,11 @@ Depends:
  ${misc:Depends},
  ${shlibs:Depends},
 Recommends:
- gnupg (= ${source:Version}),
  ${shlibs:Recommends},
+ dirmngr,
+ gpg-agent,
+Suggests:
+ gnupg (= ${source:Version}),
 Description: GNU privacy guard - S/MIME version
  GnuPG is GNU's tool for secure communication and data storage.
  It can be used to encrypt data and to create digital signatures.
@@ -231,8 +228,11 @@ Depends:
  ${misc:Depends},
  ${shlibs:Depends},
 Recommends:
- gnupg (= ${source:Version}),
  ${shlibs:Recommends},
+ dirmngr,
+ gpg-agent,
+Suggests:
+ gnupg (= ${source:Version}),
 Breaks:
  gnupg (<< 2.1.21-4),
  keyboxd (<< 2.4.7-4),
@@ -261,7 +261,6 @@ Build-Profiles: <!pkg.gnupg2.gpgvonly>
 Depends:
  dirmngr (<< ${source:Version}.1~),
  dirmngr (>= ${source:Version}),
- gnupg-l10n (= ${source:Version}),
  gpg (<< ${source:Version}.1~),
  gpg (>= ${source:Version}),
  gpg-agent (<< ${source:Version}.1~),
@@ -271,6 +270,7 @@ Depends:
  ${misc:Depends},
  ${shlibs:Depends},
 Recommends:
+ gnupg-l10n (= ${source:Version}),
  gnupg-utils (<< ${source:Version}.1~),
  gnupg-utils (>= ${source:Version}),
  gpg-wks-client (<< ${source:Version}.1~),
@@ -278,6 +278,9 @@ Recommends:
  gpgv (<< ${source:Version}.1~),
  gpgv (>= ${source:Version}),
  ${shlibs:Recommends},
+ gnupg-l10n (= ${source:Version}),
+ gpg-wks-client (<< ${source:Version}.1~),
+ gpg-wks-client (>= ${source:Version}),
 Suggests:
  gpg-wks-server (<< ${source:Version}.1~),
  gpg-wks-server (>= ${source:Version}),
@@ -350,13 +353,13 @@ Depends:
  ${misc:Depends},
  ${shlibs:Depends},
 Recommends:
- gnupg (= ${source:Version}),
  ${shlibs:Recommends},
 Enhances:
  gpg,
  gpgsm,
  squid,
 Suggests:
+ gnupg (= ${source:Version}),
  dbus-user-session,
  libpam-systemd,
  pinentry-gnome3,
@@ -375,7 +378,7 @@ Description: GNU privacy guard - network
  the GnuPG suite that try to interact with the network will fail.
 
 Package: tpm2daemon
-Architecture: any
+Architecture: amd64 arm64 armhf ppc64el riscv64 s390x
 Multi-Arch: foreign
 Build-Profiles: <!pkg.gnupg2.gpgvonly>
 Depends:
@@ -383,9 +386,9 @@ Depends:
  ${misc:Depends},
  ${shlibs:Depends},
 Recommends:
- gnupg (= ${binary:Version}),
  ${shlibs:Recommends},
 Suggests:
+ gnupg (= ${binary:Version}),
  dbus-user-session,
  libpam-systemd,
 Enhances:
@@ -441,25 +444,6 @@ Description: minimal signature verificat
  installs on these platforms by using the full Debian signature
  verification that is present in all official Debian mirrors.
 
-Package: gpgv-win32
-Architecture: all
-Multi-Arch: foreign
-Build-Profiles: <!pkg.gnupg2.gpgvonly>
-Depends:
- ${misc:Depends},
-Suggests:
- wine,
-Description: GNU privacy guard - signature verification tool (win32 build)
- GnuPG is GNU's tool for secure communication and data storage.
- .
- gpgv is a stripped-down version of gnupg which is only able to check
- signatures.  It is smaller than the full-blown gnupg and uses a
- different (and simpler) way to check that the public keys used to
- make the signature are trustworthy.
- .
- This is a win32 version of gpgv.  It's meant to be used by the win32-loader
- component of Debian-Installer.
-
 Package: gnupg-l10n
 Section: localization
 Architecture: all
diff -pruN 2.4.7-17/debian/gpgv-win32.install 2.4.7-17ubuntu3/debian/gpgv-win32.install
--- 2.4.7-17/debian/gpgv-win32.install	2025-03-31 07:52:59.000000000 +0000
+++ 2.4.7-17ubuntu3/debian/gpgv-win32.install	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-build-gpgv-win32/g10/gpgv.exe usr/share/win32
diff -pruN 2.4.7-17/debian/patches/series 2.4.7-17ubuntu3/debian/patches/series
--- 2.4.7-17/debian/patches/series	2025-04-12 14:54:05.000000000 +0000
+++ 2.4.7-17ubuntu3/debian/patches/series	2025-05-09 19:07:52.000000000 +0000
@@ -48,3 +48,4 @@ from-upstream/gpg-Fix-regression-for-the
 from-upstream/gpg-Fix-double-free-of-internal-data.patch
 debian-packaging/no-keyboxd.patch
 gpgv-Avoid-Assuan-and-NPth-dependencies.patch
+ubuntu/honor-http-proxy.patch
diff -pruN 2.4.7-17/debian/patches/ubuntu/honor-http-proxy.patch 2.4.7-17ubuntu3/debian/patches/ubuntu/honor-http-proxy.patch
--- 2.4.7-17/debian/patches/ubuntu/honor-http-proxy.patch	1970-01-01 00:00:00.000000000 +0000
+++ 2.4.7-17ubuntu3/debian/patches/ubuntu/honor-http-proxy.patch	2025-05-09 19:07:52.000000000 +0000
@@ -0,0 +1,11 @@
+Description: Honor http_proxy= environment variables by default in the systemd user session dirmngr service
+Author: Julian Andres Klode <julian.klode@canonical.com>
+--- a/doc/examples/systemd-user/dirmngr.service
++++ b/doc/examples/systemd-user/dirmngr.service
+@@ -4,5 +4,5 @@ Documentation=man:dirmngr(8)
+ Requires=dirmngr.socket
+ 
+ [Service]
+-ExecStart=/usr/bin/dirmngr --supervised
++ExecStart=/usr/bin/dirmngr --supervised --honor-http-proxy
+ ExecReload=/usr/bin/gpgconf --reload dirmngr
diff -pruN 2.4.7-17/debian/rules 2.4.7-17ubuntu3/debian/rules
--- 2.4.7-17/debian/rules	2025-04-28 16:10:39.000000000 +0000
+++ 2.4.7-17ubuntu3/debian/rules	2025-05-09 19:07:52.000000000 +0000
@@ -81,32 +81,6 @@ override_dh_auto_build-arch:
 	cd build-gpgv-static/g10 && $(MAKE) LDFLAGS="$$LDFLAGS $(GPGV_STATIC_HARDENING) -static" gpgv
 	mv build-gpgv-static/g10/gpgv build-gpgv-static/g10/gpgv-static
 
-override_dh_auto_build-indep:
-	mkdir -p build-gpgv-win32
-	cd build-gpgv-win32 && $(WIN32_FLAGS) ../configure \
-	   	$(foreach x, $(GPGV_UDEB_UNNEEDED), --disable-$(x)) \
-		$(foreach x, libgpg-error libgcrypt libassuan ksba, --with-$x-prefix=/usr/i686-w64-mingw32) \
-		$(NODOC) \
-		--enable-gpg2-is-gpg \
-		--with-zlib=/usr/i686-w64-mingw \
-		--prefix=/usr/i686-w64-mingw32 \
-		--host i686-w64-mingw32
-	cd build-gpgv-win32/common && $(WIN32_FLAGS) $(MAKE) status-codes.h audit-events.h
-	cd build-gpgv-win32/common && $(WIN32_FLAGS) $(MAKE) libgpgrl.a
-	cd build-gpgv-win32/common && $(WIN32_FLAGS) $(MAKE) libsimple-pwquery.a
-	cd build-gpgv-win32/common && $(WIN32_FLAGS) $(MAKE) libcommon.a
-	cd build-gpgv-win32/kbx && $(WIN32_FLAGS) $(MAKE) libkeybox.a
-	cd build-gpgv-win32/regexp && $(WIN32_FLAGS) $(MAKE) _unicode_mapping.c
-	cd build-gpgv-win32/regexp && $(WIN32_FLAGS) $(MAKE) libregexp.a
-	cd build-gpgv-win32/g10 && $(WIN32_FLAGS) $(MAKE) gpgv.exe
-	strip build-gpgv-win32/g10/gpgv.exe
-
-execute_after_dh_installdocs:
-	# These are already shipped in the respective packages
-	rm -vf \
-		debian/gnupg/usr/share/doc/gnupg/examples/systemd-user/*.service \
-		debian/gnupg/usr/share/doc/gnupg/examples/systemd-user/*.socket
-
 override_dh_auto_test:
 	dh_auto_test --builddirectory=build -- verbose=3 TESTFLAGS=$(AUTOTEST_FLAGS)
 
diff -pruN 2.4.7-17/debian/tests/control 2.4.7-17ubuntu3/debian/tests/control
--- 2.4.7-17/debian/tests/control	2025-04-15 16:19:27.000000000 +0000
+++ 2.4.7-17ubuntu3/debian/tests/control	2025-05-09 19:07:52.000000000 +0000
@@ -1,15 +1,4 @@
 Tests:
- gpgv-win32,
-Depends:
- gnupg,
- gpgv,
- gpgv-win32,
- wine32,
-Restrictions:
- allow-stderr,
-Architecture: i386
-
-Tests:
  simple-tests,
 Depends:
  gnupg,
