X-Git-Url: https://git.llucax.com/software/mutt-debian.git/blobdiff_plain/4988a192dab00d86203bd44995b53284abfa1474..2fc779d212449aded8db453cd8821255913412b5:/debian/patches/misc/autotools-update.diff?ds=sidebyside diff --git a/debian/patches/misc/autotools-update.diff b/debian/patches/misc/autotools-update.diff index 9f23c56..a54361e 100644 --- a/debian/patches/misc/autotools-update.diff +++ b/debian/patches/misc/autotools-update.diff @@ -1,7 +1,8 @@ -diff -ru mutt-1.5.11+cvs20060126.orig/Makefile.in mutt-1.5.11+cvs20060126/Makefile.in ---- mutt-1.5.11+cvs20060126.orig/Makefile.in 2006-02-02 04:15:38.000000000 +0100 -+++ mutt-1.5.11+cvs20060126/Makefile.in 2006-02-02 04:40:04.000000000 +0100 -@@ -75,10 +75,10 @@ +Index: mutt/Makefile.in +=================================================================== +--- mutt.orig/Makefile.in 2007-03-13 20:40:30.000000000 +0100 ++++ mutt/Makefile.in 2007-03-13 21:08:37.000000000 +0100 +@@ -73,10 +73,10 @@ am__objects_1 = patchlist.$(OBJEXT) am_mutt_OBJECTS = $(am__objects_1) addrbook.$(OBJEXT) alias.$(OBJEXT) \ attach.$(OBJEXT) base64.$(OBJEXT) browser.$(OBJEXT) \ buffy.$(OBJEXT) color.$(OBJEXT) crypt.$(OBJEXT) \ @@ -16,25 +17,25 @@ diff -ru mutt-1.5.11+cvs20060126.orig/Makefile.in mutt-1.5.11+cvs20060126/Makefi filter.$(OBJEXT) from.$(OBJEXT) getdomain.$(OBJEXT) \ group.$(OBJEXT) handler.$(OBJEXT) hash.$(OBJEXT) \ hdrline.$(OBJEXT) headers.$(OBJEXT) help.$(OBJEXT) \ -@@ -299,7 +299,7 @@ +@@ -301,7 +301,7 @@ bin_SCRIPTS = muttbug flea @SMIMEAUX_TAR BUILT_SOURCES = keymap_defs.h patchlist.c mutt_SOURCES = $(BUILT_SOURCES) \ addrbook.c alias.c attach.c base64.c browser.c buffy.c color.c \ -- crypt.c cryptglue.c \ -+ crypt.c cryptglue.c compress.c \ +- crypt.c cryptglue.c \ ++ crypt.c cryptglue.c compress.c \ commands.c complete.c compose.c copy.c curs_lib.c curs_main.c date.c \ edit.c enter.c flags.c init.c filter.c from.c \ getdomain.c group.c \ -@@ -331,7 +331,7 @@ - crypt-gpgme.c crypt-mod-pgp-gpgme.c crypt-mod-smime-gpgme.c +@@ -334,7 +334,7 @@ EXTRA_mutt_SOURCES = account.c md5c.c mu + utf8.c wcwidth.c - EXTRA_DIST = COPYRIGHT GPL OPS OPS.PGP OPS.CRYPT OPS.SMIME TODO \ + EXTRA_DIST = COPYRIGHT GPL OPS OPS.PGP OPS.CRYPT OPS.SMIME TODO UPDATING \ - configure account.h \ + configure account.h compress.h \ attach.h buffy.h charset.h copy.h crypthash.h dotlock.h functions.h gen_defs \ globals.h hash.h history.h init.h keymap.h mutt_crypt.h \ mailbox.h mapping.h md5.h mime.h mutt.h mutt_curses.h mutt_menu.h \ -@@ -497,6 +497,7 @@ +@@ -506,6 +506,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/commands.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/complete.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/compose.Po@am__quote@ @@ -42,11 +43,11 @@ diff -ru mutt-1.5.11+cvs20060126.orig/Makefile.in mutt-1.5.11+cvs20060126/Makefi @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/copy.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/crypt-gpgme.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/crypt-mod-pgp-classic.Po@am__quote@ -Only in mutt-1.5.11+cvs20060126: autom4te.cache -diff -ru mutt-1.5.11+cvs20060126.orig/config.h.in mutt-1.5.11+cvs20060126/config.h.in ---- mutt-1.5.11+cvs20060126.orig/config.h.in 2006-02-02 04:14:49.000000000 +0100 -+++ mutt-1.5.11+cvs20060126/config.h.in 2006-02-02 04:40:00.000000000 +0100 -@@ -507,6 +507,9 @@ +Index: mutt/config.h.in +=================================================================== +--- mutt.orig/config.h.in 2007-03-12 19:15:58.000000000 +0100 ++++ mutt/config.h.in 2007-03-13 21:08:09.000000000 +0100 +@@ -513,6 +513,9 @@ /* Define to enable Sun mailtool attachments support. */ #undef SUN_ATTACHMENT @@ -56,11 +57,11 @@ diff -ru mutt-1.5.11+cvs20060126.orig/config.h.in mutt-1.5.11+cvs20060126/config /* Define to use dotlocking for mailboxes. */ #undef USE_DOTLOCK -Only in mutt-1.5.11+cvs20060126: config.h.in~ -diff -ru mutt-1.5.11+cvs20060126.orig/configure mutt-1.5.11+cvs20060126/configure ---- mutt-1.5.11+cvs20060126.orig/configure 2006-02-02 04:39:52.000000000 +0100 -+++ mutt-1.5.11+cvs20060126/configure 2006-02-02 04:40:05.000000000 +0100 -@@ -868,6 +868,7 @@ +Index: mutt/configure +=================================================================== +--- mutt.orig/configure 2007-03-13 20:40:37.000000000 +0100 ++++ mutt/configure 2007-03-13 21:08:33.000000000 +0100 +@@ -1367,6 +1367,7 @@ Optional Features: --enable-buffy-size Use file size attribute instead of access time --enable-mailtool Enable Sun mailtool attachments support --enable-locales-fix The result of isprint() is unreliable @@ -68,23 +69,22 @@ diff -ru mutt-1.5.11+cvs20060126.orig/configure mutt-1.5.11+cvs20060126/configur --enable-exact-address Enable regeneration of email addresses --enable-hcache Enable header caching --disable-iconv Disable iconv support -@@ -14682,6 +14682,18 @@ - fi - fi; +@@ -15489,6 +15490,18 @@ _ACEOF + fi -+# Check whether --enable-compressed or --disable-compressed was given. + ++# Check whether --enable-compressed was given. +if test "${enable_compressed+set}" = set; then -+ enableval="$enable_compressed" -+ if test x$enableval = xyes; then ++ enableval=$enable_compressed; if test x$enableval = xyes; then + +cat >>confdefs.h <<\_ACEOF +#define USE_COMPRESSED 1 +_ACEOF + + fi -+fi; ++fi ++ + - # Check whether --with-exec-shell or --without-exec-shell was given. + # Check whether --with-exec-shell was given. if test "${with_exec_shell+set}" = set; then -Only in mutt-1.5.11+cvs20060126: diff.zHFCuH