[Pkg-gnupg-commit] r28 - in /gnupg/trunk/debian: changelog patches/00list patches/99_yat2m_fix_samp_handling.dpatch
pusling-guest at users.alioth.debian.org
pusling-guest at users.alioth.debian.org
Tue Jun 3 22:01:38 UTC 2008
Author: pusling-guest
Date: Tue Jun 3 21:39:37 2008
New Revision: 28
URL: http://svn.debian.org/wsvn/pkg-gnupg/?sc=1&rev=28
Log:
backported upstream fix related to man-db warnings
Added:
gnupg/trunk/debian/patches/99_yat2m_fix_samp_handling.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=28&op=diff
==============================================================================
--- gnupg/trunk/debian/changelog (original)
+++ gnupg/trunk/debian/changelog Tue Jun 3 21:39:37 2008
@@ -12,6 +12,10 @@
* Remove ancient preinst script to support upgrades back in 1998
* README.Debian is related to the ancient preinst script, so remove it as
well.
+ * debian/patches/99_yat2m_fix_samp_handling.dpatch: Added.
+ - doc/yat2m.c: Backport two fixes from the upstream SVN regarding the
+ correct handling of backslahes and fixing the samples output format
+ avoiding man-db warnings.
-- Sune Vuorela <debian at pusling.com> Sun, 01 Jun 2008 21:21:10 +0200
Modified: gnupg/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-gnupg/gnupg/trunk/debian/patches/00list?rev=28&op=diff
==============================================================================
--- gnupg/trunk/debian/patches/00list (original)
+++ gnupg/trunk/debian/patches/00list Tue Jun 3 21:39:37 2008
@@ -3,3 +3,4 @@
24_gpgv_manpage_cleanup
25_de.po_fixes
28_multiple_message
+99_yat2m_fix_samp_handling
Added: gnupg/trunk/debian/patches/99_yat2m_fix_samp_handling.dpatch
URL: http://svn.debian.org/wsvn/pkg-gnupg/gnupg/trunk/debian/patches/99_yat2m_fix_samp_handling.dpatch?rev=28&op=file
==============================================================================
--- gnupg/trunk/debian/patches/99_yat2m_fix_samp_handling.dpatch (added)
+++ gnupg/trunk/debian/patches/99_yat2m_fix_samp_handling.dpatch Tue Jun 3 21:39:37 2008
@@ -1,0 +1,32 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 99_yat2m_fix_samp_handling.dpatch by Daniel Leidert (dale) <daniel.leidert at wgdd.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix a bug in the @samp{} handling. Leading to "warning: `foo'' not
+## DP: defines. Further use a fix from upstream to handle backslashes
+## DP: correctly (#4734, #4735).
+## DP:
+## DP: <URL:https://bugs.g10code.com/gnupg/issue898>
+
+ at DPATCH@
+diff -urNad experimental~/doc/yat2m.c experimental/doc/yat2m.c
+--- experimental~/doc/yat2m.c 2007-12-12 19:40:17.000000000 +0100
++++ experimental/doc/yat2m.c 2008-05-22 00:45:24.000000000 +0200
+@@ -449,7 +449,7 @@
+ { "code", 0, "\\fB", "\\fR" },
+ { "sc", 0, "\\fB", "\\fR" },
+ { "var", 0, "\\fI", "\\fR" },
+- { "samp", 0, "'", "'" },
++ { "samp", 0, "\\(aq", "\\(aq'" },
+ { "file", 0, "`\\fI","\\fR'" },
+ { "env", 0, "`\\fI","\\fR'" },
+ { "acronym", 0 },
+@@ -675,6 +675,8 @@
+ }
+ *eol_action = 0;
+ }
++ else if (*s == '\\')
++ fputs ("\\\\", fp);
+ else
+ putc (*s, fp);
+ }
Propchange: gnupg/trunk/debian/patches/99_yat2m_fix_samp_handling.dpatch
------------------------------------------------------------------------------
svn:executable = *
More information about the Pkg-gnupg-commit
mailing list