Commit b15fa525 authored by Christoph Berg's avatar Christoph Berg

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

parent ed2af13c
......@@ -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)
* 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.
-- 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
......
--- init.c.orig
+++ init.c
--- a/init.c
+++ b/init.c
@@ -46,6 +46,7 @@
#include <unistd.h>
#include <string.h>
......@@ -8,7 +8,7 @@
#include <errno.h>
#include <sys/wait.h>
@@ -2770,6 +2771,31 @@
@@ -2911,6 +2912,31 @@ static int mutt_execute_commands (LIST *
return 0;
}
......@@ -40,7 +40,7 @@
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 */
......
--- 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.
......
--- 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)
......@@ -9,9 +9,9 @@
}
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
......
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"
......
......@@ -16,13 +16,13 @@ features/compressed-folders.debian
# 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
misc/define-pgp_getkeys_command.diff -p0
misc/define-pgp_getkeys_command.diff
misc/gpg.rc-paths
mutt.org
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment