[Pkg-mc-commits] r13 - in trunk/debian: . patches
winnie at alioth.debian.org
winnie at alioth.debian.org
Fri Jan 25 08:58:36 UTC 2008
Author: winnie
Date: 2008-01-25 08:58:35 +0000 (Fri, 25 Jan 2008)
New Revision: 13
Removed:
trunk/debian/patches/37_mcedit-segv.patch
Modified:
trunk/debian/TODO
trunk/debian/patches/28_mc-dontrewrite.patch
trunk/debian/patches/32_c-vs-cxx.patch
Log:
Some more rediffed patches
Modified: trunk/debian/TODO
===================================================================
--- trunk/debian/TODO 2008-01-25 07:35:37 UTC (rev 12)
+++ trunk/debian/TODO 2008-01-25 08:58:35 UTC (rev 13)
@@ -1 +1,2 @@
* rediff all patches in debian/patches
+ - review patches/37_mcedit-segv.patch .. I'm not sure if it is still needed.
Modified: trunk/debian/patches/28_mc-dontrewrite.patch
===================================================================
--- trunk/debian/patches/28_mc-dontrewrite.patch 2008-01-25 07:35:37 UTC (rev 12)
+++ trunk/debian/patches/28_mc-dontrewrite.patch 2008-01-25 08:58:35 UTC (rev 13)
@@ -1,6 +1,6 @@
diff -Nurwd mc-4.6.2~pre1/edit/editcmd.c mc-4.6.2~pre1.patched/edit/editcmd.c
--- mc-4.6.2~pre1/edit/editcmd.c 2007-05-02 13:22:01.000000000 +0200
-+++ mc-4.6.2~pre1.patched/edit/editcmd.c 2008-01-25 08:15:57.000000000 +0100
++++ mc-4.6.2~pre1/edit/editcmd.c 2008-01-25 08:15:57.000000000 +0100
@@ -26,7 +26,6 @@
#include <config.h>
Modified: trunk/debian/patches/32_c-vs-cxx.patch
===================================================================
--- trunk/debian/patches/32_c-vs-cxx.patch 2008-01-25 07:35:37 UTC (rev 12)
+++ trunk/debian/patches/32_c-vs-cxx.patch 2008-01-25 08:58:35 UTC (rev 13)
@@ -1,6 +1,6 @@
diff -Nurwd mc-4.6.2~pre1/syntax/c.syntax mc-4.6.2~pre1.patched/syntax/c.syntax
--- mc-4.6.2~pre1/syntax/c.syntax 2006-06-22 14:49:24.000000000 +0200
-+++ mc-4.6.2~pre1.patched/syntax/c.syntax 2008-01-25 08:19:52.000000000 +0100
++++ mc-4.6.2~pre1/syntax/c.syntax 2008-01-25 08:19:52.000000000 +0100
@@ -33,34 +33,7 @@
keyword whole volatile yellow
keyword whole while yellow
@@ -38,7 +38,7 @@
keyword whole linestart \{\s\t\}\[\s\t\]#*\n brightmagenta
diff -Nurwd mc-4.6.2~pre1/syntax/Makefile.am mc-4.6.2~pre1.patched/syntax/Makefile.am
--- mc-4.6.2~pre1/syntax/Makefile.am 2007-08-27 08:56:47.000000000 +0200
-+++ mc-4.6.2~pre1.patched/syntax/Makefile.am 2008-01-25 08:19:52.000000000 +0100
++++ mc-4.6.2~pre1/syntax/Makefile.am 2008-01-25 08:19:52.000000000 +0100
@@ -3,6 +3,7 @@
ada95.syntax \
aspx.syntax \
@@ -49,7 +49,7 @@
cs.syntax \
diff -Nurwd mc-4.6.2~pre1/syntax/Syntax mc-4.6.2~pre1.patched/syntax/Syntax
--- mc-4.6.2~pre1/syntax/Syntax 2007-08-27 08:56:47.000000000 +0200
-+++ mc-4.6.2~pre1.patched/syntax/Syntax 2008-01-25 08:19:52.000000000 +0100
++++ mc-4.6.2~pre1/syntax/Syntax 2008-01-25 08:19:52.000000000 +0100
@@ -76,9 +76,12 @@
file ..\*\.(texi|texinfo|TEXI|TEXINFO)$ Texinfo\sDocument
include texinfo.syntax
Deleted: trunk/debian/patches/37_mcedit-segv.patch
===================================================================
--- trunk/debian/patches/37_mcedit-segv.patch 2008-01-25 07:35:37 UTC (rev 12)
+++ trunk/debian/patches/37_mcedit-segv.patch 2008-01-25 08:58:35 UTC (rev 13)
@@ -1,22 +0,0 @@
-diff -Nurwd mc-4.6.2~pre1/edit/edit-widget.h mc-4.6.2~pre1.patched/edit/edit-widget.h
---- mc-4.6.2~pre1/edit/edit-widget.h 2007-02-03 02:03:53.000000000 +0100
-+++ mc-4.6.2~pre1.patched/edit/edit-widget.h 2008-01-25 08:29:57.000000000 +0100
-@@ -99,6 +99,7 @@
- /* syntax higlighting */
- struct _syntax_marker *syntax_marker;
- struct context_rule **rules;
-+ size_t rules_count; /* number of rules that are defined */
- long last_get_rule;
- struct syntax_rule rule;
- char *syntax_type; /* description of syntax highlighting type being used */
-diff -Nurwd mc-4.6.2~pre1/edit/syntax.c mc-4.6.2~pre1.patched/edit/syntax.c
---- mc-4.6.2~pre1/edit/syntax.c 2006-08-02 17:18:22.000000000 +0200
-+++ mc-4.6.2~pre1.patched/edit/syntax.c 2008-01-25 08:29:57.000000000 +0100
-@@ -941,6 +941,7 @@
- if (num_contexts == -1) {
- return line;
- }
-+ edit->rules_count = num_contexts;
-
- {
- char *first_chars, *p;
More information about the Pkg-mc-commits
mailing list