[Pkg-mc-commits] r162 - in trunk/debian/patches: . bugs

[winnie at alioth.debian.org]

Author: winnie
Date: 2008-06-23 20:20:43 +0000 (Mon, 23 Jun 2008)
New Revision: 162

Modified:
   trunk/debian/patches/all.series
   trunk/debian/patches/bugs/99a_fix-regex-bol-match.patch
   trunk/debian/patches/bugs/99b_fix-regex-pattern-lengths.patch
   trunk/debian/patches/bugs/99c_fix-regex-newline-match.patch
Log:
Fix order


Modified: trunk/debian/patches/all.series
===================================================================
--- trunk/debian/patches/all.series	2008-06-23 20:16:26 UTC (rev 161)
+++ trunk/debian/patches/all.series	2008-06-23 20:20:43 UTC (rev 162)
@@ -1,9 +1,6 @@
 bugs/28_mc-dontrewrite.patch
 bugs/61_escaping.patch
 bugs/64_visible_tabs.patch
-bugs/99a_fix-regex-bol-match.patch
-bugs/99b_fix-regex-pattern-lengths.patch
-bugs/99c_fix-regex-newline-match.patch
 debian/01_correct_conffile_paths_in_man.patch
 debian/02_use_correct_smb_conf_path.patch
 debian/04_debian_menu_additions.patch
@@ -48,5 +45,7 @@
 vfs/07_srpm_support.patch
 vfs/08_improved_u7z_support.patch
 vfs/09_choose_correct_urar.patch
-bugs/99_regexp-replace-fixed.patch
+bugs/99a_fix-regex-bol-match.patch
+bugs/99b_fix-regex-pattern-lengths.patch
+bugs/99c_fix-regex-newline-match.patch
 autgen-run.patch

Modified: trunk/debian/patches/bugs/99a_fix-regex-bol-match.patch
===================================================================
--- trunk/debian/patches/bugs/99a_fix-regex-bol-match.patch	2008-06-23 20:16:26 UTC (rev 161)
+++ trunk/debian/patches/bugs/99a_fix-regex-bol-match.patch	2008-06-23 20:20:43 UTC (rev 162)
@@ -1,6 +1,3 @@
-Fix regexp matching beginning of line, bol was matched at cursor after
-starting regexp replace.
-
 --- mc-4.6.2~git20080311/edit/editcmd.c.orig	2008-06-22 16:58:16.000000000 +0200
 +++ mc-4.6.2~git20080311/edit/editcmd.c	2008-06-22 16:58:53.000000000 +0200
 @@ -1721,7 +1721,7 @@

Modified: trunk/debian/patches/bugs/99b_fix-regex-pattern-lengths.patch
===================================================================
--- trunk/debian/patches/bugs/99b_fix-regex-pattern-lengths.patch	2008-06-23 20:16:26 UTC (rev 161)
+++ trunk/debian/patches/bugs/99b_fix-regex-pattern-lengths.patch	2008-06-23 20:20:43 UTC (rev 162)
@@ -1,7 +1,3 @@
-Fix subpattern byte offsets computation, previously mbstrlen function was used
-which chokes on nonprinting characters, regex substrings that captured tab
-characters were truncated.
-
 --- mc-4.6.2~git20080311/edit/editcmd.c.orig	2008-06-23 01:48:03.000000000 +0200
 +++ mc-4.6.2~git20080311/edit/editcmd.c	2008-06-23 01:58:32.000000000 +0200
 @@ -1511,6 +1511,32 @@

Modified: trunk/debian/patches/bugs/99c_fix-regex-newline-match.patch
===================================================================
--- trunk/debian/patches/bugs/99c_fix-regex-newline-match.patch	2008-06-23 20:16:26 UTC (rev 161)
+++ trunk/debian/patches/bugs/99c_fix-regex-newline-match.patch	2008-06-23 20:20:43 UTC (rev 162)
@@ -1,7 +1,3 @@
-Add REG_NEWLINE flag to regexp replace matching as it is unusual for '.' to
-match newline, edit_find_string function already splits data on newlines before
-passing it to string_regexp_search so multiline matching is already crippled.
-
 --- mc-4.6.2~git20080311/edit/editcmd.c.orig	2008-06-23 02:22:30.000000000 +0200
 +++ mc-4.6.2~git20080311/edit/editcmd.c	2008-06-23 02:23:34.000000000 +0200
 @@ -1570,7 +1570,8 @@