[Pkg-gnupg-commit] r173 - in /gnupg/trunk/debian: changelog patches/00list patches/567580_menu_prompt_reflects_program.dpatch

[dleidert-guest at users.alioth.debian.org]

Author: dleidert-guest
Date: Sun Mar 21 13:50:10 2010
New Revision: 173

URL: http://svn.debian.org/wsvn/pkg-gnupg/?sc=1&rev=173
Log:
* debian/patches/567580_menu_prompt_reflects_program.dpatch: Added.
  - Use a less ambiguous command prompt (closes: #567580).

Added:
    gnupg/trunk/debian/patches/567580_menu_prompt_reflects_program.dpatch   (with props)
Modified:
    gnupg/trunk/debian/changelog
    gnupg/trunk/debian/patches/00list

Modified: gnupg/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnupg/gnupg/trunk/debian/changelog?rev=173&op=diff
==============================================================================
--- gnupg/trunk/debian/changelog (original)
+++ gnupg/trunk/debian/changelog Sun Mar 21 13:50:10 2010
@@ -18,6 +18,8 @@
   * debian/patches/560995_fix_ftbfs_on_sparc64.dpatch: Added.
     - mpi/config.links: Fix FTBFS on sparc64, where it tries to use SPARC32
       assembly code (closes: #560995).
+  * debian/patches/567580_menu_prompt_reflects_program.dpatch: Added.
+    - Use a less ambiguous command prompt (closes: #567580).
   * debian/patches/00list: Adjusted.
 
   [ Thijs Kinkhorst ]

Modified: gnupg/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-gnupg/gnupg/trunk/debian/patches/00list?rev=173&op=diff
==============================================================================
--- gnupg/trunk/debian/patches/00list (original)
+++ gnupg/trunk/debian/patches/00list Sun Mar 21 13:50:10 2010
@@ -4,3 +4,4 @@
 553175_document_primary_uid_sign
 560692_fix_fatal_after_homedir_creation
 560995_fix_ftbfs_on_sparc64
+567580_menu_prompt_reflects_program

Added: gnupg/trunk/debian/patches/567580_menu_prompt_reflects_program.dpatch
URL: http://svn.debian.org/wsvn/pkg-gnupg/gnupg/trunk/debian/patches/567580_menu_prompt_reflects_program.dpatch?rev=173&op=file
==============================================================================
--- gnupg/trunk/debian/patches/567580_menu_prompt_reflects_program.dpatch (added)
+++ gnupg/trunk/debian/patches/567580_menu_prompt_reflects_program.dpatch Sun Mar 21 13:50:10 2010
@@ -1,0 +1,36 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 567580_menu_prompt_reflects_program.dpatch by Daniel Leidert (dale) <daniel.leidert at wgdd.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: It has been requested, that gnupg shows a less ambiguous prompt than
+## DP: "Command>". Upstream agreed.
+## DP:
+## DP: <URL:http://bugs.debian.org/567580>
+## DP: <URL:https://bugs.g10code.com/gnupg/issue1187>
+## DP: <URL:http://lists.gnupg.org/pipermail/gnupg-commits/2010-February/008766.html>
+
+ at DPATCH@
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' trunk~/g10/card-util.c trunk/g10/card-util.c
+--- trunk~/g10/card-util.c	2009-08-13 09:14:37.000000000 +0200
++++ trunk/g10/card-util.c	2010-03-21 14:45:32.355740548 +0100
+@@ -1817,7 +1817,7 @@
+ 	    if (!have_commands)
+               {
+ 		tty_enable_completion (card_edit_completion);
+-		answer = cpr_get_no_help("cardedit.prompt", _("Command> "));
++		answer = cpr_get_no_help("cardedit.prompt", _("gpg/card> "));
+ 		cpr_kill_prompt();
+ 		tty_disable_completion ();
+               }
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' trunk~/g10/keyedit.c trunk/g10/keyedit.c
+--- trunk~/g10/keyedit.c	2009-08-26 07:35:31.000000000 +0200
++++ trunk/g10/keyedit.c	2010-03-21 14:45:32.355740548 +0100
+@@ -1616,7 +1616,7 @@
+ 	    if( !have_commands )
+ 	      {
+ 		tty_enable_completion(keyedit_completion);
+-		answer = cpr_get_no_help("keyedit.prompt", _("Command> "));
++		answer = cpr_get_no_help("keyedit.prompt", "gpg> ");
+ 		cpr_kill_prompt();
+ 		tty_disable_completion();
+ 	      }

Propchange: gnupg/trunk/debian/patches/567580_menu_prompt_reflects_program.dpatch
------------------------------------------------------------------------------
    svn:executable = *