[Pkg-gnupg-commit] [gnupg2] 06/09: use the upstream-adopted skeleton file removal

[Daniel Kahn Gillmor]

This is an automated email from the git hooks/post-receive script.

dkg pushed a commit to branch experimental
in repository gnupg2.

commit 1d518657f4e5279743029ff1679cd24024b7e96f
Author: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
Date:   Wed May 10 14:56:38 2017 -0400

    use the upstream-adopted skeleton file removal
---
 debian/patches/0026-doc-Explain-the-in-a-key-listing.patch  |  2 +-
 ...documentation.patch => 0055-doc-Fix-documentation.patch} |  2 +-
 .../{0057-gpg-Fix-typo.patch => 0056-gpg-Fix-typo.patch}    |  0
 ... 0057-gpg-Properly-account-for-ring-trust-packets.patch} |  0
 ...s.patch => 0058-g10-Remove-skeleton-options-files.patch} | 13 +++++++------
 debian/patches/series                                       |  8 ++++----
 6 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/debian/patches/0026-doc-Explain-the-in-a-key-listing.patch b/debian/patches/0026-doc-Explain-the-in-a-key-listing.patch
index de74eae..fd7d5bd 100644
--- a/debian/patches/0026-doc-Explain-the-in-a-key-listing.patch
+++ b/debian/patches/0026-doc-Explain-the-in-a-key-listing.patch
@@ -11,7 +11,7 @@ Signed-off-by: Werner Koch <wk at gnupg.org>
  1 file changed, 7 insertions(+), 4 deletions(-)
 
 diff --git a/doc/gpg.texi b/doc/gpg.texi
-index 1fa5381..aa55cb8 100644
+index 37e1ff1..c0d7cc4 100644
 --- a/doc/gpg.texi
 +++ b/doc/gpg.texi
 @@ -301,10 +301,13 @@ and other programs.
diff --git a/debian/patches/0056-doc-Fix-documentation.patch b/debian/patches/0055-doc-Fix-documentation.patch
similarity index 96%
rename from debian/patches/0056-doc-Fix-documentation.patch
rename to debian/patches/0055-doc-Fix-documentation.patch
index 699e955..b1334b0 100644
--- a/debian/patches/0056-doc-Fix-documentation.patch
+++ b/debian/patches/0055-doc-Fix-documentation.patch
@@ -12,7 +12,7 @@ Signed-off-by: Justus Winter <justus at g10code.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/doc/gpg.texi b/doc/gpg.texi
-index aa55cb8..1a0ea55 100644
+index c0d7cc4..3250d4b 100644
 --- a/doc/gpg.texi
 +++ b/doc/gpg.texi
 @@ -393,7 +393,7 @@ functionality is also available as the subcommand "passwd" with the
diff --git a/debian/patches/0057-gpg-Fix-typo.patch b/debian/patches/0056-gpg-Fix-typo.patch
similarity index 100%
rename from debian/patches/0057-gpg-Fix-typo.patch
rename to debian/patches/0056-gpg-Fix-typo.patch
diff --git a/debian/patches/0058-gpg-Properly-account-for-ring-trust-packets.patch b/debian/patches/0057-gpg-Properly-account-for-ring-trust-packets.patch
similarity index 100%
rename from debian/patches/0058-gpg-Properly-account-for-ring-trust-packets.patch
rename to debian/patches/0057-gpg-Properly-account-for-ring-trust-packets.patch
diff --git a/debian/patches/skel-file-removal/0012-g10-remove-skeleton-options-files.patch b/debian/patches/0058-g10-Remove-skeleton-options-files.patch
similarity index 98%
rename from debian/patches/skel-file-removal/0012-g10-remove-skeleton-options-files.patch
rename to debian/patches/0058-g10-Remove-skeleton-options-files.patch
index 5ae4458..1b87554 100644
--- a/debian/patches/skel-file-removal/0012-g10-remove-skeleton-options-files.patch
+++ b/debian/patches/0058-g10-Remove-skeleton-options-files.patch
@@ -1,12 +1,14 @@
 From: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
 Date: Mon, 17 Apr 2017 10:51:55 -0400
-Subject: g10: remove skeleton options files
+Subject: g10: Remove skeleton options files.
 
 * build-aux/speed/w32/inst.nsi: stop installing skeleton files.
 * doc/gpg.texi: stop documenting skeleton files.
 * g10/Makefile.am: stop installing skeleton files.
 * g10/openfile.c (copy_options_file): Remove.
-(try_make_homedir): do not call copy_options_file()
+(try_make_homedir): do not call copy_options_file.
+
+--
 
 The defaults for gpg and dirmngr are good.  Both programs should work
 fine for the simple case without any config file.  The skeleton config
@@ -16,10 +18,9 @@ sophisticated users), they're likely out of date because gpg has been
 upgraded since then.  So they're used for documentation, but they're
 stale documentation, which is probably worse than a clean empty file.
 
---
-
 GnuPG-bug-id: 3086
 Signed-off-by: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
+(cherry picked from commit 201f86803017c1db373023f7b506d4a0dc644bbc)
 ---
  build-aux/speedo/w32/inst.nsi |   2 -
  doc/gpg.texi                  |   4 --
@@ -45,10 +46,10 @@ index b4d6994..7716f7f 100644
    File "share/gnupg/sks-keyservers.netCA.pem"
  
 diff --git a/doc/gpg.texi b/doc/gpg.texi
-index 37e1ff1..1fa5381 100644
+index 3250d4b..1a0ea55 100644
 --- a/doc/gpg.texi
 +++ b/doc/gpg.texi
-@@ -3477,10 +3477,6 @@ files; They all live in the current home directory (@pxref{option
+@@ -3480,10 +3480,6 @@ files; They all live in the current home directory (@pxref{option
    You should backup all files in this directory and take care to keep
    this backup closed away.
  
diff --git a/debian/patches/series b/debian/patches/series
index ce93f06..06a8819 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -9,7 +9,6 @@ gpg-agent-idling/0008-agent-Create-framework-of-scheduled-timers.patch
 gpg-agent-idling/0009-agent-Allow-threads-to-interrupt-main-select-loop-wi.patch
 gpg-agent-idling/0010-agent-Avoid-tight-timer-tick-when-possible.patch
 gpg-agent-idling/0011-agent-Avoid-scheduled-checks-on-socket-when-inotify-.patch
-skel-file-removal/0012-g10-remove-skeleton-options-files.patch
 skip-missing-signing-keys/0013-g10-Skip-signing-keys-where-no-secret-key-is-availab.patch
 0013-agent-Minor-fix-for-get_client_pid.patch
 0014-gpgscm-Simplify-substring-operation.patch
@@ -53,6 +52,7 @@ skip-missing-signing-keys/0013-g10-Skip-signing-keys-where-no-secret-key-is-avai
 0052-dirmngr-Fix-final-close-of-LISTEN_FD.patch
 0053-g10-invalidate-the-fd-cache-for-keyring.patch
 0054-dirmngr-Fix-aliasing-problem-in-dns.c.patch
-0056-doc-Fix-documentation.patch
-0057-gpg-Fix-typo.patch
-0058-gpg-Properly-account-for-ring-trust-packets.patch
+0055-doc-Fix-documentation.patch
+0056-gpg-Fix-typo.patch
+0057-gpg-Properly-account-for-ring-trust-packets.patch
+0058-g10-Remove-skeleton-options-files.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gnupg/gnupg2.git