Convert debian-specific/* and misc/* patches to -p0.

diff --git a/debian/patches/debian-specific/Md.Muttrc.diff b/debian/patches/debian-specific/Md.Muttrc.diff
index aa1ba07b22a4ffe08728b31f9689c10abe554438..2aa56e638949cbc099ca9b80ecd85c9faf9a1e78 100644 (file)
--- a/debian/patches/debian-specific/Md.Muttrc.diff
+++ b/debian/patches/debian-specific/Md.Muttrc.diff
@@ -1,5 +1,5 @@
---- mutt-1.5.11+cvs20060126.orig/Muttrc.head.in
-+++ mutt-1.5.11+cvs20060126/Muttrc.head.in
+--- Muttrc.head.in.orig
++++ Muttrc.head.in

 @@ -6,6 +6,38 @@
  #
  ignore "from " received content- mime-version status x-status message-id
 @@ -6,6 +6,38 @@
  #
  ignore "from " received content- mime-version status x-status message-id

diff --git a/debian/patches/debian-specific/Md.etc_mailname_gethostbyname.diff b/debian/patches/debian-specific/Md.etc_mailname_gethostbyname.diff
index de6765e6b5498168c10360b13573b097a97908eb..e55bdc6be71bd5a97b97baec09fa41d14aec8186 100644 (file)
--- a/debian/patches/debian-specific/Md.etc_mailname_gethostbyname.diff
+++ b/debian/patches/debian-specific/Md.etc_mailname_gethostbyname.diff
@@ -1,5 +1,5 @@
---- mutt-1.5.11.orig/init.c
-+++ mutt-1.5.11/init.c
+--- init.c.orig
++++ init.c

 @@ -46,6 +46,7 @@
  #include <unistd.h>
  #include <string.h>
 @@ -46,6 +46,7 @@
  #include <unistd.h>
  #include <string.h>


@@ -8,7 +8,7 @@
  #include <errno.h>
  #include <sys/wait.h>
  
  #include <errno.h>
  #include <sys/wait.h>
  

-@@ -2761,6 +2762,31 @@
+@@ -2770,6 +2771,31 @@

    return 0;
  }
  
    return 0;
  }
  


@@ -40,7 +40,7 @@
  void mutt_init (int skip_sys_rc, LIST *commands)
  {
    struct passwd *pw;
  void mutt_init (int skip_sys_rc, LIST *commands)
  {
    struct passwd *pw;

-@@ -2832,10 +2858,25 @@
+@@ -2841,10 +2867,25 @@

      Hostname = mutt_substrdup (utsname.nodename, p);
      p++;
      strfcpy (buffer, p, sizeof (buffer)); /* save the domain for below */
      Hostname = mutt_substrdup (utsname.nodename, p);
      p++;
      strfcpy (buffer, p, sizeof (buffer)); /* save the domain for below */

diff --git a/debian/patches/debian-specific/Md.sasl2_needs_md5.diff b/debian/patches/debian-specific/Md.sasl2_needs_md5.diff
index d769dfbe7aedd203b94899b0de6a34980ff29e87..7d5a7df5b7c516192d1cf4493c3491451b6a5b21 100644 (file)
--- a/debian/patches/debian-specific/Md.sasl2_needs_md5.diff
+++ b/debian/patches/debian-specific/Md.sasl2_needs_md5.diff
@@ -1,6 +1,6 @@
---- mutt-1.5.11.orig/configure
-+++ mutt-1.5.11/configure
-@@ -13275,6 +13275,7 @@
+--- configure.orig
++++ configure
+@@ -14291,6 +14291,7 @@

  _ACEOF
  
            need_sasl=yes
  _ACEOF
  
            need_sasl=yes

diff --git a/debian/patches/debian-specific/build_doc_adjustments.diff b/debian/patches/debian-specific/build_doc_adjustments.diff
index f16f8e521d959bcfafeca58cb83aebde916b3a35..be710cc16c8d83d7203e7ec0696905c76b83a932 100644 (file)
--- a/debian/patches/debian-specific/build_doc_adjustments.diff
+++ b/debian/patches/debian-specific/build_doc_adjustments.diff
@@ -1,5 +1,5 @@
---- mutt-1.5.11.orig/doc/Makefile.in
-+++ mutt-1.5.11/doc/Makefile.in
+--- doc/Makefile.in.orig
++++ doc/Makefile.in

 @@ -111,13 +111,13 @@
  
  check:
 @@ -111,13 +111,13 @@
  
  check:

diff --git a/debian/patches/debian-specific/correct_docdir_in_man_page.diff b/debian/patches/debian-specific/correct_docdir_in_man_page.diff
index e8a58cb1bcb0220629ff19d1d7cddee7373d492c..3bff38ec16c85b5113ac969f360b04d5299015c4 100644 (file)
--- a/debian/patches/debian-specific/correct_docdir_in_man_page.diff
+++ b/debian/patches/debian-specific/correct_docdir_in_man_page.diff
@@ -1,5 +1,5 @@
---- mutt-1.5.11.orig/doc/mutt.man
-+++ mutt-1.5.11/doc/mutt.man
+--- doc/mutt.man.orig
++++ doc/mutt.man

 @@ -154,7 +154,7 @@
  System mapping between MIME types and file extensions.
  .IP "@bindir@/mutt_dotlock"
 @@ -154,7 +154,7 @@
  System mapping between MIME types and file extensions.
  .IP "@bindir@/mutt_dotlock"

diff --git a/debian/patches/debian-specific/dont_rebuild_po_files.diff b/debian/patches/debian-specific/dont_rebuild_po_files.diff
index 9897f7c58017102d10569e528c213a0c73be8dfd..4f2c292749bff13cf4d4773da2434d0804ef6588 100644 (file)
--- a/debian/patches/debian-specific/dont_rebuild_po_files.diff
+++ b/debian/patches/debian-specific/dont_rebuild_po_files.diff
@@ -1,5 +1,5 @@
---- mutt-1.5.11.orig/po/Makefile.in.in
-+++ mutt-1.5.11/po/Makefile.in.in
+--- po/Makefile.in.in.orig
++++ po/Makefile.in.in

 @@ -85,7 +85,7 @@
  # otherwise packages like GCC can not be built if only parts of the source
  # have been downloaded.
 @@ -85,7 +85,7 @@
  # otherwise packages like GCC can not be built if only parts of the source
  # have been downloaded.

diff --git a/debian/patches/debian-specific/use_usr_bin_editor.diff b/debian/patches/debian-specific/use_usr_bin_editor.diff
index 402c86777c129f0c08c3cf653103fe9ff6906290..ae5f6b7bf25c1bb6680eb9eafcc83550ad7b0540 100644 (file)
--- a/debian/patches/debian-specific/use_usr_bin_editor.diff
+++ b/debian/patches/debian-specific/use_usr_bin_editor.diff
@@ -1,6 +1,6 @@
---- mutt-1.5.11.orig/init.c
-+++ mutt-1.5.11/init.c
-@@ -2920,7 +2920,7 @@
+--- init.c.orig
++++ init.c
+@@ -2929,7 +2929,7 @@

    {
      p = getenv ("EDITOR");
      if (!p)
    {
      p = getenv ("EDITOR");
      if (!p)


@@ -9,9 +9,9 @@
    }
    Editor = safe_strdup (p);
    Visual = safe_strdup (p);
    }
    Editor = safe_strdup (p);
    Visual = safe_strdup (p);

---- mutt-1.5.11.orig/init.h
-+++ mutt-1.5.11/init.h
-@@ -547,7 +547,7 @@
+--- init.h.orig
++++ init.h
+@@ -551,7 +551,7 @@

    ** .pp
    ** This variable specifies which editor is used by mutt.
    ** It defaults to the value of the VISUAL, or EDITOR, environment
    ** .pp
    ** This variable specifies which editor is used by mutt.
    ** It defaults to the value of the VISUAL, or EDITOR, environment

diff --git a/debian/patches/misc/define-pgp_getkeys_command.diff b/debian/patches/misc/define-pgp_getkeys_command.diff
index 9964e48a33ffafbbad3ab1c69f476caffe79936d..1aaaaaafa3c405334091c5631e1d4b492cd5d860 100644 (file)
--- a/debian/patches/misc/define-pgp_getkeys_command.diff
+++ b/debian/patches/misc/define-pgp_getkeys_command.diff
@@ -1,5 +1,5 @@
---- mutt-1.5.11.orig/contrib/gpg.rc
-+++ mutt-1.5.11/contrib/gpg.rc
+--- contrib/gpg.rc.orig
++++ contrib/gpg.rc

 @@ -72,6 +72,8 @@
  
  # fetch keys
 @@ -72,6 +72,8 @@
  
  # fetch keys

diff --git a/debian/patches/series b/debian/patches/series
index 89bf37c51ba27f55a2a1e45dca697f80516b777d..af9dccf5380a03edcf518603bda0f71ae554a6e2 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,16 +7,16 @@ features/compressed-folders.debian
 features-old/patch-1.5.4.vk.pgp_verbose_mime
 features-old/patch-1.5.5.1.nt.xtitles.3.ab.1
 
 features-old/patch-1.5.4.vk.pgp_verbose_mime
 features-old/patch-1.5.5.1.nt.xtitles.3.ab.1
 

-debian-specific/Md.Muttrc.diff 
-debian-specific/Md.sasl2_needs_md5.diff
-debian-specific/Md.etc_mailname_gethostbyname.diff
-debian-specific/use_usr_bin_editor.diff 
-debian-specific/dont_rebuild_po_files.diff 
-debian-specific/build_doc_adjustments.diff
-debian-specific/correct_docdir_in_man_page.diff 
+debian-specific/Md.Muttrc.diff -p0
+debian-specific/Md.sasl2_needs_md5.diff -p0
+debian-specific/Md.etc_mailname_gethostbyname.diff -p0
+debian-specific/use_usr_bin_editor.diff -p0
+debian-specific/dont_rebuild_po_files.diff -p0
+debian-specific/build_doc_adjustments.diff -p0
+debian-specific/correct_docdir_in_man_page.diff -p0

 debian-specific/dont_document_not_present_features.diff -p0
 
 debian-specific/dont_document_not_present_features.diff -p0
 

-misc/define-pgp_getkeys_command.diff
+misc/define-pgp_getkeys_command.diff -p0

 misc/autotools-update.diff -p0
 misc/fix-reldate-location.diff -p0
 
 misc/autotools-update.diff -p0
 misc/fix-reldate-location.diff -p0