fixed sidebar and compress patches, Standards-Version bumped to 3.9.1, changelog...

diff --git a/debian/changelog b/debian/changelog
index c06fbdc0e4d62f756d4d70bf18c3786a623fb804..00dacce2d3bf4a39a1d1b84b2f6aba0fdb9d52fe 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,18 @@
-mutt (1.5.20-10) experimental; urgency=low
+mutt (1.5.21-1) experimental; urgency=low
 
+  [ Christoph Berg ]
   * debian/patches: features/imap_fast_trash: Make "move to trash folder" use
     IMAP COPY, by Paul Miller (jettero).
 
- -- Christoph Berg <myon@debian.org>  Wed, 25 Aug 2010 11:11:43 +0200
+  [ Antonio Radici ]
+  * New upstream version (Closes: 597487)
+  * debian/patches:
+    + refreshed all patches
+    + removed patches applied upstream
+  * debian/control:
+    + Standards-Version bumped to 3.9.1, no change required
+
+ -- Antonio Radici <antonio@dyne.org>  Sun, 03 Oct 2010 22:48:50 +0100
 
 mutt (1.5.20-9) unstable; urgency=low
 

diff --git a/debian/control b/debian/control
index 18060d7a527d4c79cdfbde911e72897c2a162f6d..670dc230486558d2aeffa63854de151193ef3a6a 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Build-Depends: automake, debhelper (>> 7), docbook-xml, docbook-xsl,
  libgpgme11-dev, libidn11-dev, libkrb5-dev, libncurses5-dev, libncursesw5-dev,
  libsasl2-dev, pkg-config, quilt, xsltproc, zlib1g-dev,
  libtokyocabinet-dev [!hurd-i386], libgdbm-dev [hurd-i386]
-Standards-Version: 3.8.4
+Standards-Version: 3.9.1
 Vcs-Git: git://git.debian.org/git/pkg-mutt/mutt.git
 Vcs-Browser: http://git.debian.org/?p=pkg-mutt/mutt.git
 Homepage: http://www.mutt.org/

diff --git a/debian/patches/features/compressed-folders b/debian/patches/features/compressed-folders
index a9de103ed633274ebebf49e8b229d0f3e1fdc37d..7f6e233373adbb5fb9840b528e43a12e0b97f65f 100644 (file)
--- a/debian/patches/features/compressed-folders
+++ b/debian/patches/features/compressed-folders
@@ -175,7 +175,7 @@ The home page for this patch is:
 +  ctx->realpath = ctx->path;
 +
 +  /* Uncompress to /tmp */
-+  mutt_mktemp (tmppath);
++  mutt_mktemp (tmppath, sizeof(tmppath));
 +  ctx->path = safe_malloc (strlen (tmppath) + 1);
 +  strcpy (ctx->path, tmppath);
 +}

diff --git a/debian/patches/mutt-patched/sidebar b/debian/patches/mutt-patched/sidebar
index c207da7fd912051a50d863ad0858b4e4d4a1624a..fe06ea74d63b9f9bcadeea65c49cbffba760c26f 100644 (file)
--- a/debian/patches/mutt-patched/sidebar
+++ b/debian/patches/mutt-patched/sidebar
@@ -53,7 +53,7 @@ in the "mutt-patched" package.
        rc = 1;
        break;
      }
-@@ -337,6 +343,33 @@
+@@ -337,6 +343,32 @@
  
    closedir (dirp);
  
@@ -65,7 +65,6 @@ in the "mutt-patched" package.
 +  if ((dirp = opendir (path)) == NULL)
 +  {
 +    mailbox->magic = 0;
-+    break;
 +  }
 +  while ((de = readdir (dirp)) != NULL)
 +  {
@@ -87,7 +86,14 @@ in the "mutt-patched" package.
    return rc;
  }
  
-@@ -351,8 +384,26 @@
+@@ -345,14 +377,33 @@
+ {
+   int rc = 0;
+   int statcheck;
++  CONTEXT *ctx;
+ 
+   if (option (OPTCHECKMBOXSIZE))
+     statcheck = sb->st_size > mailbox->size;
    else
      statcheck = sb->st_mtime > sb->st_atime
        || (mailbox->newly_created && sb->st_ctime == sb->st_mtime && sb->st_ctime == sb->st_atime);
@@ -115,7 +121,11 @@ in the "mutt-patched" package.
      if (!option(OPTMAILCHECKRECENT) || sb->st_mtime > mailbox->last_visited)
      {
        rc = 1;
-@@ -377,6 +428,7 @@
+@@ -374,9 +425,11 @@
+ int mutt_buffy_check (int force)
+ {
+   BUFFY *tmp;
++  struct dirent *de, *dp;
    struct stat sb;
    struct stat contex_sb;
    time_t t;
@@ -123,12 +133,12 @@ in the "mutt-patched" package.
  
    sb.st_size=0;
    contex_sb.st_dev=0;
-@@ -456,6 +508,20 @@
+@@ -456,6 +509,20 @@
        case M_MH:
        if ((tmp->new = mh_buffy (tmp->path)) > 0)
          BuffyCount++;
 +
-+  if ((dp = opendir (path)) == NULL)
++  if ((dp = opendir (tmp->path)) == NULL)
 +    break;
 +  tmp->msgcount = 0;
 +  while ((de = readdir (dp)))
@@ -140,7 +150,7 @@ in the "mutt-patched" package.
 +    }
 +  }
 +  closedir (dp);
-+      }
++
        break;
        }
      }