upstream/537818-emptycharset.patch: handling empty charsets without segfaulting ...

[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 95539135b81b98b5e39a025976b15dd8668ebfc2..e159d44368e2ae9b8a29f72fd9920b5f49a7354d 100644 (file)
--- a/debian/patches/misc/smime_keys-manpage.patch
+++ b/debian/patches/misc/smime_keys-manpage.patch
@@ -1,7 +1,10 @@
 add a missing manpage for smime_keys
 add a missing manpage for smime_keys

+see upstream CR #3272

 
 

---- a/doc/Makefile.am
-+++ b/doc/Makefile.am
+Index: mutt/doc/Makefile.am
+===================================================================
+--- mutt.orig/doc/Makefile.am  2009-06-25 12:35:40.000000000 +0200
++++ mutt/doc/Makefile.am       2009-06-25 12:36:48.000000000 +0200

 @@ -10,6 +10,7 @@
  noinst_PROGRAMS = makedoc
  
 @@ -10,6 +10,7 @@
  noinst_PROGRAMS = makedoc
  


@@ -10,7 +13,7 @@ add a missing manpage for smime_keys
        muttbug.man                     \
        mutt.man                        \
        PGP-Notes.txt                   \
        muttbug.man                     \
        mutt.man                        \
        PGP-Notes.txt                   \

-@@ -43,13 +44,14 @@
+@@ -45,13 +46,14 @@

  
  all: makedoc-all
  
  
  all: makedoc-all
  


@@ -26,7 +29,7 @@ add a missing manpage for smime_keys
        ./instdoc $(srcdir)/muttbug.man $(DESTDIR)$(mandir)/man1/flea.1
        ./instdoc $(srcdir)/muttbug.man $(DESTDIR)$(mandir)/man1/muttbug.1
        test x@DOTLOCK_TARGET@ = x || ./instdoc $(srcdir)/dotlock.man \
        ./instdoc $(srcdir)/muttbug.man $(DESTDIR)$(mandir)/man1/flea.1
        ./instdoc $(srcdir)/muttbug.man $(DESTDIR)$(mandir)/man1/muttbug.1
        test x@DOTLOCK_TARGET@ = x || ./instdoc $(srcdir)/dotlock.man \

-@@ -78,7 +80,7 @@
+@@ -80,7 +82,7 @@

        fi
  
  uninstall-local:
        fi
  
  uninstall-local:


@@ -35,8 +38,8 @@ add a missing manpage for smime_keys
                rm -f $(DESTDIR)$(mandir)/man1/$$f ; \
        done
        for f in muttrc.5 mbox.5 mmdf.5 ; do \
                rm -f $(DESTDIR)$(mandir)/man1/$$f ; \
        done
        for f in muttrc.5 mbox.5 mmdf.5 ; do \

-@@ -137,7 +139,7 @@
-       -aspell -l en --mode nroff -c muttrc.man.head
+@@ -142,7 +144,7 @@
+       rm -rf vars.tmp.1 vars.tmp.2

  
  clean-local:
 -      rm -f *~ *.html *.orig *.rej  stamp-doc-* *.ps mutt.1 muttrc.man
  
  clean-local:
 -      rm -f *~ *.html *.orig *.rej  stamp-doc-* *.ps mutt.1 muttrc.man


@@ -44,7 +47,7 @@ add a missing manpage for smime_keys
        rm -f *.aux *.log *.tex *.out
  
  DISTCLEANFILES=manual.txt manual.html manual.xml manual.pdf html \
        rm -f *.aux *.log *.tex *.out
  
  DISTCLEANFILES=manual.txt manual.html manual.xml manual.pdf html \

-@@ -161,6 +163,9 @@
+@@ -166,6 +168,9 @@

  mutt.1: $(srcdir)/mutt.man
        $(EDIT) $(srcdir)/mutt.man > $@
  
  mutt.1: $(srcdir)/mutt.man
        $(EDIT) $(srcdir)/mutt.man > $@
  


@@ -54,13 +57,17 @@ add a missing manpage for smime_keys
  stamp-doc-xml: makedoc$(EXEEXT) $(top_srcdir)/init.h \
                 manual.xml.head $(top_srcdir)/functions.h $(top_srcdir)/OPS* manual.xml.tail \
                 $(srcdir)/gen-map-doc $(top_srcdir)/VERSION $(top_srcdir)/ChangeLog
  stamp-doc-xml: makedoc$(EXEEXT) $(top_srcdir)/init.h \
                 manual.xml.head $(top_srcdir)/functions.h $(top_srcdir)/OPS* manual.xml.tail \
                 $(srcdir)/gen-map-doc $(top_srcdir)/VERSION $(top_srcdir)/ChangeLog

---- /dev/null
-+++ b/doc/smime_keys.man
-@@ -0,0 +1,67 @@
+Index: mutt/doc/smime_keys.man
+===================================================================
+--- /dev/null  1970-01-01 00:00:00.000000000 +0000
++++ mutt/doc/smime_keys.man    2009-06-25 12:36:48.000000000 +0200
+@@ -0,0 +1,69 @@

 +.\" -*-nroff-*-
 +.\"
 +.\"
 +.\" -*-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
 +.\"
 +.\"     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