From: Adeodato Simó Date: Sat, 15 Jul 2006 00:32:20 +0000 (+0200) Subject: Convert debian-specific/* and misc/* patches to -p0. X-Git-Tag: 1.5.12-1~4 X-Git-Url: https://git.llucax.com/software/mutt-debian.git/commitdiff_plain/72ac627fd7f017a392afab5a5a737d1026664135?ds=sidebyside 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 aa1ba07..2aa56e6 100644 --- 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 diff --git a/debian/patches/debian-specific/Md.etc_mailname_gethostbyname.diff b/debian/patches/debian-specific/Md.etc_mailname_gethostbyname.diff index de6765e..e55bdc6 100644 --- 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 #include @@ -8,7 +8,7 @@ #include #include -@@ -2761,6 +2762,31 @@ +@@ -2770,6 +2771,31 @@ return 0; } @@ -40,7 +40,7 @@ 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 */ diff --git a/debian/patches/debian-specific/Md.sasl2_needs_md5.diff b/debian/patches/debian-specific/Md.sasl2_needs_md5.diff index d769dfb..7d5a7df 100644 --- 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 diff --git a/debian/patches/debian-specific/build_doc_adjustments.diff b/debian/patches/debian-specific/build_doc_adjustments.diff index f16f8e5..be710cc 100644 --- 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: 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 e8a58cb..3bff38e 100644 --- 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" diff --git a/debian/patches/debian-specific/dont_rebuild_po_files.diff b/debian/patches/debian-specific/dont_rebuild_po_files.diff index 9897f7c..4f2c292 100644 --- 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. diff --git a/debian/patches/debian-specific/use_usr_bin_editor.diff b/debian/patches/debian-specific/use_usr_bin_editor.diff index 402c867..ae5f6b7 100644 --- 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) @@ -9,9 +9,9 @@ } 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 diff --git a/debian/patches/misc/define-pgp_getkeys_command.diff b/debian/patches/misc/define-pgp_getkeys_command.diff index 9964e48..1aaaaaa 100644 --- 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 diff --git a/debian/patches/series b/debian/patches/series index 89bf37c..af9dccf 100644 --- 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 -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 -misc/define-pgp_getkeys_command.diff +misc/define-pgp_getkeys_command.diff -p0 misc/autotools-update.diff -p0 misc/fix-reldate-location.diff -p0