[Pkg-gnutls-commits] r1194 - in /packages/gnutls26/trunk/debian: changelog patches/21_gnutls-cli.man.diff patches/series

[ametzler at users.alioth.debian.org]

Author: ametzler
Date: Tue Aug 16 12:21:59 2011
New Revision: 1194

URL: http://svn.debian.org/wsvn/pkg-gnutls/?sc=1&rev=1194
Log:
Formatting fix for gnutls-cli manpage. Closes: #637551

Added:
    packages/gnutls26/trunk/debian/patches/21_gnutls-cli.man.diff
Modified:
    packages/gnutls26/trunk/debian/changelog
    packages/gnutls26/trunk/debian/patches/series

Modified: packages/gnutls26/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnutls/packages/gnutls26/trunk/debian/changelog?rev=1194&op=diff
==============================================================================
--- packages/gnutls26/trunk/debian/changelog (original)
+++ packages/gnutls26/trunk/debian/changelog Tue Aug 16 12:21:59 2011
@@ -1,6 +1,8 @@
 gnutls26 (2.12.7-7) UNRELEASED; urgency=low
 
   * NOT RELEASED YET
+  * 21_gnutls-cli.man.diff pulled from upstream git: Formatting fix for
+    gnutls-cli manpage. Closes: #637551
 
  -- Andreas Metzler <ametzler at debian.org>  Fri, 12 Aug 2011 20:39:09 +0200
 

Added: packages/gnutls26/trunk/debian/patches/21_gnutls-cli.man.diff
URL: http://svn.debian.org/wsvn/pkg-gnutls/packages/gnutls26/trunk/debian/patches/21_gnutls-cli.man.diff?rev=1194&op=file
==============================================================================
--- packages/gnutls26/trunk/debian/patches/21_gnutls-cli.man.diff (added)
+++ packages/gnutls26/trunk/debian/patches/21_gnutls-cli.man.diff Tue Aug 16 12:21:59 2011
@@ -1,0 +1,35 @@
+From b7e9f4caa15c269c703e540a9170c04428d59469 Mon Sep 17 00:00:00 2001
+From: Nikos Mavrogiannopoulos <nmav at gnutls.org>
+Date: Fri, 12 Aug 2011 16:54:53 +0200
+Subject: [PATCH] do not escape \#
+
+---
+ doc/manpages/gnutls-cli.1 |    8 ++++----
+ 1 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/doc/manpages/gnutls-cli.1 b/doc/manpages/gnutls-cli.1
+index 0b170ec..8a42a5c 100644
+--- a/doc/manpages/gnutls-cli.1
++++ b/doc/manpages/gnutls-cli.1
+@@ -123,14 +123,14 @@ SRP password to use.
+ .IP "\-\-srpusername \fINAME\fR"
+ SRP username to use.
+ .IP "\-\-x509cafile \fIFILE\fR"
+-Certificate file to use. This option accepts PKCS \#11 URLs such as
+-pkcs11:token=Root%20CA%20Certificates;serial=1%3AROOTS%3ADEFAULT;model=1%2E0;manufacturer=Gnome%20Keyring
++Certificate file to use. This option accepts PKCS #11 URLs such as
++"pkcs11:token=xxx"
+ .IP "\-\-x509certfile \fIFILE\fR"
+-X.509 Certificate file to use, or a PKCS \#11 URL.
++X.509 Certificate file to use, or a PKCS #11 URL.
+ .IP "\-\-x509fmtder"
+ Use DER format for certificates
+ .IP "\-\-x509keyfile \fIFILE\fR"
+-X.509 key file or PKCS \#11 URL to use.
++X.509 key file or PKCS #11 URL to use.
+ .IP "\-\-x509crlfile \fIFILE\fR"
+ X.509 CRL file to use.
+ .IP "\-\-pskusername \fINAME\fR"
+-- 
+1.7.2.5
+

Modified: packages/gnutls26/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnutls/packages/gnutls26/trunk/debian/patches/series?rev=1194&op=diff
==============================================================================
--- packages/gnutls26/trunk/debian/patches/series (original)
+++ packages/gnutls26/trunk/debian/patches/series Tue Aug 16 12:21:59 2011
@@ -3,3 +3,4 @@
 17_ignoretestsuitteerrors.diff
 18_gpgerrorinpkgconfig.diff
 20_gcrypt15compat.diff
+21_gnutls-cli.man.diff