Refresh some patches to get rid of -p0 in series file.

diff --git a/debian/changelog b/debian/changelog
index 1575e3328bac9d6111c072762ad013f878019285..88fadae6e0dab65c0fa242b31b33142277930787 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,10 +6,11 @@ mutt (1.5.18-2) unstable; urgency=low
   * Use dh_lintian (prefix with '-' so we do not need to bump the DH level).
   * Register mutt as message/rfc822 application in /etc/mailcap.
     (Closes: #474539)
   * Use dh_lintian (prefix with '-' so we do not need to bump the DH level).
   * Register mutt as message/rfc822 application in /etc/mailcap.
     (Closes: #474539)

+  * Refresh some patches to get rid of -p0 in series file.

   * Bump Standards-Version; add debian/README.source.
   * Switch Maintainer and Uploader as suggested by Dato.
 
   * Bump Standards-Version; add debian/README.source.
   * Switch Maintainer and Uploader as suggested by Dato.
 

- -- Christoph Berg <myon@debian.org>  Thu, 12 Jun 2008 23:45:33 +0200
+ -- Christoph Berg <myon@debian.org>  Thu, 12 Jun 2008 23:53:46 +0200

 
 mutt (1.5.18-1) unstable; urgency=low
 
 
 mutt (1.5.18-1) unstable; urgency=low
 

diff --git a/debian/patches/debian-specific/Md.etc_mailname_gethostbyname.diff b/debian/patches/debian-specific/Md.etc_mailname_gethostbyname.diff
index e55bdc6be71bd5a97b97baec09fa41d14aec8186..f7a94b0104c437ae4d134f51850447e0d322ec89 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 @@
---- init.c.orig
-+++ init.c
+--- a/init.c
++++ b/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>
  

-@@ -2770,6 +2771,31 @@
+@@ -2911,6 +2912,31 @@ static int mutt_execute_commands (LIST *

    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;

-@@ -2841,10 +2867,25 @@
+@@ -2982,10 +3008,25 @@ void mutt_init (int skip_sys_rc, LIST *c

      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/correct_docdir_in_man_page.diff b/debian/patches/debian-specific/correct_docdir_in_man_page.diff
index 3bff38ec16c85b5113ac969f360b04d5299015c4..dcfdd4ff5aeea39b7fb574b931a1cf706a1408bc 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,6 +1,6 @@
---- doc/mutt.man.orig
-+++ doc/mutt.man
-@@ -154,7 +154,7 @@
+--- a/doc/mutt.man
++++ b/doc/mutt.man
+@@ -167,7 +167,7 @@ User's personal mapping between MIME typ

  System mapping between MIME types and file extensions.
  .IP "@bindir@/mutt_dotlock"
  The privileged dotlocking program.
  System mapping between MIME types and file extensions.
  .IP "@bindir@/mutt_dotlock"
  The privileged dotlocking program.

diff --git a/debian/patches/debian-specific/use_usr_bin_editor.diff b/debian/patches/debian-specific/use_usr_bin_editor.diff
index ae5f6b7bf25c1bb6680eb9eafcc83550ad7b0540..f6b6806aae0f84d80a6fed5a6f02c8c20d9a537d 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 @@
---- init.c.orig
-+++ init.c
-@@ -2929,7 +2929,7 @@
+--- a/init.c
++++ b/init.c
+@@ -3070,7 +3070,7 @@ void mutt_init (int skip_sys_rc, LIST *c

    {
      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);

---- init.h.orig
-+++ init.h
-@@ -551,7 +551,7 @@
+--- a/init.h
++++ b/init.h
+@@ -552,7 +552,7 @@ struct option_t MuttVars[] = {

    ** .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 3dbad753d3d8a9ec50c576d9731e3b3f4e5bd68b..b26727b23871773df06f3c2d4f09e49ecd8729af 100644 (file)
--- a/debian/patches/misc/define-pgp_getkeys_command.diff
+++ b/debian/patches/misc/define-pgp_getkeys_command.diff
@@ -1,8 +1,6 @@
-Index: contrib/gpg.rc
-===================================================================
---- contrib/gpg.rc.orig        2007-03-01 23:14:09.076973224 +0100
-+++ contrib/gpg.rc     2007-03-01 23:32:04.172533856 +0100
-@@ -72,6 +72,8 @@ set pgp_list_secring_command="/usr/bin/g
+--- a/contrib/gpg.rc
++++ b/contrib/gpg.rc
+@@ -72,6 +72,8 @@ set pgp_list_secring_command="gpg --no-v

  
  # fetch keys
  # set pgp_getkeys_command="pkspxycwrap %r"
  
  # fetch keys
  # set pgp_getkeys_command="pkspxycwrap %r"

diff --git a/debian/patches/series b/debian/patches/series
index 0669627f35afc02d9e4eabdf18effd1902bd5daf..2f10dfc1d0bef9166f26232126604c1ef4d30c3d 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -16,13 +16,13 @@ features/compressed-folders.debian
 
 # Debian config
 debian-specific/Muttrc
 
 # Debian config
 debian-specific/Muttrc

-debian-specific/Md.etc_mailname_gethostbyname.diff -p0
-debian-specific/use_usr_bin_editor.diff -p0
-debian-specific/correct_docdir_in_man_page.diff -p0
+debian-specific/Md.etc_mailname_gethostbyname.diff 
+debian-specific/use_usr_bin_editor.diff 
+debian-specific/correct_docdir_in_man_page.diff 

 debian-specific/dont_document_not_present_features.diff 
 debian-specific/document_debian_defaults
 debian-specific/assumed_charset-compat
 debian-specific/dont_document_not_present_features.diff 
 debian-specific/document_debian_defaults
 debian-specific/assumed_charset-compat

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

 misc/gpg.rc-paths
 
 mutt.org
 misc/gpg.rc-paths
 
 mutt.org