← Back to branch summary

~ubuntu-branches/ubuntu/hardy/gnupg2/hardy-proposed

« back to all changes in this revision

Viewing changes to tools/gpgconf-comp.c

  • Committer: Bazaar Package Importer
  • Author(s): Michael Bienia
  • Date: 2007-05-15 13:54:55 UTC
  • mfrom: (1.1.8 upstream)
  • Revision ID: james.westby@ubuntu.com-20070515135455-89qfyalmgjy6gcqw
Tags: 2.0.4-1ubuntu1
* Merge from debian unstable, remaining changes:
  - Remove libpcsclite-dev, libopensc2-dev build dependencies (they are in
    universe).
  - Build-depend on libcurl3-gnutls-dev
  - g10/call-agent.c: set DBG_ASSUAN to 0 to suppress a debug message
  - Include /doc files as done with gnupg
  - debian/rules: add doc/com-certs.pem to the docs for gpgsm
  - debian/copyright: update download url
  - debian/README.Debian: remove note the gnupg2 isn't released yet.
  - debian/control: Change Maintainer/XSBC-Original-Maintainer field.

Show diffs side-by-side

added added

removed removed

Lines of Context:
tools/gpgconf-comp.c
498
498
   { "ignore-cache-for-signing", GC_OPT_FLAG_RUNTIME,
499
499
     GC_LEVEL_BASIC, "gnupg", "do not use the PIN cache when signing",
500
500
     GC_ARG_TYPE_NONE, GC_BACKEND_GPG_AGENT },
501
 
   { "allow-mark-trusted", GC_OPT_FLAG_RUNTIME | GC_OPT_FLAG_NO_CHANGE,
 
501
   { "allow-mark-trusted", GC_OPT_FLAG_RUNTIME,
502
502
     GC_LEVEL_ADVANCED, "gnupg", "allow clients to mark keys as \"trusted\"",
503
503
     GC_ARG_TYPE_NONE, GC_BACKEND_GPG_AGENT },
504
504
   { "min-passphrase-len", GC_OPT_FLAG_RUNTIME,
665
665
   { "prefer-system-dirmngr", GC_OPT_FLAG_NONE, GC_LEVEL_ADVANCED,
666
666
     "gnupg", "use system's dirmngr if available",
667
667
     GC_ARG_TYPE_NONE, GC_BACKEND_GPGSM },
 
668
   { "p12-charset", GC_OPT_FLAG_NONE, GC_LEVEL_ADVANCED,
 
669
     "gnupg", N_("|NAME|use encoding NAME for PKCS#12 passphrases"),
 
670
     GC_ARG_TYPE_STRING, GC_BACKEND_GPGSM },
668
671
 
669
672
   { "Debug",
670
673
     GC_OPT_FLAG_GROUP, GC_LEVEL_ADVANCED,