Bug#1108137: bookworm-pu: package gnupg2/2.2.40-1.1

[Andreas Metzler <ametzler@bebt.de>]

Package: release.debian.org
Severity: normal
Tags: bookworm
X-Debbugs-Cc: gnupg2@packages.debian.org, "Adam D. Barratt" <adam@adam-barratt.org.uk>
Control: affects -1 + src:gnupg2
User: release.debian.org@packages.debian.org
Usertags: pu

Hello,

gnupg2 in bookworm is not binNMU safe, with e.g. 
Package: gpg-agent
Architecture: any
Recommends:
 gnupg (= ${binary:Version}),

and gnupg being Architecture: all.

This has already been fixed in sid about a year ago, a recent stable
binNMU has shown this to be a real problem there, too.
https://alioth-lists.debian.net/pipermail/pkg-gnupg-maint/2025-June/010226.html

cu Andreas
-- 
`What a good friend you are to him, Dr. Maturin. His other friends are
so grateful to you.'
`I sew his ears on from time to time, sure'

diff --git a/debian/changelog b/debian/changelog
index 204f00862..bd8498fde 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+gnupg2 (2.2.40-1.1+deb12u1) bookworm; urgency=medium
+
+  * Make recommends on gnupg binNMU-safe.
+    Fixup recommends of architecture-any packages on architecture-all package
+    "gnupg" to use (= ${source:Version}) instead of binary:Version. (Thanks,
+    James McCoy) Closes: #1060366
+
+ -- Andreas Metzler <ametzler@debian.org>  Sat, 21 Jun 2025 10:26:29 +0200
+
 gnupg2 (2.2.40-1.1) unstable; urgency=medium
 
   * Non-maintainer upload.
diff --git a/debian/control b/debian/control
index 5ea6a0773..f134e85a3 100644
--- a/debian/control
+++ b/debian/control
@@ -90,7 +90,7 @@ Depends:
  ${misc:Depends},
  ${shlibs:Depends},
 Recommends:
- gnupg (= ${binary:Version}),
+ gnupg (= ${source:Version}),
  ${shlibs:Recommends},
 Suggests:
  dbus-user-session,
@@ -125,7 +125,7 @@ Depends:
  ${misc:Depends},
  ${shlibs:Depends},
 Recommends:
- gnupg (= ${binary:Version}),
+ gnupg (= ${source:Version}),
  ${shlibs:Recommends},
 Description: GNU privacy guard - Web Key Service server
  GnuPG is GNU's tool for secure communication and data storage.
@@ -152,7 +152,7 @@ Depends:
  ${misc:Depends},
  ${shlibs:Depends},
 Recommends:
- gnupg (= ${binary:Version}),
+ gnupg (= ${source:Version}),
  ${shlibs:Recommends},
 Description: GNU privacy guard - Web Key Service client
  GnuPG is GNU's tool for secure communication and data storage.
@@ -195,7 +195,7 @@ Depends:
  ${misc:Depends},
  ${shlibs:Depends},
 Recommends:
- gnupg (= ${binary:Version}),
+ gnupg (= ${source:Version}),
  ${shlibs:Recommends},
 Breaks:
  gnupg2 (<< 2.1.10-2),
@@ -219,7 +219,7 @@ Depends:
  ${misc:Depends},
  ${shlibs:Depends},
 Recommends:
- gnupg (= ${binary:Version}),
+ gnupg (= ${source:Version}),
  ${shlibs:Recommends},
 Breaks:
  gnupg (<< 2.1.21-4),
@@ -354,7 +354,7 @@ Depends:
  ${misc:Depends},
  ${shlibs:Depends},
 Recommends:
- gnupg (= ${binary:Version}),
+ gnupg (= ${source:Version}),
  ${shlibs:Recommends},
 Enhances:
  gpg,
diff --git a/debian/gbp.conf b/debian/gbp.conf
index cb11b4dde..f1d30b04b 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -1,5 +1,5 @@
 [DEFAULT]
-debian-branch = debian/unstable
+debian-branch = debian/12-bookworm
 pristine-tar = True
 upstream-vcs-tag = gnupg-%(version)s

Attachment: signature.asc
Description: PGP signature