gnupg2 (2.1.18-6) unstable; urgency=medium

  [ NIIBE Yutaka ]
  * scdaemon: Fix duplicated entries (Closes: #855056).

[dgit import unpatched gnupg2 2.1.18-6]

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,8b45b05dba8ffb33da1f4cbcc49692af45492341..8b45b05dba8ffb33da1f4cbcc49692af45492341
mode 000000,100644..100644
--- /dev/null
--- 2/Xsession.d/90gpg-agent
+++ b/debian/Xsession.d/90gpg-agent

diff --cc debian/changelog
index 0000000000000000000000000000000000000000,4167d38b905f657b9a929c624f0db0dcf1873491..4167d38b905f657b9a929c624f0db0dcf1873491
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,ac0b07907ee3a04997bd6028da7d0a45c3c2c27f..ac0b07907ee3a04997bd6028da7d0a45c3c2c27f
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,b0c550f8a82ad58ebba764857e835425cf640aa4..b0c550f8a82ad58ebba764857e835425cf640aa4
mode 000000,100644..100644
--- /dev/null
--- 2/dirmngr.NEWS
+++ b/debian/dirmngr.NEWS

diff --cc debian/dirmngr.README.Debian
index 0000000000000000000000000000000000000000,099240adb56621c5b780e089bf0b98222d891c79..099240adb56621c5b780e089bf0b98222d891c79
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.links
index 0000000000000000000000000000000000000000,ca801e7b50bba2872db1f588335fbfbba0b03c51..ca801e7b50bba2872db1f588335fbfbba0b03c51
mode 000000,100644..100644
--- /dev/null
--- 2/dirmngr.links
+++ b/debian/dirmngr.links

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,69b4e49546fe7396f9530da1613a2afa2f5ee124..69b4e49546fe7396f9530da1613a2afa2f5ee124
mode 000000,100644..100644
--- /dev/null
--- 2/gnupg-agent.NEWS
+++ b/debian/gnupg-agent.NEWS

diff --cc debian/gnupg-agent.README.Debian
index 0000000000000000000000000000000000000000,f57d278f5394b4d98ba6cdb2dd84f9cf48106911..f57d278f5394b4d98ba6cdb2dd84f9cf48106911
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,90f6ce115ef52fb7bae138d6271328fd0cf997d4..90f6ce115ef52fb7bae138d6271328fd0cf997d4
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-tools-Fix-memory-leak.patch
index 0000000000000000000000000000000000000000,4d47557dc9460a5f9d40fc88b0daab4ba1cf9b31..4d47557dc9460a5f9d40fc88b0daab4ba1cf9b31
mode 000000,100644..100644
--- /dev/null
--- 2/patches/0012-tools-Fix-memory-leak.patch
+++ b/debian/patches/0012-tools-Fix-memory-leak.patch

diff --cc debian/patches/0013-tools-Improve-error-handling.patch
index 0000000000000000000000000000000000000000,b0034da3ba13b70a0609d27782e81a89a068ebd3..b0034da3ba13b70a0609d27782e81a89a068ebd3
mode 000000,100644..100644
--- /dev/null
--- 2/patches/0013-tools-Improve-error-handling.patch
+++ b/debian/patches/0013-tools-Improve-error-handling.patch

diff --cc debian/patches/0014-dirmngr-New-option-disable-ipv4.patch
index 0000000000000000000000000000000000000000,0aa0549b5ad55b75d7478294e7fe948e585de9dd..0aa0549b5ad55b75d7478294e7fe948e585de9dd
mode 000000,100644..100644
--- /dev/null
--- 2/patches/0014-dirmngr-New-option-disable-ipv4.patch
+++ b/debian/patches/0014-dirmngr-New-option-disable-ipv4.patch

diff --cc debian/patches/0015-dirmngr-Simplify-error-returning-inside-http.c.patch
index 0000000000000000000000000000000000000000,bcf4ee6988a75d33290328c21ca5fb65859a78eb..bcf4ee6988a75d33290328c21ca5fb65859a78eb
mode 000000,100644..100644
--- /dev/null
--- 2/patches/0015-dirmngr-Simplify-error-returning-inside-http.c.patch
+++ b/debian/patches/0015-dirmngr-Simplify-error-returning-inside-http.c.patch

diff --cc debian/patches/0016-gpg-Print-a-warning-on-Tor-problems.patch
index 0000000000000000000000000000000000000000,197906982fd73168121a47102502ab258104f7f1..197906982fd73168121a47102502ab258104f7f1
mode 000000,100644..100644
--- /dev/null
--- 2/patches/0016-gpg-Print-a-warning-on-Tor-problems.patch
+++ b/debian/patches/0016-gpg-Print-a-warning-on-Tor-problems.patch

diff --cc debian/patches/0017-agent-Fix-double-free.patch
index 0000000000000000000000000000000000000000,b3d96edc4aa370a7be46a7eee9573646475c76eb..b3d96edc4aa370a7be46a7eee9573646475c76eb
mode 000000,100644..100644
--- /dev/null
--- 2/patches/0017-agent-Fix-double-free.patch
+++ b/debian/patches/0017-agent-Fix-double-free.patch

diff --cc debian/patches/0018-gpg-Fix-searching-for-mail-addresses-in-keyrings.patch
index 0000000000000000000000000000000000000000,6365109a33d8c0a14bc465d75d9d1cd08ae5bb91..6365109a33d8c0a14bc465d75d9d1cd08ae5bb91
mode 000000,100644..100644
--- /dev/null
--- 2/patches/0018-gpg-Fix-searching-for-mail-addresses-in-keyrings.patch
+++ b/debian/patches/0018-gpg-Fix-searching-for-mail-addresses-in-keyrings.patch

diff --cc debian/patches/0019-dirmngr-New-option-no-use-tor-and-internal-changes.patch
index 0000000000000000000000000000000000000000,f93668539ba58ef5643a0060d4e4e67e13617dd9..f93668539ba58ef5643a0060d4e4e67e13617dd9
mode 000000,100644..100644
--- /dev/null
--- 2/patches/0019-dirmngr-New-option-no-use-tor-and-internal-changes.patch
+++ b/debian/patches/0019-dirmngr-New-option-no-use-tor-and-internal-changes.patch

diff --cc debian/patches/0020-gpg-Remove-period-at-end-of-warning.patch
index 0000000000000000000000000000000000000000,247ff44cc3625d49d3cb62c0922fdf7f405e890b..247ff44cc3625d49d3cb62c0922fdf7f405e890b
mode 000000,100644..100644
--- /dev/null
--- 2/patches/0020-gpg-Remove-period-at-end-of-warning.patch
+++ b/debian/patches/0020-gpg-Remove-period-at-end-of-warning.patch

diff --cc debian/patches/0021-gpg-Add-newline-to-output.patch
index 0000000000000000000000000000000000000000,b79c54687a90604ef8295070337c3be1e17006b2..b79c54687a90604ef8295070337c3be1e17006b2
mode 000000,100644..100644
--- /dev/null
--- 2/patches/0021-gpg-Add-newline-to-output.patch
+++ b/debian/patches/0021-gpg-Add-newline-to-output.patch

diff --cc debian/patches/0022-gpg-Only-print-out-TOFU-statistics-for-conflicts-in-.patch
index 0000000000000000000000000000000000000000,d8b5d791975d0963d09bc0803072929348adec35..d8b5d791975d0963d09bc0803072929348adec35
mode 000000,100644..100644
--- /dev/null
--- 2/patches/0022-gpg-Only-print-out-TOFU-statistics-for-conflicts-in-.patch
+++ b/debian/patches/0022-gpg-Only-print-out-TOFU-statistics-for-conflicts-in-.patch

diff --cc debian/patches/0023-gpg-If-there-is-a-TOFU-conflict-elide-the-too-few-me.patch
index 0000000000000000000000000000000000000000,2ae2abe94ac64ccae0c0858b733c8770809e321b..2ae2abe94ac64ccae0c0858b733c8770809e321b
mode 000000,100644..100644
--- /dev/null
--- 2/patches/0023-gpg-If-there-is-a-TOFU-conflict-elide-the-too-few-me.patch
+++ b/debian/patches/0023-gpg-If-there-is-a-TOFU-conflict-elide-the-too-few-me.patch

diff --cc debian/patches/0024-gpg-Ensure-TOFU-bindings-associated-with-UTKs-are-re.patch
index 0000000000000000000000000000000000000000,42d257ebed70d72cc5b9989bebb0a29a473878b3..42d257ebed70d72cc5b9989bebb0a29a473878b3
mode 000000,100644..100644
--- /dev/null
--- 2/patches/0024-gpg-Ensure-TOFU-bindings-associated-with-UTKs-are-re.patch
+++ b/debian/patches/0024-gpg-Ensure-TOFU-bindings-associated-with-UTKs-are-re.patch

diff --cc debian/patches/0025-gpg-Don-t-assume-that-strtoul-interprets-as-0.patch
index 0000000000000000000000000000000000000000,b92a49f53b9e6d700fb1a13e9c91e51b2ec48446..b92a49f53b9e6d700fb1a13e9c91e51b2ec48446
mode 000000,100644..100644
--- /dev/null
--- 2/patches/0025-gpg-Don-t-assume-that-strtoul-interprets-as-0.patch
+++ b/debian/patches/0025-gpg-Don-t-assume-that-strtoul-interprets-as-0.patch

diff --cc debian/patches/0026-gpg-More-diagnostics-for-a-launched-pinentry.patch
index 0000000000000000000000000000000000000000,7fe05e5a5baf45843bba9467dfce0c8edd67a74b..7fe05e5a5baf45843bba9467dfce0c8edd67a74b
mode 000000,100644..100644
--- /dev/null
--- 2/patches/0026-gpg-More-diagnostics-for-a-launched-pinentry.patch
+++ b/debian/patches/0026-gpg-More-diagnostics-for-a-launched-pinentry.patch

diff --cc debian/patches/0027-doc-Clarify-abbreviation-of-help.patch
index 0000000000000000000000000000000000000000,6d08d4bd5561e33633d0adafafbaa91c726ac3ef..6d08d4bd5561e33633d0adafafbaa91c726ac3ef
mode 000000,100644..100644
--- /dev/null
--- 2/patches/0027-doc-Clarify-abbreviation-of-help.patch
+++ b/debian/patches/0027-doc-Clarify-abbreviation-of-help.patch

diff --cc debian/patches/0028-scd-Backport-two-fixes-from-master.patch
index 0000000000000000000000000000000000000000,2193f94709883bcd06aa194d431454c848750f99..2193f94709883bcd06aa194d431454c848750f99
mode 000000,100644..100644
--- /dev/null
--- 2/patches/0028-scd-Backport-two-fixes-from-master.patch
+++ b/debian/patches/0028-scd-Backport-two-fixes-from-master.patch

diff --cc debian/patches/0029-scd-Fix-use-case-of-PC-SC.patch
index 0000000000000000000000000000000000000000,a26360d866205c266bb78275169d70695cb63a48..a26360d866205c266bb78275169d70695cb63a48
mode 000000,100644..100644
--- /dev/null
--- 2/patches/0029-scd-Fix-use-case-of-PC-SC.patch
+++ b/debian/patches/0029-scd-Fix-use-case-of-PC-SC.patch

diff --cc debian/patches/block-ptrace-on-agent/0002-Avoid-simple-memory-dumps-via-ptrace.patch
index 0000000000000000000000000000000000000000,96a8e0dcab3b578bd3274db4067f8bcd86f45ea7..96a8e0dcab3b578bd3274db4067f8bcd86f45ea7
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,ea08ce826236d10c76b934402dfe20281a851d12..ea08ce826236d10c76b934402dfe20281a851d12
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,f1bcde31dd5f211fd2877a9ba140a850584c678b..f1bcde31dd5f211fd2877a9ba140a850584c678b
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,c23485c8a38813a10d5aad2f8317a3b946b45158..c23485c8a38813a10d5aad2f8317a3b946b45158
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,779185262bdaeabf62f8f2b0f876e33538e575e5..779185262bdaeabf62f8f2b0f876e33538e575e5
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,69bdc9dba6dc70e4aeb84bf2943cb0b72ab4bd4f..69bdc9dba6dc70e4aeb84bf2943cb0b72ab4bd4f
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,05817dd467092d4517af04805440af11c0062ba6..05817dd467092d4517af04805440af11c0062ba6
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,317cea5414fef17713620c0d1a19cc3647b7a932..317cea5414fef17713620c0d1a19cc3647b7a932
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,f107e78848045feb2ecfb077ae0880966d09b9d1..f107e78848045feb2ecfb077ae0880966d09b9d1
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,557deffe63bfdb646b45850dd120b91d8d146b19..557deffe63bfdb646b45850dd120b91d8d146b19
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,bd3d6f615430af50d0d6b53342b6f5ceda15e9c8..bd3d6f615430af50d0d6b53342b6f5ceda15e9c8
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,dd076df38b3d9e4c247ebdd2090c186ff4bc78a0..dd076df38b3d9e4c247ebdd2090c186ff4bc78a0
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