Merge branch '1.5.20-1+fix533459'

[software/mutt-debian.git] / debian / patches / misc / smime_keys-manpage.patch

diff --git a/debian/patches/misc/smime_keys-manpage.patch b/debian/patches/misc/smime_keys-manpage.patch
index 41b163a3729106680fbdfa1ef643f69a01f812b6..ebe24f1437ae7a66e10ba510c7c3338a3c0a915c 100644 (file)
--- a/debian/patches/misc/smime_keys-manpage.patch
+++ b/debian/patches/misc/smime_keys-manpage.patch
@@ -1,4 +1,5 @@
 add a missing manpage for smime_keys
+see upstream CR #3272
 
 --- a/doc/Makefile.am
 +++ b/doc/Makefile.am
@@ -56,11 +57,13 @@ add a missing manpage for smime_keys
                 $(srcdir)/gen-map-doc $(top_srcdir)/VERSION $(top_srcdir)/ChangeLog
 --- /dev/null
 +++ b/doc/smime_keys.man
-@@ -0,0 +1,67 @@
+@@ -0,0 +1,69 @@
 +.\" -*-nroff-*-
 +.\"
 +.\"
-+.\"     Copyright (C) 2009 Antonio Radici <antonio@dyne.org>
++.\"     Copyright (C) 2001,2002 Oliver Ehli <elmy@acm.org>
++.\"     Copyright (C) 2001 Mike Schiraldi <raldi@research.netsol.com>
++.\"     Copyright (C) 2003 Bjoern Jacke <bjoern@j3e.de>
 +.\"
 +.\"     This program is free software; you can redistribute it and/or modify
 +.\"     it under the terms of the GNU General Public License as published by