gnupg2 (2.1.17-3) unstable; urgency=medium

  * more bugfixes from upstream (improving but not yet closing: #849845)

[dgit import unpatched gnupg2 2.1.17-3]

diff --cc debian/NEWS
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..0a6a7440de92bd8deb8e048996b6b46d432f8050
new file mode 100644 (file)
--- /dev/null
--- /dev/null
+++ b/debian/NEWS
@@@ -1,0 -1,0 +1,8 @@@
++gnupg2 (2.1.11-7+exp1) experimental; urgency=medium
++
++  The gnupg package now provides the "modern" version of GnuPG.
++
++  Please read /usr/share/doc/gnupg/README.Debian for details about the
++  transition from "classic" to "modern"
++
++ -- Daniel Kahn Gillmor <dkg@fifthhorseman.net>  Wed, 30 Mar 2016 09:59:35 -0400

diff --cc debian/Xsession.d/90gpg-agent
index 0000000000000000000000000000000000000000,b97c363c6a97d2becca5e6b52b1802ffa19b6178..b97c363c6a97d2becca5e6b52b1802ffa19b6178
mode 000000,100644..100644
--- /dev/null
--- 2/Xsession.d/90gpg-agent
+++ b/debian/Xsession.d/90gpg-agent

diff --cc debian/changelog
index 0000000000000000000000000000000000000000,e83fbe1236ef064433c2cda6032c9e2724f785e4..e83fbe1236ef064433c2cda6032c9e2724f785e4
mode 000000,100644..100644
--- /dev/null
--- 2/changelog
+++ b/debian/changelog

diff --cc debian/clean
index 0000000000000000000000000000000000000000,922f2c965e4c7492bc4826bfa9023cbe66204571..922f2c965e4c7492bc4826bfa9023cbe66204571
mode 000000,100644..100644
--- /dev/null
--- 2/clean
+++ b/debian/clean

diff --cc debian/compat
index 0000000000000000000000000000000000000000,ec635144f60048986bc560c5576355344005e6e7..ec635144f60048986bc560c5576355344005e6e7
mode 000000,100644..100644
--- /dev/null
--- 2/compat
+++ b/debian/compat

diff --cc debian/control
index 0000000000000000000000000000000000000000,c97655872569bb85db28df5bc4d9d3d58b2074d7..c97655872569bb85db28df5bc4d9d3d58b2074d7
mode 000000,100644..100644
--- /dev/null
--- 2/control
+++ b/debian/control

diff --cc debian/copyright
index 0000000000000000000000000000000000000000,5676d8159a7512fb483c789b0af47f5ae9202ea0..5676d8159a7512fb483c789b0af47f5ae9202ea0
mode 000000,100644..100644
--- /dev/null
--- 2/copyright
+++ b/debian/copyright

diff --cc debian/dirmngr.NEWS
index 0000000000000000000000000000000000000000,bd0ccb756ca489587d5ab19761b5131993c01ead..bd0ccb756ca489587d5ab19761b5131993c01ead
mode 000000,100644..100644
--- /dev/null
--- 2/dirmngr.NEWS
+++ b/debian/dirmngr.NEWS

diff --cc debian/dirmngr.README.Debian
index 0000000000000000000000000000000000000000,4fd9156d9044f5617dda7c5445240d7390c9f13b..4fd9156d9044f5617dda7c5445240d7390c9f13b
mode 000000,100644..100644
--- /dev/null
--- 2/dirmngr.README.Debian
+++ b/debian/dirmngr.README.Debian

diff --cc debian/dirmngr.docs
index 0000000000000000000000000000000000000000,817be4059071de4c9c3ac043bb296ba9d244c94f..817be4059071de4c9c3ac043bb296ba9d244c94f
mode 000000,100644..100644
--- /dev/null
--- 2/dirmngr.docs
+++ b/debian/dirmngr.docs

diff --cc debian/dirmngr.install
index 0000000000000000000000000000000000000000,1e77641849c0cb81c533f7225a4e8536d62dacad..1e77641849c0cb81c533f7225a4e8536d62dacad
mode 000000,100644..100644
--- /dev/null
--- 2/dirmngr.install
+++ b/debian/dirmngr.install

diff --cc debian/dirmngr.maintscript
index 0000000000000000000000000000000000000000,aa11aa5db626d3e57964dac0e38176aeb12b2f8b..aa11aa5db626d3e57964dac0e38176aeb12b2f8b
mode 000000,100644..100644
--- /dev/null
--- 2/dirmngr.maintscript
+++ b/debian/dirmngr.maintscript

diff --cc debian/dirmngr.manpages
index 0000000000000000000000000000000000000000,93702d95ba6cbc0bbc22d2c6c1d83f9f25151ba4..93702d95ba6cbc0bbc22d2c6c1d83f9f25151ba4
mode 000000,100644..100644
--- /dev/null
--- 2/dirmngr.manpages
+++ b/debian/dirmngr.manpages

diff --cc debian/gbp.conf
index 0000000000000000000000000000000000000000,1789fc2a809196b53eb61c25f66857e40a477b75..1789fc2a809196b53eb61c25f66857e40a477b75
mode 000000,100644..100644
--- /dev/null
--- 2/gbp.conf
+++ b/debian/gbp.conf

diff --cc debian/gnupg-agent.NEWS
index 0000000000000000000000000000000000000000,72cdeb4d24a651d95bc34c640063430351992a70..72cdeb4d24a651d95bc34c640063430351992a70
mode 000000,100644..100644
--- /dev/null
--- 2/gnupg-agent.NEWS
+++ b/debian/gnupg-agent.NEWS

diff --cc debian/gnupg-agent.README.Debian
index 0000000000000000000000000000000000000000,dd4e51a70d4aea92670ea97f9cb04ecbe3c87181..dd4e51a70d4aea92670ea97f9cb04ecbe3c87181
mode 000000,100644..100644
--- /dev/null
--- 2/gnupg-agent.README.Debian
+++ b/debian/gnupg-agent.README.Debian

diff --cc debian/gnupg-agent.examples
index 0000000000000000000000000000000000000000,34213be704708374d6cf593f729cc72042f88990..34213be704708374d6cf593f729cc72042f88990
mode 000000,100644..100644
--- /dev/null
--- 2/gnupg-agent.examples
+++ b/debian/gnupg-agent.examples

diff --cc debian/gnupg-agent.install
index 0000000000000000000000000000000000000000,2a4dcbe0af9852ed8e6f8c8a34085942412c5981..2a4dcbe0af9852ed8e6f8c8a34085942412c5981
mode 000000,100644..100644
--- /dev/null
--- 2/gnupg-agent.install
+++ b/debian/gnupg-agent.install

diff --cc debian/gnupg-agent.links
index 0000000000000000000000000000000000000000,292770149d98aa011b97684ebc9fe7b44cad26f9..292770149d98aa011b97684ebc9fe7b44cad26f9
mode 000000,100644..100644
--- /dev/null
--- 2/gnupg-agent.links
+++ b/debian/gnupg-agent.links

diff --cc debian/gnupg-agent.manpages
index 0000000000000000000000000000000000000000,481983199f20dee5ba61e3f7ff3f1e0329105a25..481983199f20dee5ba61e3f7ff3f1e0329105a25
mode 000000,100644..100644
--- /dev/null
--- 2/gnupg-agent.manpages
+++ b/debian/gnupg-agent.manpages

diff --cc debian/gnupg-l10n.install
index 0000000000000000000000000000000000000000,9aaad8228f09e8ee2761dbd56c2b1efa98f46438..9aaad8228f09e8ee2761dbd56c2b1efa98f46438
mode 000000,100644..100644
--- /dev/null
--- 2/gnupg-l10n.install
+++ b/debian/gnupg-l10n.install

diff --cc debian/gnupg.README.Debian
index 0000000000000000000000000000000000000000,24944d3766fa844f9212597b8dee1ebd2ceb9ae2..24944d3766fa844f9212597b8dee1ebd2ceb9ae2
mode 000000,100644..100644
--- /dev/null
--- 2/gnupg.README.Debian
+++ b/debian/gnupg.README.Debian

diff --cc debian/gnupg.docs
index 0000000000000000000000000000000000000000,b182260a2c4832650bf3047768301745d7b3ab00..b182260a2c4832650bf3047768301745d7b3ab00
mode 000000,100644..100644
--- /dev/null
--- 2/gnupg.docs
+++ b/debian/gnupg.docs

diff --cc debian/gnupg.examples
index 0000000000000000000000000000000000000000,3e74b9468feeb297ceb748171cc34662460f1ced..3e74b9468feeb297ceb748171cc34662460f1ced
mode 000000,100644..100644
--- /dev/null
--- 2/gnupg.examples
+++ b/debian/gnupg.examples

diff --cc debian/gnupg.info
index 0000000000000000000000000000000000000000,e4baa0fcd6fac95c23859a47f41b0456df9c563e..e4baa0fcd6fac95c23859a47f41b0456df9c563e
mode 000000,100644..100644
--- /dev/null
--- 2/gnupg.info
+++ b/debian/gnupg.info

diff --cc debian/gnupg.install
index 0000000000000000000000000000000000000000,12fb91363ae1c6c3842b34e37fd3cce1ce455618..12fb91363ae1c6c3842b34e37fd3cce1ce455618
mode 000000,100644..100644
--- /dev/null
--- 2/gnupg.install
+++ b/debian/gnupg.install

diff --cc debian/gnupg.manpages
index 0000000000000000000000000000000000000000,4fc76c3fa73776cb028cf2aff2ce089ed8497f0c..4fc76c3fa73776cb028cf2aff2ce089ed8497f0c
mode 000000,100644..100644
--- /dev/null
--- 2/gnupg.manpages
+++ b/debian/gnupg.manpages

diff --cc debian/gnupg2.links
index 0000000000000000000000000000000000000000,96fde98874a271cb6925b37a4491caf561230774..96fde98874a271cb6925b37a4491caf561230774
mode 000000,100644..100644
--- /dev/null
--- 2/gnupg2.links
+++ b/debian/gnupg2.links

diff --cc debian/gpg-check-pattern.1
index 0000000000000000000000000000000000000000,05dbc1ee14e58741eb8256837dc0bfa0f9fdcd3e..05dbc1ee14e58741eb8256837dc0bfa0f9fdcd3e
mode 000000,100644..100644
--- /dev/null
--- 2/gpg-check-pattern.1
+++ b/debian/gpg-check-pattern.1

diff --cc debian/gpg-zip.1
index 0000000000000000000000000000000000000000,cba5db4753442ef4272ecf23ccc4ea89de47e7c9..cba5db4753442ef4272ecf23ccc4ea89de47e7c9
mode 000000,100644..100644
--- /dev/null
--- 2/gpg-zip.1
+++ b/debian/gpg-zip.1

diff --cc debian/gpgsm.install
index 0000000000000000000000000000000000000000,882260742124fa82bf6930fe128ff94e24dcd437..882260742124fa82bf6930fe128ff94e24dcd437
mode 000000,100644..100644
--- /dev/null
--- 2/gpgsm.install
+++ b/debian/gpgsm.install

diff --cc debian/gpgsm.manpages
index 0000000000000000000000000000000000000000,ad6a6866f626ef7f784366efc9d65c73b2434971..ad6a6866f626ef7f784366efc9d65c73b2434971
mode 000000,100644..100644
--- /dev/null
--- 2/gpgsm.manpages
+++ b/debian/gpgsm.manpages

diff --cc debian/gpgsplit.1
index 0000000000000000000000000000000000000000,116ce89c7c3cb1b3dd5fdfd6d81ca68eb245bee6..116ce89c7c3cb1b3dd5fdfd6d81ca68eb245bee6
mode 000000,100644..100644
--- /dev/null
--- 2/gpgsplit.1
+++ b/debian/gpgsplit.1

diff --cc debian/gpgv-static.1
index 0000000000000000000000000000000000000000,c8dcc1aff558687e7409925e4a969bbb0bdc05eb..c8dcc1aff558687e7409925e4a969bbb0bdc05eb
mode 000000,100644..100644
--- /dev/null
--- 2/gpgv-static.1
+++ b/debian/gpgv-static.1

diff --cc debian/gpgv-static.install
index 0000000000000000000000000000000000000000,adb6deb21d3ce7474bbcc8cfe30186358ec07db7..adb6deb21d3ce7474bbcc8cfe30186358ec07db7
mode 000000,100644..100644
--- /dev/null
--- 2/gpgv-static.install
+++ b/debian/gpgv-static.install

diff --cc debian/gpgv-static.lintian-overrides
index 0000000000000000000000000000000000000000,fa0b8dfbc5995641a22bdde0b58a0b40265f97ae..fa0b8dfbc5995641a22bdde0b58a0b40265f97ae
mode 000000,100644..100644
--- /dev/null
--- 2/gpgv-static.lintian-overrides
+++ b/debian/gpgv-static.lintian-overrides

diff --cc debian/gpgv-static.manpages
index 0000000000000000000000000000000000000000,e3f73aa9f5c3cf80e9916b18f109d48fc57898d8..e3f73aa9f5c3cf80e9916b18f109d48fc57898d8
mode 000000,100644..100644
--- /dev/null
--- 2/gpgv-static.manpages
+++ b/debian/gpgv-static.manpages

diff --cc debian/gpgv-udeb.install
index 0000000000000000000000000000000000000000,fe275338e30442beb7b334f2db55a95edfe2d8d4..fe275338e30442beb7b334f2db55a95edfe2d8d4
mode 000000,100644..100644
--- /dev/null
--- 2/gpgv-udeb.install
+++ b/debian/gpgv-udeb.install

diff --cc debian/gpgv-win32.install
index 0000000000000000000000000000000000000000,cf3cd8cc45d8c5b6b6320d6336976ced0f70cb19..cf3cd8cc45d8c5b6b6320d6336976ced0f70cb19
mode 000000,100644..100644
--- /dev/null
--- 2/gpgv-win32.install
+++ b/debian/gpgv-win32.install

diff --cc debian/gpgv.install
index 0000000000000000000000000000000000000000,0a9f9a22afcbf947090c1a62080bcd24ccc2387e..0a9f9a22afcbf947090c1a62080bcd24ccc2387e
mode 000000,100644..100644
--- /dev/null
--- 2/gpgv.install
+++ b/debian/gpgv.install

diff --cc debian/gpgv.manpages
index 0000000000000000000000000000000000000000,86a9e29214d0e07c5f875e59c836aaa2409f9117..86a9e29214d0e07c5f875e59c836aaa2409f9117
mode 000000,100644..100644
--- /dev/null
--- 2/gpgv.manpages
+++ b/debian/gpgv.manpages

diff --cc debian/gpgv2.links
index 0000000000000000000000000000000000000000,5107429ec235c7921c3f591baba6ca2667c9be8a..5107429ec235c7921c3f591baba6ca2667c9be8a
mode 000000,100644..100644
--- /dev/null
--- 2/gpgv2.links
+++ b/debian/gpgv2.links

diff --cc debian/kbxutil.1
index 0000000000000000000000000000000000000000,52b338a4498558fbda37f6d46792b248674d8f6d..52b338a4498558fbda37f6d46792b248674d8f6d
mode 000000,100644..100644
--- /dev/null
--- 2/kbxutil.1
+++ b/debian/kbxutil.1

diff --cc debian/lspgpot.1
index 0000000000000000000000000000000000000000,ba27eca550d3f1e142b62756630e85caf6c2840a..ba27eca550d3f1e142b62756630e85caf6c2840a
mode 000000,100644..100644
--- /dev/null
--- 2/lspgpot.1
+++ b/debian/lspgpot.1

diff --cc debian/migrate-pubring-from-classic-gpg
index 0000000000000000000000000000000000000000,13ee1f8a486d4905becee091957fe51f2e5e335d..13ee1f8a486d4905becee091957fe51f2e5e335d
mode 000000,100755..100755
--- /dev/null
--- 2/migrate-pubring-from-classic-gpg
+++ b/debian/migrate-pubring-from-classic-gpg

diff --cc debian/migrate-pubring-from-classic-gpg.1
index 0000000000000000000000000000000000000000,4d26b894b52188831d7fb48639c04d5cfe9fa1cf..4d26b894b52188831d7fb48639c04d5cfe9fa1cf
mode 000000,100644..100644
--- /dev/null
--- 2/migrate-pubring-from-classic-gpg.1
+++ b/debian/migrate-pubring-from-classic-gpg.1

diff --cc debian/patches/0012-gpgscm-Guard-use-of-union-member.patch
index 0000000000000000000000000000000000000000,f44bfe6ed8768b0c8b5462482f70550a507de176..f44bfe6ed8768b0c8b5462482f70550a507de176
mode 000000,100644..100644
--- /dev/null
--- 2/patches/0012-gpgscm-Guard-use-of-union-member.patch
+++ b/debian/patches/0012-gpgscm-Guard-use-of-union-member.patch

diff --cc debian/patches/0013-dirmngr-Fix-for-disable-libdns-usage.patch
index 0000000000000000000000000000000000000000,b429d8ef5e1dc38b089f89cad65855f25548ebeb..b429d8ef5e1dc38b089f89cad65855f25548ebeb
mode 000000,100644..100644
--- /dev/null
--- 2/patches/0013-dirmngr-Fix-for-disable-libdns-usage.patch
+++ b/debian/patches/0013-dirmngr-Fix-for-disable-libdns-usage.patch

diff --cc debian/patches/0014-dirmngr-Strip-root-zone-suffix-from-libdns-cname-res.patch
index 0000000000000000000000000000000000000000,bc4cc3a8a8b487e5463d9a40b6debb7220ea06cd..bc4cc3a8a8b487e5463d9a40b6debb7220ea06cd
mode 000000,100644..100644
--- /dev/null
--- 2/patches/0014-dirmngr-Strip-root-zone-suffix-from-libdns-cname-res.patch
+++ b/debian/patches/0014-dirmngr-Strip-root-zone-suffix-from-libdns-cname-res.patch

diff --cc debian/patches/0015-doc-Remove-warning-that-DNS-is-not-routed-via-Tor.patch
index 0000000000000000000000000000000000000000,89adfaf2a6afcef35467ccf8d8f3d77f9c4e0b27..89adfaf2a6afcef35467ccf8d8f3d77f9c4e0b27
mode 000000,100644..100644
--- /dev/null
--- 2/patches/0015-doc-Remove-warning-that-DNS-is-not-routed-via-Tor.patch
+++ b/debian/patches/0015-doc-Remove-warning-that-DNS-is-not-routed-via-Tor.patch

diff --cc debian/patches/0016-build-Enable-gcc-warnings-to-detect-non-portable-cod.patch
index 0000000000000000000000000000000000000000,3ea836fbfb85eb1e0315fff68db83b866dffc6c6..3ea836fbfb85eb1e0315fff68db83b866dffc6c6
mode 000000,100644..100644
--- /dev/null
--- 2/patches/0016-build-Enable-gcc-warnings-to-detect-non-portable-cod.patch
+++ b/debian/patches/0016-build-Enable-gcc-warnings-to-detect-non-portable-cod.patch

diff --cc debian/patches/0017-Replace-use-of-variable-length-arrays.patch
index 0000000000000000000000000000000000000000,3e3a2a7e33fc8eaeaf45bc531ae886e8cf9f5679..3e3a2a7e33fc8eaeaf45bc531ae886e8cf9f5679
mode 000000,100644..100644
--- /dev/null
--- 2/patches/0017-Replace-use-of-variable-length-arrays.patch
+++ b/debian/patches/0017-Replace-use-of-variable-length-arrays.patch

diff --cc debian/patches/0018-dirmngr-New-debug-message-on-correctly-initialized-l.patch
index 0000000000000000000000000000000000000000,927f7e3e7978731d059bd1533be4ada21bb9d05f..927f7e3e7978731d059bd1533be4ada21bb9d05f
mode 000000,100644..100644
--- /dev/null
--- 2/patches/0018-dirmngr-New-debug-message-on-correctly-initialized-l.patch
+++ b/debian/patches/0018-dirmngr-New-debug-message-on-correctly-initialized-l.patch

diff --cc debian/patches/0019-dirmngr-Make-sure-Tor-mode-is-also-set-for-DNS-on-SI.patch
index 0000000000000000000000000000000000000000,2c02c2eb9a017d66a94e349d4f591a8a3592d139..2c02c2eb9a017d66a94e349d4f591a8a3592d139
mode 000000,100644..100644
--- /dev/null
--- 2/patches/0019-dirmngr-Make-sure-Tor-mode-is-also-set-for-DNS-on-SI.patch
+++ b/debian/patches/0019-dirmngr-Make-sure-Tor-mode-is-also-set-for-DNS-on-SI.patch

diff --cc debian/patches/0020-doc-Extend-dirmngr-s-allow-version-check-description.patch
index 0000000000000000000000000000000000000000,1ca5f4fc81b385ee90e01b6beef8efef58b46894..1ca5f4fc81b385ee90e01b6beef8efef58b46894
mode 000000,100644..100644
--- /dev/null
--- 2/patches/0020-doc-Extend-dirmngr-s-allow-version-check-description.patch
+++ b/debian/patches/0020-doc-Extend-dirmngr-s-allow-version-check-description.patch

diff --cc debian/patches/0021-doc-Add-release-announcement-pointers-to-NEWS-entrie.patch
index 0000000000000000000000000000000000000000,e3fdecd6116748c42ac252599dddb6f80e40517e..e3fdecd6116748c42ac252599dddb6f80e40517e
mode 000000,100644..100644
--- /dev/null
--- 2/patches/0021-doc-Add-release-announcement-pointers-to-NEWS-entrie.patch
+++ b/debian/patches/0021-doc-Add-release-announcement-pointers-to-NEWS-entrie.patch

diff --cc debian/patches/0022-g10-avoid-warning-when-disable-tofu.patch
index 0000000000000000000000000000000000000000,4443007fe3b9bfcf5d5e006a75293a009a2fb287..4443007fe3b9bfcf5d5e006a75293a009a2fb287
mode 000000,100644..100644
--- /dev/null
--- 2/patches/0022-g10-avoid-warning-when-disable-tofu.patch
+++ b/debian/patches/0022-g10-avoid-warning-when-disable-tofu.patch

diff --cc debian/patches/0023-doc-Mention-gpgv-in-the-description-of-gpg-verify.patch
index 0000000000000000000000000000000000000000,a05c7422807597330d879872b0f44e3052363c66..a05c7422807597330d879872b0f44e3052363c66
mode 000000,100644..100644
--- /dev/null
--- 2/patches/0023-doc-Mention-gpgv-in-the-description-of-gpg-verify.patch
+++ b/debian/patches/0023-doc-Mention-gpgv-in-the-description-of-gpg-verify.patch

diff --cc debian/patches/0024-Silence-two-Wlogical-op-warnings.patch
index 0000000000000000000000000000000000000000,78fd134266b7905bf81b4abbdd4afe716b6f50eb..78fd134266b7905bf81b4abbdd4afe716b6f50eb
mode 000000,100644..100644
--- /dev/null
--- 2/patches/0024-Silence-two-Wlogical-op-warnings.patch
+++ b/debian/patches/0024-Silence-two-Wlogical-op-warnings.patch

diff --cc debian/patches/0025-doc-Document-summary-values-of-TOFU_STATS.patch
index 0000000000000000000000000000000000000000,1ee390fe61ee81ef922b329fffe6ed9bda8a6a25..1ee390fe61ee81ef922b329fffe6ed9bda8a6a25
mode 000000,100644..100644
--- /dev/null
--- 2/patches/0025-doc-Document-summary-values-of-TOFU_STATS.patch
+++ b/debian/patches/0025-doc-Document-summary-values-of-TOFU_STATS.patch

diff --cc debian/patches/block-ptrace-on-agent/0002-Avoid-simple-memory-dumps-via-ptrace.patch
index 0000000000000000000000000000000000000000,50d46f36eaf759c984ee2f55e767e9a17a668336..50d46f36eaf759c984ee2f55e767e9a17a668336
mode 000000,100644..100644
--- /dev/null
--- 2/patches/block-ptrace-on-agent/0002-Avoid-simple-memory-dumps-via-ptrace.patch
+++ b/debian/patches/block-ptrace-on-agent/0002-Avoid-simple-memory-dumps-via-ptrace.patch

diff --cc debian/patches/debian-packaging/0001-avoid-beta-warning.patch
index 0000000000000000000000000000000000000000,f541c1a09c1d7af01fb10822e9dd95980f804db2..f541c1a09c1d7af01fb10822e9dd95980f804db2
mode 000000,100644..100644
--- /dev/null
--- 2/patches/debian-packaging/0001-avoid-beta-warning.patch
+++ b/debian/patches/debian-packaging/0001-avoid-beta-warning.patch

diff --cc debian/patches/debian-packaging/0003-avoid-regenerating-defsincdate-use-shipped-file.patch
index 0000000000000000000000000000000000000000,c141e4f927fc6f597a1bf3322914cb3b4536263e..c141e4f927fc6f597a1bf3322914cb3b4536263e
mode 000000,100644..100644
--- /dev/null
--- 2/patches/debian-packaging/0003-avoid-regenerating-defsincdate-use-shipped-file.patch
+++ b/debian/patches/debian-packaging/0003-avoid-regenerating-defsincdate-use-shipped-file.patch

diff --cc debian/patches/dirmngr-idling/0001-dirmngr-hkp-Avoid-potential-race-condition-when-some.patch
index 0000000000000000000000000000000000000000,2020da7300c0f451229b0022e48ed53641dcee44..2020da7300c0f451229b0022e48ed53641dcee44
mode 000000,100644..100644
--- /dev/null
--- 2/patches/dirmngr-idling/0001-dirmngr-hkp-Avoid-potential-race-condition-when-some.patch
+++ b/debian/patches/dirmngr-idling/0001-dirmngr-hkp-Avoid-potential-race-condition-when-some.patch

diff --cc debian/patches/dirmngr-idling/0002-dimrngr-Avoid-need-for-hkp-housekeeping.patch
index 0000000000000000000000000000000000000000,75f4b908fe7b8075a2a2f0a33a611dfce6250c90..75f4b908fe7b8075a2a2f0a33a611dfce6250c90
mode 000000,100644..100644
--- /dev/null
--- 2/patches/dirmngr-idling/0002-dimrngr-Avoid-need-for-hkp-housekeeping.patch
+++ b/debian/patches/dirmngr-idling/0002-dimrngr-Avoid-need-for-hkp-housekeeping.patch

diff --cc debian/patches/dirmngr-idling/0004-dirmngr-Avoid-automatically-checking-upstream-swdb.patch
index 0000000000000000000000000000000000000000,0851a62b179d76f132987ecc9aa2c963a079f9f5..0851a62b179d76f132987ecc9aa2c963a079f9f5
mode 000000,100644..100644
--- /dev/null
--- 2/patches/dirmngr-idling/0004-dirmngr-Avoid-automatically-checking-upstream-swdb.patch
+++ b/debian/patches/dirmngr-idling/0004-dirmngr-Avoid-automatically-checking-upstream-swdb.patch

diff --cc debian/patches/dirmngr-idling/0005-dirmngr-Drop-useless-housekeeping.patch
index 0000000000000000000000000000000000000000,affb982552ef3cdd6730d1acb86feed26db777cf..affb982552ef3cdd6730d1acb86feed26db777cf
mode 000000,100644..100644
--- /dev/null
--- 2/patches/dirmngr-idling/0005-dirmngr-Drop-useless-housekeeping.patch
+++ b/debian/patches/dirmngr-idling/0005-dirmngr-Drop-useless-housekeeping.patch

diff --cc debian/patches/gpg-agent-idling/0001-agent-Create-framework-of-scheduled-timers.patch
index 0000000000000000000000000000000000000000,b7581176d11d1bd586bc66bf3c1408cdfa5fa662..b7581176d11d1bd586bc66bf3c1408cdfa5fa662
mode 000000,100644..100644
--- /dev/null
--- 2/patches/gpg-agent-idling/0001-agent-Create-framework-of-scheduled-timers.patch
+++ b/debian/patches/gpg-agent-idling/0001-agent-Create-framework-of-scheduled-timers.patch

diff --cc debian/patches/gpg-agent-idling/0002-agent-Allow-threads-to-interrupt-main-select-loop-wi.patch
index 0000000000000000000000000000000000000000,6d294d3fa7d690b38e2daaecd62b733febae569b..6d294d3fa7d690b38e2daaecd62b733febae569b
mode 000000,100644..100644
--- /dev/null
--- 2/patches/gpg-agent-idling/0002-agent-Allow-threads-to-interrupt-main-select-loop-wi.patch
+++ b/debian/patches/gpg-agent-idling/0002-agent-Allow-threads-to-interrupt-main-select-loop-wi.patch

diff --cc debian/patches/gpg-agent-idling/0003-agent-Avoid-tight-timer-tick-when-possible.patch
index 0000000000000000000000000000000000000000,c1d8ee065123a8c1811659bb58898b1df0857595..c1d8ee065123a8c1811659bb58898b1df0857595
mode 000000,100644..100644
--- /dev/null
--- 2/patches/gpg-agent-idling/0003-agent-Avoid-tight-timer-tick-when-possible.patch
+++ b/debian/patches/gpg-agent-idling/0003-agent-Avoid-tight-timer-tick-when-possible.patch

diff --cc debian/patches/gpg-agent-idling/0004-agent-Avoid-scheduled-checks-on-socket-when-inotify-.patch
index 0000000000000000000000000000000000000000,6a565ea19ccf83d42d06162c23562b2da9bb31fe..6a565ea19ccf83d42d06162c23562b2da9bb31fe
mode 000000,100644..100644
--- /dev/null
--- 2/patches/gpg-agent-idling/0004-agent-Avoid-scheduled-checks-on-socket-when-inotify-.patch
+++ b/debian/patches/gpg-agent-idling/0004-agent-Avoid-scheduled-checks-on-socket-when-inotify-.patch

diff --cc debian/patches/series
index 0000000000000000000000000000000000000000,1ea9189608da68a072af40de3590b4a5ec135142..1ea9189608da68a072af40de3590b4a5ec135142
mode 000000,100644..100644
--- /dev/null
--- 2/patches/series
+++ b/debian/patches/series

diff --cc debian/rules
index 0000000000000000000000000000000000000000,241cead5365017ab53e83966f10f94c1915961e0..241cead5365017ab53e83966f10f94c1915961e0
mode 000000,100755..100755
--- /dev/null
--- 2/rules
+++ b/debian/rules

diff --cc debian/scdaemon.examples
index 0000000000000000000000000000000000000000,29f41a866e4c59ac57408d5a98f59c13b8b9bfe3..29f41a866e4c59ac57408d5a98f59c13b8b9bfe3
mode 000000,100644..100644
--- /dev/null
--- 2/scdaemon.examples
+++ b/debian/scdaemon.examples

diff --cc debian/scdaemon.install
index 0000000000000000000000000000000000000000,a2a79aa3f77fbeeb62eb4cbf0f27cfea3545f52d..a2a79aa3f77fbeeb62eb4cbf0f27cfea3545f52d
mode 000000,100644..100644
--- /dev/null
--- 2/scdaemon.install
+++ b/debian/scdaemon.install

diff --cc debian/scdaemon.lintian-overrides
index 0000000000000000000000000000000000000000,b575cb12a2ab8371d5a13246376d3fd8080efcde..b575cb12a2ab8371d5a13246376d3fd8080efcde
mode 000000,100644..100644
--- /dev/null
--- 2/scdaemon.lintian-overrides
+++ b/debian/scdaemon.lintian-overrides

diff --cc debian/scdaemon.manpages
index 0000000000000000000000000000000000000000,9efee236e7a7c290ac9fc459f477d3e0055c7d66..9efee236e7a7c290ac9fc459f477d3e0055c7d66
mode 000000,100644..100644
--- /dev/null
--- 2/scdaemon.manpages
+++ b/debian/scdaemon.manpages

diff --cc debian/scdaemon.udev
index 0000000000000000000000000000000000000000,d2efb555405ca6e493f63a0aa162c374bced89c9..d2efb555405ca6e493f63a0aa162c374bced89c9
mode 000000,100644..100644
--- /dev/null
--- 2/scdaemon.udev
+++ b/debian/scdaemon.udev

diff --cc debian/source/format
index 0000000000000000000000000000000000000000,163aaf8d82b6c54f23c45f32895dbdfdcc27b047..163aaf8d82b6c54f23c45f32895dbdfdcc27b047
mode 000000,100644..100644
--- /dev/null
--- 2/source/format
+++ b/debian/source/format

diff --cc debian/source/lintian-overrides
index 0000000000000000000000000000000000000000,b5221c74ec5233cd172f00bed1fe2710dae35858..b5221c74ec5233cd172f00bed1fe2710dae35858
mode 000000,100644..100644
--- /dev/null
--- 2/source/lintian-overrides
+++ b/debian/source/lintian-overrides

diff --cc debian/source/options
index 0000000000000000000000000000000000000000,f0f8edeefed917b889299190502e96369f182154..f0f8edeefed917b889299190502e96369f182154
mode 000000,100644..100644
--- /dev/null
--- 2/source/options
+++ b/debian/source/options

diff --cc debian/systemd-user/gpg-agent-browser.socket
index 0000000000000000000000000000000000000000,67690ceeda0e43cfbdcf54a2e84a60efbb3af05c..67690ceeda0e43cfbdcf54a2e84a60efbb3af05c
mode 000000,100644..100644
--- /dev/null
--- 2/systemd-user/gpg-agent-browser.socket
+++ b/debian/systemd-user/gpg-agent-browser.socket

diff --cc debian/tests/control
index 0000000000000000000000000000000000000000,91788216887411d3bb759582281b5aacec9c960f..91788216887411d3bb759582281b5aacec9c960f
mode 000000,100644..100644
--- /dev/null
--- 2/tests/control
+++ b/debian/tests/control

diff --cc debian/tests/gpgv-win32
index 0000000000000000000000000000000000000000,3142a6599ca04bbe2f3a83702905f31cb93b58bb..3142a6599ca04bbe2f3a83702905f31cb93b58bb
mode 000000,100755..100755
--- /dev/null
--- 2/tests/gpgv-win32
+++ b/debian/tests/gpgv-win32

diff --cc debian/upstream/signing-key.asc
index 0000000000000000000000000000000000000000,1e5759994090428def798d179002a5f627db129d..1e5759994090428def798d179002a5f627db129d
mode 000000,100644..100644
--- /dev/null
--- 2/upstream/signing-key.asc
+++ b/debian/upstream/signing-key.asc

diff --cc debian/watch
index 0000000000000000000000000000000000000000,e6d36a173a72a57eacf64688c79cde5b43b8fc7d..e6d36a173a72a57eacf64688c79cde5b43b8fc7d
mode 000000,100644..100644
--- /dev/null
--- 2/watch
+++ b/debian/watch