- merged DEVEL

[packages/mutt.git] / mutt-rr.compressed.patch

diff --git a/mutt-rr.compressed.patch b/mutt-rr.compressed.patch
index d61e69b47d740688b9f141460a564cfb8f816cef..1528e40a255817bd523313c7583a40293f0fa606 100644 (file)
--- a/mutt-rr.compressed.patch
+++ b/mutt-rr.compressed.patch
@@ -596,32 +596,30 @@ diff -udprP mutt-1.5.19.orig/curs_main.c mutt-1.5.19/curs_main.c
          mutt_str_replace (&LastFolder, Context->path);
          oldcount = Context ? Context->msgcount : 0;
  
-diff -udprP mutt-1.5.19.orig/doc/Makefile.am mutt-1.5.19/doc/Makefile.am
---- mutt-1.5.19.orig/doc/Makefile.am   2009-01-05 21:20:53.000000000 +0200
-+++ mutt-1.5.19/doc/Makefile.am        2009-01-06 19:16:04.000000000 +0200
-@@ -31,7 +31,8 @@ EXTRA_DIST = dotlock.man             \
+--- mutt-1.5.20.b/doc/Makefile.am      2009-06-01 04:23:14.000000000 +0200
++++ mutt-1.5.20/doc/Makefile.am        2009-07-14 12:36:06.000000000 +0200
+@@ -31,7 +31,8 @@
  
- HTML_DOCFILES = manual.html index.html intro.html gettingstarted.html \
+ CHUNKED_DOCFILES = index.html intro.html gettingstarted.html \
        configuration.html mimesupport.html advancedusage.html \
--      optionalfeatures.html tuning.html reference.html miscellany.html
-+      optionalfeatures.html tuning.html reference.html miscellany.html \
+-      optionalfeatures.html security.html tuning.html reference.html miscellany.html
++      optionalfeatures.html security.html tuning.html reference.html miscellany.html \
 +      compressed-folders.html
  
- BUILT_DISTFILES = stamp-doc-xml stamp-doc-chunked manual.txt $(HTML_DOCFILES)
+ HTML_DOCFILES = manual.html $(CHUNKED_DOCFILES)
  
-diff -udprP mutt-1.5.19.orig/doc/Makefile.in mutt-1.5.19/doc/Makefile.in
---- mutt-1.5.19.orig/doc/Makefile.in   2009-01-05 21:24:14.000000000 +0200
-+++ mutt-1.5.19/doc/Makefile.in        2009-01-06 19:16:04.000000000 +0200
-@@ -234,7 +234,8 @@ EXTRA_DIST = dotlock.man           \
+--- mutt-1.5.20.b/doc/Makefile.in      2009-06-09 08:50:43.000000000 +0200
++++ mutt-1.5.20/doc/Makefile.in        2009-07-14 12:36:53.000000000 +0200
+@@ -235,7 +235,8 @@
  
- HTML_DOCFILES = manual.html index.html intro.html gettingstarted.html \
+ CHUNKED_DOCFILES = index.html intro.html gettingstarted.html \
        configuration.html mimesupport.html advancedusage.html \
--      optionalfeatures.html tuning.html reference.html miscellany.html
-+      optionalfeatures.html tuning.html reference.html miscellany.html \
+-      optionalfeatures.html security.html tuning.html reference.html miscellany.html
++      optionalfeatures.html security.html tuning.html reference.html miscellany.html \
 +      compressed-folders.html
  
+ HTML_DOCFILES = manual.html $(CHUNKED_DOCFILES)
  BUILT_DISTFILES = stamp-doc-xml stamp-doc-chunked manual.txt $(HTML_DOCFILES)
- srcdir_DOCFILES = PGP-Notes.txt applying-patches.txt  \
 diff -udprP mutt-1.5.19.orig/doc/manual.xml.head mutt-1.5.19/doc/manual.xml.head
 --- mutt-1.5.19.orig/doc/manual.xml.head       2009-01-05 21:20:53.000000000 +0200
 +++ mutt-1.5.19/doc/manual.xml.head    2009-01-06 19:35:41.000000000 +0200