[Pkg-mc-commits] r136 - trunk/debian/patches/utf8

[winnie at alioth.debian.org]

Author: winnie
Date: 2008-05-18 12:13:11 +0000 (Sun, 18 May 2008)
New Revision: 136

Modified:
   trunk/debian/patches/utf8/mc-utf8-look-and-feel.patch
Log:
MAke this patch apply


Modified: trunk/debian/patches/utf8/mc-utf8-look-and-feel.patch
===================================================================
--- trunk/debian/patches/utf8/mc-utf8-look-and-feel.patch	2008-05-18 12:08:57 UTC (rev 135)
+++ trunk/debian/patches/utf8/mc-utf8-look-and-feel.patch	2008-05-18 12:13:11 UTC (rev 136)
@@ -1,16 +1,18 @@
---- mc-4.6.1a/src/main.c.laf	2005-11-24 16:55:06.000000000 +0100
-+++ mc-4.6.1a/src/main.c	2005-11-24 16:56:27.000000000 +0100
-@@ -270,6 +270,9 @@ int midnight_shutdown = 0;
+Index: mc-4.6.2~git20080311/src/main.c
+===================================================================
+--- mc-4.6.2~git20080311.orig/src/main.c	2008-05-18 14:10:20.000000000 +0200
++++ mc-4.6.2~git20080311/src/main.c	2008-05-18 14:11:06.000000000 +0200
+@@ -276,6 +276,9 @@
  /* The user's shell */
  const char *shell = NULL;
  
 +/* Is the LANG UTF-8 ? */
 +gboolean is_utf8 = FALSE;
 +
- /* The xterm title */
- char *xterm_title_str = NULL;
+ /* mc_home: The home of MC */
+ char *mc_home = NULL;
  
-@@ -2167,6 +2170,16 @@ main (int argc, char *argv[])
+@@ -2141,6 +2144,16 @@
      /* if on, it displays the information that files have been moved to ~/.mc */
      int show_change_notice = 0;
  
@@ -29,8 +31,8 @@
      bindtextdomain ("mc", LOCALEDIR);
 Index: mc-4.6.2~git20080311/src/widget.c
 ===================================================================
---- mc-4.6.2~git20080311.orig/src/widget.c	2008-05-17 17:42:47.000000000 +0200
-+++ mc-4.6.2~git20080311/src/widget.c	2008-05-17 17:43:05.000000000 +0200
+--- mc-4.6.2~git20080311.orig/src/widget.c	2008-05-18 14:10:20.000000000 +0200
++++ mc-4.6.2~git20080311/src/widget.c	2008-05-18 14:10:26.000000000 +0200
 @@ -1946,52 +1946,86 @@
      return in;
  }
@@ -162,8 +164,8 @@
  /* Returns the number of items between s and e,
 Index: mc-4.6.2~git20080311/src/screen.c
 ===================================================================
---- mc-4.6.2~git20080311.orig/src/screen.c	2008-05-17 17:42:47.000000000 +0200
-+++ mc-4.6.2~git20080311/src/screen.c	2008-05-17 17:43:05.000000000 +0200
+--- mc-4.6.2~git20080311.orig/src/screen.c	2008-05-18 14:10:20.000000000 +0200
++++ mc-4.6.2~git20080311/src/screen.c	2008-05-18 14:10:26.000000000 +0200
 @@ -889,6 +889,9 @@
      }
  #endif				/* HAVE_SLANG */
@@ -185,8 +187,8 @@
  
 Index: mc-4.6.2~git20080311/src/widget.h
 ===================================================================
---- mc-4.6.2~git20080311.orig/src/widget.h	2008-05-17 17:42:47.000000000 +0200
-+++ mc-4.6.2~git20080311/src/widget.h	2008-05-17 17:43:05.000000000 +0200
+--- mc-4.6.2~git20080311.orig/src/widget.h	2008-05-18 14:10:20.000000000 +0200
++++ mc-4.6.2~git20080311/src/widget.h	2008-05-18 14:10:26.000000000 +0200
 @@ -169,6 +169,10 @@
  /* Listbox manager */
  WLEntry *listbox_get_data (WListbox *l, int pos);
@@ -201,7 +203,7 @@
 Index: mc-4.6.2~git20080311/src/main.h
 ===================================================================
 --- mc-4.6.2~git20080311.orig/src/main.h	2008-02-19 18:25:27.000000000 +0100
-+++ mc-4.6.2~git20080311/src/main.h	2008-05-17 17:45:33.000000000 +0200
++++ mc-4.6.2~git20080311/src/main.h	2008-05-18 14:10:26.000000000 +0200
 @@ -69,6 +69,7 @@
  extern int only_leading_plus_minus;
  extern int output_starts_shell;