From: Daniel Kahn Gillmor Date: Tue, 14 Feb 2017 00:29:34 +0000 (+0000) Subject: gnupg2 (2.1.18-6) unstable; urgency=medium X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ian/git?a=commitdiff_plain;h=c5e381ea80238eba3ccc74b827eada639fac519c;p=gnupg2.git gnupg2 (2.1.18-6) unstable; urgency=medium [ NIIBE Yutaka ] * scdaemon: Fix duplicated entries (Closes: #855056). [dgit import unpatched gnupg2 2.1.18-6] --- c5e381ea80238eba3ccc74b827eada639fac519c diff --cc debian/NEWS index 0000000,0000000..0a6a744 new file mode 100644 --- /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 Wed, 30 Mar 2016 09:59:35 -0400 diff --cc debian/Xsession.d/90gpg-agent index 0000000,8b45b05..8b45b05 mode 000000,100644..100644 --- a/debian/Xsession.d/90gpg-agent +++ b/debian/Xsession.d/90gpg-agent diff --cc debian/changelog index 0000000,4167d38..4167d38 mode 000000,100644..100644 --- a/debian/changelog +++ b/debian/changelog diff --cc debian/clean index 0000000,922f2c9..922f2c9 mode 000000,100644..100644 --- a/debian/clean +++ b/debian/clean diff --cc debian/compat index 0000000,ec63514..ec63514 mode 000000,100644..100644 --- a/debian/compat +++ b/debian/compat diff --cc debian/control index 0000000,ac0b079..ac0b079 mode 000000,100644..100644 --- a/debian/control +++ b/debian/control diff --cc debian/copyright index 0000000,5676d81..5676d81 mode 000000,100644..100644 --- a/debian/copyright +++ b/debian/copyright diff --cc debian/dirmngr.NEWS index 0000000,b0c550f..b0c550f mode 000000,100644..100644 --- a/debian/dirmngr.NEWS +++ b/debian/dirmngr.NEWS diff --cc debian/dirmngr.README.Debian index 0000000,099240a..099240a mode 000000,100644..100644 --- a/debian/dirmngr.README.Debian +++ b/debian/dirmngr.README.Debian diff --cc debian/dirmngr.docs index 0000000,817be40..817be40 mode 000000,100644..100644 --- a/debian/dirmngr.docs +++ b/debian/dirmngr.docs diff --cc debian/dirmngr.install index 0000000,1e77641..1e77641 mode 000000,100644..100644 --- a/debian/dirmngr.install +++ b/debian/dirmngr.install diff --cc debian/dirmngr.links index 0000000,ca801e7..ca801e7 mode 000000,100644..100644 --- a/debian/dirmngr.links +++ b/debian/dirmngr.links diff --cc debian/dirmngr.maintscript index 0000000,aa11aa5..aa11aa5 mode 000000,100644..100644 --- a/debian/dirmngr.maintscript +++ b/debian/dirmngr.maintscript diff --cc debian/dirmngr.manpages index 0000000,93702d9..93702d9 mode 000000,100644..100644 --- a/debian/dirmngr.manpages +++ b/debian/dirmngr.manpages diff --cc debian/gbp.conf index 0000000,1789fc2..1789fc2 mode 000000,100644..100644 --- a/debian/gbp.conf +++ b/debian/gbp.conf diff --cc debian/gnupg-agent.NEWS index 0000000,69b4e49..69b4e49 mode 000000,100644..100644 --- a/debian/gnupg-agent.NEWS +++ b/debian/gnupg-agent.NEWS diff --cc debian/gnupg-agent.README.Debian index 0000000,f57d278..f57d278 mode 000000,100644..100644 --- a/debian/gnupg-agent.README.Debian +++ b/debian/gnupg-agent.README.Debian diff --cc debian/gnupg-agent.examples index 0000000,34213be..34213be mode 000000,100644..100644 --- a/debian/gnupg-agent.examples +++ b/debian/gnupg-agent.examples diff --cc debian/gnupg-agent.install index 0000000,2a4dcbe..2a4dcbe mode 000000,100644..100644 --- a/debian/gnupg-agent.install +++ b/debian/gnupg-agent.install diff --cc debian/gnupg-agent.links index 0000000,90f6ce1..90f6ce1 mode 000000,100644..100644 --- a/debian/gnupg-agent.links +++ b/debian/gnupg-agent.links diff --cc debian/gnupg-agent.manpages index 0000000,4819831..4819831 mode 000000,100644..100644 --- a/debian/gnupg-agent.manpages +++ b/debian/gnupg-agent.manpages diff --cc debian/gnupg-l10n.install index 0000000,9aaad82..9aaad82 mode 000000,100644..100644 --- a/debian/gnupg-l10n.install +++ b/debian/gnupg-l10n.install diff --cc debian/gnupg.README.Debian index 0000000,24944d3..24944d3 mode 000000,100644..100644 --- a/debian/gnupg.README.Debian +++ b/debian/gnupg.README.Debian diff --cc debian/gnupg.docs index 0000000,b182260..b182260 mode 000000,100644..100644 --- a/debian/gnupg.docs +++ b/debian/gnupg.docs diff --cc debian/gnupg.examples index 0000000,3e74b94..3e74b94 mode 000000,100644..100644 --- a/debian/gnupg.examples +++ b/debian/gnupg.examples diff --cc debian/gnupg.info index 0000000,e4baa0f..e4baa0f mode 000000,100644..100644 --- a/debian/gnupg.info +++ b/debian/gnupg.info diff --cc debian/gnupg.install index 0000000,12fb913..12fb913 mode 000000,100644..100644 --- a/debian/gnupg.install +++ b/debian/gnupg.install diff --cc debian/gnupg.manpages index 0000000,4fc76c3..4fc76c3 mode 000000,100644..100644 --- a/debian/gnupg.manpages +++ b/debian/gnupg.manpages diff --cc debian/gnupg2.links index 0000000,96fde98..96fde98 mode 000000,100644..100644 --- a/debian/gnupg2.links +++ b/debian/gnupg2.links diff --cc debian/gpg-check-pattern.1 index 0000000,05dbc1e..05dbc1e mode 000000,100644..100644 --- a/debian/gpg-check-pattern.1 +++ b/debian/gpg-check-pattern.1 diff --cc debian/gpg-zip.1 index 0000000,cba5db4..cba5db4 mode 000000,100644..100644 --- a/debian/gpg-zip.1 +++ b/debian/gpg-zip.1 diff --cc debian/gpgsm.install index 0000000,8822607..8822607 mode 000000,100644..100644 --- a/debian/gpgsm.install +++ b/debian/gpgsm.install diff --cc debian/gpgsm.manpages index 0000000,ad6a686..ad6a686 mode 000000,100644..100644 --- a/debian/gpgsm.manpages +++ b/debian/gpgsm.manpages diff --cc debian/gpgsplit.1 index 0000000,116ce89..116ce89 mode 000000,100644..100644 --- a/debian/gpgsplit.1 +++ b/debian/gpgsplit.1 diff --cc debian/gpgv-static.1 index 0000000,c8dcc1a..c8dcc1a mode 000000,100644..100644 --- a/debian/gpgv-static.1 +++ b/debian/gpgv-static.1 diff --cc debian/gpgv-static.install index 0000000,adb6deb..adb6deb mode 000000,100644..100644 --- a/debian/gpgv-static.install +++ b/debian/gpgv-static.install diff --cc debian/gpgv-static.lintian-overrides index 0000000,fa0b8df..fa0b8df mode 000000,100644..100644 --- a/debian/gpgv-static.lintian-overrides +++ b/debian/gpgv-static.lintian-overrides diff --cc debian/gpgv-static.manpages index 0000000,e3f73aa..e3f73aa mode 000000,100644..100644 --- a/debian/gpgv-static.manpages +++ b/debian/gpgv-static.manpages diff --cc debian/gpgv-udeb.install index 0000000,fe27533..fe27533 mode 000000,100644..100644 --- a/debian/gpgv-udeb.install +++ b/debian/gpgv-udeb.install diff --cc debian/gpgv-win32.install index 0000000,cf3cd8c..cf3cd8c mode 000000,100644..100644 --- a/debian/gpgv-win32.install +++ b/debian/gpgv-win32.install diff --cc debian/gpgv.install index 0000000,0a9f9a2..0a9f9a2 mode 000000,100644..100644 --- a/debian/gpgv.install +++ b/debian/gpgv.install diff --cc debian/gpgv.manpages index 0000000,86a9e29..86a9e29 mode 000000,100644..100644 --- a/debian/gpgv.manpages +++ b/debian/gpgv.manpages diff --cc debian/gpgv2.links index 0000000,5107429..5107429 mode 000000,100644..100644 --- a/debian/gpgv2.links +++ b/debian/gpgv2.links diff --cc debian/kbxutil.1 index 0000000,52b338a..52b338a mode 000000,100644..100644 --- a/debian/kbxutil.1 +++ b/debian/kbxutil.1 diff --cc debian/lspgpot.1 index 0000000,ba27eca..ba27eca mode 000000,100644..100644 --- a/debian/lspgpot.1 +++ b/debian/lspgpot.1 diff --cc debian/migrate-pubring-from-classic-gpg index 0000000,13ee1f8..13ee1f8 mode 000000,100755..100755 --- a/debian/migrate-pubring-from-classic-gpg +++ b/debian/migrate-pubring-from-classic-gpg diff --cc debian/migrate-pubring-from-classic-gpg.1 index 0000000,4d26b89..4d26b89 mode 000000,100644..100644 --- a/debian/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 0000000,4d47557..4d47557 mode 000000,100644..100644 --- a/debian/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 0000000,b0034da..b0034da mode 000000,100644..100644 --- a/debian/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 0000000,0aa0549..0aa0549 mode 000000,100644..100644 --- a/debian/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 0000000,bcf4ee6..bcf4ee6 mode 000000,100644..100644 --- a/debian/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 0000000,1979069..1979069 mode 000000,100644..100644 --- a/debian/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 0000000,b3d96ed..b3d96ed mode 000000,100644..100644 --- a/debian/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 0000000,6365109..6365109 mode 000000,100644..100644 --- a/debian/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 0000000,f936685..f936685 mode 000000,100644..100644 --- a/debian/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 0000000,247ff44..247ff44 mode 000000,100644..100644 --- a/debian/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 0000000,b79c546..b79c546 mode 000000,100644..100644 --- a/debian/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 0000000,d8b5d79..d8b5d79 mode 000000,100644..100644 --- a/debian/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 0000000,2ae2abe..2ae2abe mode 000000,100644..100644 --- a/debian/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 0000000,42d257e..42d257e mode 000000,100644..100644 --- a/debian/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 0000000,b92a49f..b92a49f mode 000000,100644..100644 --- a/debian/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 0000000,7fe05e5..7fe05e5 mode 000000,100644..100644 --- a/debian/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 0000000,6d08d4b..6d08d4b mode 000000,100644..100644 --- a/debian/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 0000000,2193f94..2193f94 mode 000000,100644..100644 --- a/debian/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 0000000,a26360d..a26360d mode 000000,100644..100644 --- a/debian/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 0000000,96a8e0d..96a8e0d mode 000000,100644..100644 --- a/debian/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 0000000,ea08ce8..ea08ce8 mode 000000,100644..100644 --- a/debian/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 0000000,c141e4f..c141e4f mode 000000,100644..100644 --- a/debian/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 0000000,f1bcde3..f1bcde3 mode 000000,100644..100644 --- a/debian/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 0000000,c23485c..c23485c mode 000000,100644..100644 --- a/debian/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 0000000,7791852..7791852 mode 000000,100644..100644 --- a/debian/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 0000000,69bdc9d..69bdc9d mode 000000,100644..100644 --- a/debian/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 0000000,05817dd..05817dd mode 000000,100644..100644 --- a/debian/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 0000000,317cea5..317cea5 mode 000000,100644..100644 --- a/debian/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 0000000,f107e78..f107e78 mode 000000,100644..100644 --- a/debian/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 0000000,557deff..557deff mode 000000,100644..100644 --- a/debian/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 0000000,bd3d6f6..bd3d6f6 mode 000000,100644..100644 --- a/debian/patches/series +++ b/debian/patches/series diff --cc debian/rules index 0000000,241cead..241cead mode 000000,100755..100755 --- a/debian/rules +++ b/debian/rules diff --cc debian/scdaemon.examples index 0000000,29f41a8..29f41a8 mode 000000,100644..100644 --- a/debian/scdaemon.examples +++ b/debian/scdaemon.examples diff --cc debian/scdaemon.install index 0000000,a2a79aa..a2a79aa mode 000000,100644..100644 --- a/debian/scdaemon.install +++ b/debian/scdaemon.install diff --cc debian/scdaemon.lintian-overrides index 0000000,b575cb1..b575cb1 mode 000000,100644..100644 --- a/debian/scdaemon.lintian-overrides +++ b/debian/scdaemon.lintian-overrides diff --cc debian/scdaemon.manpages index 0000000,9efee23..9efee23 mode 000000,100644..100644 --- a/debian/scdaemon.manpages +++ b/debian/scdaemon.manpages diff --cc debian/scdaemon.udev index 0000000,dd076df..dd076df mode 000000,100644..100644 --- a/debian/scdaemon.udev +++ b/debian/scdaemon.udev diff --cc debian/source/format index 0000000,163aaf8..163aaf8 mode 000000,100644..100644 --- a/debian/source/format +++ b/debian/source/format diff --cc debian/source/lintian-overrides index 0000000,b5221c7..b5221c7 mode 000000,100644..100644 --- a/debian/source/lintian-overrides +++ b/debian/source/lintian-overrides diff --cc debian/source/options index 0000000,f0f8ede..f0f8ede mode 000000,100644..100644 --- a/debian/source/options +++ b/debian/source/options diff --cc debian/systemd-user/gpg-agent-browser.socket index 0000000,67690ce..67690ce mode 000000,100644..100644 --- a/debian/systemd-user/gpg-agent-browser.socket +++ b/debian/systemd-user/gpg-agent-browser.socket diff --cc debian/tests/control index 0000000,9178821..9178821 mode 000000,100644..100644 --- a/debian/tests/control +++ b/debian/tests/control diff --cc debian/tests/gpgv-win32 index 0000000,3142a65..3142a65 mode 000000,100755..100755 --- a/debian/tests/gpgv-win32 +++ b/debian/tests/gpgv-win32 diff --cc debian/upstream/signing-key.asc index 0000000,1e57599..1e57599 mode 000000,100644..100644 --- a/debian/upstream/signing-key.asc +++ b/debian/upstream/signing-key.asc diff --cc debian/watch index 0000000,e6d36a1..e6d36a1 mode 000000,100644..100644 --- a/debian/watch +++ b/debian/watch