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

[Yury Zaytsev]

Author: zaytsev-guest
Date: 2010-01-02 16:20:31 +0000 (Sat, 02 Jan 2010)
New Revision: 342

Removed:
   trunk/debian/patches/bugs/1906_editor_crash.patch
Modified:
   trunk/debian/changelog
   trunk/debian/patches/series
Log:
Updated the trunk to the new version of MC and removed the backported
patch for the editor crash since it has been already merged upstream.



Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2010-01-02 16:15:50 UTC (rev 341)
+++ trunk/debian/changelog	2010-01-02 16:20:31 UTC (rev 342)
@@ -1,8 +1,7 @@
-mc (3:4.7.0-2) UNRELEASED; urgency=low
+mc (3:4.7.0.1-1) UNRELEASED; urgency=low
 
   [Yury V. Zaytsev]
 
-  * Cherry-picked fix for the crash on editor startup (#1906 upstream).
   * Purged old unneeded links.
   * Updated README.Debian.
   * Updated the list of configuration files to be purged.

Deleted: trunk/debian/patches/bugs/1906_editor_crash.patch
===================================================================
--- trunk/debian/patches/bugs/1906_editor_crash.patch	2010-01-02 16:15:50 UTC (rev 341)
+++ trunk/debian/patches/bugs/1906_editor_crash.patch	2010-01-02 16:20:31 UTC (rev 342)
@@ -1,20 +0,0 @@
-Ticket #1906: edit: crash on file open whoen some Syntax files are absent (reported by pavlinux)
-diff --git a/edit/syntax.c b/edit/syntax.c
-index b8784d5..7479483 100644
---- a/edit/syntax.c
-+++ b/edit/syntax.c
-@@ -693,11 +693,10 @@ static FILE *open_include_file (const char *filename)
-     g_free (error_file_name);
-     error_file_name = g_strconcat (mc_home, PATH_SEP_STR, "syntax", PATH_SEP_STR,
- 				   filename, (char *) NULL);
--
--    if ((f = fopen (error_file_name, "r"))) {
--	g_free (error_file_name);
-+    f = fopen (error_file_name, "r");
-+    if (f)
- 	return f;
--    }
-+
-     g_free (error_file_name);
-     error_file_name = g_strconcat (mc_home_alt, PATH_SEP_STR "syntax" PATH_SEP_STR,
- 				   filename, (char *) NULL);

Modified: trunk/debian/patches/series
===================================================================
--- trunk/debian/patches/series	2010-01-02 16:15:50 UTC (rev 341)
+++ trunk/debian/patches/series	2010-01-02 16:20:31 UTC (rev 342)
@@ -8,4 +8,3 @@
 debian/10_use_default_images_viewer.patch
 debian/1462_fix_wrong_path_to_wrapper_script_540238.patch
 bugs/84_use_dvicat_instead_of_dvi2tty.patch
-bugs/1906_editor_crash.patch