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

[Yury Zaytsev]

Author: zaytsev-guest
Date: 2010-08-09 16:31:12 +0000 (Mon, 09 Aug 2010)
New Revision: 443

Added:
   trunk/debian/patches/debian/99_detect_alt_editor.patch
Modified:
   trunk/debian/changelog
   trunk/debian/patches/series
Log:
Added patch to detect that mc was launched from alternatives symlink (editor)



Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2010-08-09 13:28:08 UTC (rev 442)
+++ trunk/debian/changelog	2010-08-09 16:31:12 UTC (rev 443)
@@ -5,7 +5,7 @@
     + Added *.ini file syntax (Closes: #567046)
     + mcedit won't go looping when replacing \n regexp (Closes: #584241)
     + mcedit won't try to set the codepage twice (Closes: #586903)
-    + Removed obsolete mcedit/mcview wrappers (Closes: #592208)
+    + Removed mcedit/mcview wrappers in favor of patch (Closes: #592208)
   * Bumped standards version to 3.9.1.0.
   * Removed duplicate lintian override.
   * Removed Denis Briand <denis at narcan.fr> from uploaders.

Added: trunk/debian/patches/debian/99_detect_alt_editor.patch
===================================================================
--- trunk/debian/patches/debian/99_detect_alt_editor.patch	                        (rev 0)
+++ trunk/debian/patches/debian/99_detect_alt_editor.patch	2010-08-09 16:31:12 UTC (rev 443)
@@ -0,0 +1,15 @@
+Description: Detect that mc was launched from alternatives symlink
+Bug-Debian: http://bugs.debian.org/592208
+Author: Yury V. Zaytsev <yury at shurup.com>
+
+--- a/src/main.c
++++ b/src/main.c
+@@ -2018,7 +2018,7 @@ mc_main__setup_by_args (int argc, char *argv[])
+     base = x_basename (argv[0]);
+     tmp = (argc > 0) ? argv[1] : NULL;
+ 
+-    if (!STRNCOMP (base, "mce", 3) || !STRCOMP (base, "vi")) {
++    if (!STRNCOMP (base, "mce", 3) || !STRCOMP (base, "editor") || !STRCOMP (base, "vi")) {
+ 	edit_one_file = "";
+ 	if (tmp) {
+ 	    /*

Modified: trunk/debian/patches/series
===================================================================
--- trunk/debian/patches/series	2010-08-09 13:28:08 UTC (rev 442)
+++ trunk/debian/patches/series	2010-08-09 16:31:12 UTC (rev 443)
@@ -7,3 +7,4 @@
 debian/10_use_default_images_viewer.patch
 debian/20_wrong_path_to_wrappers.patch
 debian/84_use_dvicat_instead_of_dvi2tty.patch
+debian/99_detect_alt_editor.patch