patches: Removed mem-corruption-fix, non-utf8-fix, tigrc-parsing-fix.

All of those patches are included in 0.14.

diff --git a/debian/changelog b/debian/changelog
index 51a870377def13804740b7a7d8c6d42ff1ac25f2..0a431c9767716762a20a309e83bde2c27e05052d 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,12 @@
 tig (0.14-1) experimental; urgency=low
 
   * New upstream release.
+  * debian/patches:
+    - Removed non-utf8-fix.dpatch - included upstream.
+    - Removed tigrc-parsing-fix.dpatch - included upstream.
+    - Removed mem-corruption-fix.dpatch - included upstream.
 
- -- Sebastian Harl <sh@tokkee.org>  Fri, 13 Feb 2009 10:42:06 +0100
+ -- Sebastian Harl <sh@tokkee.org>  Fri, 13 Feb 2009 10:47:17 +0100
 
 tig (0.13-1) experimental; urgency=low
 

diff --git a/debian/patches/00list b/debian/patches/00list
index 882e105b73406216743401df1519eb0bd3ee9081..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 (file)
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -1,4 +0,0 @@
-non-utf8-fix.dpatch
-tigrc-parsing-fix.dpatch
-mem-corruption-fix.dpatch
-

diff --git a/debian/patches/mem-corruption-fix.dpatch b/debian/patches/mem-corruption-fix.dpatch
deleted file mode 100755 (executable)
index b4fd19b..0000000
--- a/debian/patches/mem-corruption-fix.dpatch
+++ /dev/null
@@ -1,60 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## mem-corruption-fix.dpatch by Jonas Fonseca <fonseca@diku.dk>
-##
-## DP: Fix memory corruption bug in tree_read when sorting the entries
-## DP:
-## DP: Triggered by defining ITEM_CHUNK_SIZE to 1.
-
-diff git a/tig.c b/tig.c
---- a/tig.c
-+++ b/tig.c
-@@ -3614,7 +3614,7 @@ static bool
- {
-       size_t textlen = text ? strlen(text) : 0;
-       char buf[SIZEOF_STR];
--      unsigned long pos;
-+      size_t pos;
-       enum line_type type;
-       bool first_read = view->lines == 0;
- 
-@@ -3645,8 +3645,12 @@ tree_read(struct view *view, char *text)
-                       return FALSE;
-       }
- 
-+      if (!add_line_text(view, text, type))
-+              return FALSE;
-+      text = view->line[view->lines - 1].data;
-+
-       /* Skip "Directory ..." and ".." line. */
--      for (pos = 1 + !!*opt_path; pos < view->lines; pos++) {
-+      for (pos = 1 + !!*opt_path; pos < view->lines - 1; pos++) {
-               struct line *line = &view->line[pos];
-               const char *path1 = tree_path(line);
-               char *path2 = text + SIZEOF_TREE_ATTR;
-@@ -3655,24 +3659,16 @@ tree_read(struct view *view, char *text)
-               if (cmp <= 0)
-                       continue;
- 
--              text = strdup(text);
--              if (!text)
--                      return FALSE;
--
--              if (view->lines > pos)
-+              if (view->lines - 1 > pos)
-                       memmove(&view->line[pos + 1], &view->line[pos],
--                              (view->lines - pos) * sizeof(*line));
-+                              (view->lines - 1 - pos) * sizeof(*line));
- 
-               line = &view->line[pos];
-               line->data = text;
-               line->type = type;
--              view->lines++;
-               return TRUE;
-       }
- 
--      if (!add_line_text(view, text, type))
--              return FALSE;
--
-       if (tree_lineno > view->lineno) {
-               view->lineno = tree_lineno;
-               tree_lineno = 0;

diff --git a/debian/patches/non-utf8-fix.dpatch b/debian/patches/non-utf8-fix.dpatch
deleted file mode 100755 (executable)
index 5a01ff7..0000000
--- a/debian/patches/non-utf8-fix.dpatch
+++ /dev/null
@@ -1,26 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## non-utf8-fix.dpatch by Jonas Fonseca <fonseca@diku.dk>
-##
-## DP: Fix regression in handling of data for non-UTF-8 locales
-## DP:
-## DP: The bug was introduced in 65498141015b6070cf5c9b5704039389dba76e90 where
-## DP: the the IO API was changed from using stdio to 'raw' file descriptors.
-## DP: Part of the change removed the need for cutting the ending newline from
-## DP: the input line in update_view(). This caused the resulting iconv output
-## DP: buffer to not be NUL terminated since the input string no longer
-## DP: contained an ending NULL byte.
-## DP:
-## DP: Reported by Pavel Roskin.
-
-diff a/tig.c b/tig.c
---- a/tig.c
-+++ b/tig.c
-@@ -2707,7 +2707,7 @@ update_view(struct view *view)
- 
-               if (opt_iconv != ICONV_NONE) {
-                       ICONV_CONST char *inbuf = line;
--                      size_t inlen = linelen;
-+                      size_t inlen = linelen + 1;
- 
-                       char *outbuf = out_buffer;
-                       size_t outlen = sizeof(out_buffer);

diff --git a/debian/patches/tigrc-parsing-fix.dpatch b/debian/patches/tigrc-parsing-fix.dpatch
deleted file mode 100755 (executable)
index d784dba..0000000
--- a/debian/patches/tigrc-parsing-fix.dpatch
+++ /dev/null
@@ -1,25 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## tigrc-parsing-fix.dpatch by Jonas Fonseca <fonseca@diku.dk>
-##
-## DP: Fix tokenizing when parsing ~/.tigrc
-## DP:
-## DP: When moving to use argv_from_string() in set_option() a regression was
-## DP: introduced causing problems with parsing of multiple spaces between
-## DP: arguments. For example:
-## DP:
-## DP:         color date              yellow  default
-## DP:
-## DP: Reported by Clifford Caoile.
-
-diff a/tig.c b/tig.c
---- a/tig.c
-+++ b/tig.c
-@@ -292,7 +292,7 @@ argv_from_string(const char *argv[SIZEOF_ARG], int *argc, char *cmd)
- 
-               cmd[valuelen] = 0;
-               argv[(*argc)++] = chomp_string(cmd);
--              cmd += valuelen + advance;
-+              cmd = chomp_string(cmd + valuelen + advance);
-       }
- 
-       if (*argc < SIZEOF_ARG)