[Pkg-mc-commits] r26 - trunk/debian/patches
winnie at alioth.debian.org
winnie at alioth.debian.org
Wed Feb 13 20:04:09 UTC 2008
Author: winnie
Date: 2008-02-13 20:04:08 +0000 (Wed, 13 Feb 2008)
New Revision: 26
Modified:
trunk/debian/patches/60_recode.patch
Log:
Fix call of do_select_codepage in editcmd.c
Modified: trunk/debian/patches/60_recode.patch
===================================================================
--- trunk/debian/patches/60_recode.patch 2008-02-13 19:45:28 UTC (rev 25)
+++ trunk/debian/patches/60_recode.patch 2008-02-13 20:04:08 UTC (rev 26)
@@ -1,6 +1,18 @@
+diff -Nurwd mc-4.6.2~pre1.orig/edit/editcmd.c mc-4.6.2~pre1/edit/editcmd.c
+--- mc-4.6.2~pre1.orig/edit/editcmd.c 2008-02-13 21:01:43.000000000 +0100
++++ mc-4.6.2~pre1/edit/editcmd.c 2008-02-13 21:02:16.000000000 +0100
+@@ -3321,7 +3321,7 @@
+ edit_select_codepage_cmd (WEdit *edit)
+ {
+ #ifdef HAVE_CHARSET
+- do_select_codepage ();
++ do_select_codepage (_(" Choose codepage "));
+ edit->force = REDRAW_COMPLETELY;
+ edit_refresh_cmd (edit);
+ #endif
diff -Nurwd mc-4.6.2~pre1.orig/edit/Makefile.in mc-4.6.2~pre1/edit/Makefile.in
--- mc-4.6.2~pre1.orig/edit/Makefile.in 2007-09-11 16:33:38.000000000 +0200
-+++ mc-4.6.2~pre1/edit/Makefile.in 2008-02-13 20:42:29.000000000 +0100
++++ mc-4.6.2~pre1/edit/Makefile.in 2008-02-13 21:01:06.000000000 +0100
@@ -14,6 +14,8 @@
@SET_MAKE@
@@ -12,7 +24,7 @@
VPATH = @srcdir@
diff -Nurwd mc-4.6.2~pre1.orig/po/ru.po mc-4.6.2~pre1/po/ru.po
--- mc-4.6.2~pre1.orig/po/ru.po 2007-09-11 16:35:10.000000000 +0200
-+++ mc-4.6.2~pre1/po/ru.po 2008-02-13 20:41:28.000000000 +0100
++++ mc-4.6.2~pre1/po/ru.po 2008-02-13 21:01:06.000000000 +0100
@@ -17,7 +17,7 @@
"Project-Id-Version: ru\n"
"Report-Msgid-Bugs-To: mc-devel at gnome.org\n"
@@ -69,8 +81,8 @@
-#~ msgid "%s bytes in %d files"
-#~ msgstr "%s ÂÁÊÔ × %d ÆÁÊÌÁÈ"
diff -Nurwd mc-4.6.2~pre1.orig/src/boxes.c mc-4.6.2~pre1/src/boxes.c
---- mc-4.6.2~pre1.orig/src/boxes.c 2008-02-13 20:42:01.000000000 +0100
-+++ mc-4.6.2~pre1/src/boxes.c 2008-02-13 20:41:28.000000000 +0100
+--- mc-4.6.2~pre1.orig/src/boxes.c 2008-02-13 21:01:43.000000000 +0100
++++ mc-4.6.2~pre1/src/boxes.c 2008-02-13 21:01:06.000000000 +0100
@@ -52,6 +52,7 @@
#ifdef HAVE_CHARSET
#include "charsets.h"
@@ -227,7 +239,7 @@
repaint_screen ();
diff -Nurwd mc-4.6.2~pre1.orig/src/charsets.c mc-4.6.2~pre1/src/charsets.c
--- mc-4.6.2~pre1.orig/src/charsets.c 2005-05-27 05:35:15.000000000 +0200
-+++ mc-4.6.2~pre1/src/charsets.c 2008-02-13 20:41:28.000000000 +0100
++++ mc-4.6.2~pre1/src/charsets.c 2008-02-13 21:01:06.000000000 +0100
@@ -121,8 +121,6 @@
}
}
@@ -248,7 +260,7 @@
char outbuf[4], *obuf;
diff -Nurwd mc-4.6.2~pre1.orig/src/charsets.h mc-4.6.2~pre1/src/charsets.h
--- mc-4.6.2~pre1.orig/src/charsets.h 2004-12-03 20:17:47.000000000 +0100
-+++ mc-4.6.2~pre1/src/charsets.h 2008-02-13 20:41:28.000000000 +0100
++++ mc-4.6.2~pre1/src/charsets.h 2008-02-13 21:01:06.000000000 +0100
@@ -6,6 +6,7 @@
#define UNKNCHAR '\001'
@@ -270,7 +282,7 @@
int load_codepages_list (void);
diff -Nurwd mc-4.6.2~pre1.orig/src/cmd.c mc-4.6.2~pre1/src/cmd.c
--- mc-4.6.2~pre1.orig/src/cmd.c 2007-05-02 14:01:13.000000000 +0200
-+++ mc-4.6.2~pre1/src/cmd.c 2008-02-13 20:41:28.000000000 +0100
++++ mc-4.6.2~pre1/src/cmd.c 2008-02-13 21:01:06.000000000 +0100
@@ -70,6 +70,10 @@
# include "../edit/edit.h"
#endif
@@ -311,8 +323,8 @@
save_cwds_stat ();
if (my_mkdir (absdir, 0777) == 0) {
diff -Nurwd mc-4.6.2~pre1.orig/src/file.c mc-4.6.2~pre1/src/file.c
---- mc-4.6.2~pre1.orig/src/file.c 2008-02-13 20:42:01.000000000 +0100
-+++ mc-4.6.2~pre1/src/file.c 2008-02-13 20:41:28.000000000 +0100
+--- mc-4.6.2~pre1.orig/src/file.c 2008-02-13 21:01:43.000000000 +0100
++++ mc-4.6.2~pre1/src/file.c 2008-02-13 21:01:06.000000000 +0100
@@ -73,6 +73,9 @@
#include "../vfs/vfs-impl.h"
@@ -399,8 +411,8 @@
switch (operation) {
case OP_COPY:
diff -Nurwd mc-4.6.2~pre1.orig/src/filegui.c mc-4.6.2~pre1/src/filegui.c
---- mc-4.6.2~pre1.orig/src/filegui.c 2008-02-13 20:42:01.000000000 +0100
-+++ mc-4.6.2~pre1/src/filegui.c 2008-02-13 20:41:28.000000000 +0100
+--- mc-4.6.2~pre1.orig/src/filegui.c 2008-02-13 21:01:43.000000000 +0100
++++ mc-4.6.2~pre1/src/filegui.c 2008-02-13 21:01:06.000000000 +0100
@@ -67,6 +67,10 @@
#include "util.h" /* strip_password() */
#include "tty.h"
@@ -744,7 +756,7 @@
}
diff -Nurwd mc-4.6.2~pre1.orig/src/fileopctx.c mc-4.6.2~pre1/src/fileopctx.c
--- mc-4.6.2~pre1.orig/src/fileopctx.c 2005-05-27 05:35:15.000000000 +0200
-+++ mc-4.6.2~pre1/src/fileopctx.c 2008-02-13 20:41:28.000000000 +0100
++++ mc-4.6.2~pre1/src/fileopctx.c 2008-02-13 21:01:06.000000000 +0100
@@ -25,8 +25,12 @@
#include <unistd.h>
@@ -774,7 +786,7 @@
diff -Nurwd mc-4.6.2~pre1.orig/src/fileopctx.h mc-4.6.2~pre1/src/fileopctx.h
--- mc-4.6.2~pre1.orig/src/fileopctx.h 2004-10-06 20:06:26.000000000 +0200
-+++ mc-4.6.2~pre1/src/fileopctx.h 2008-02-13 20:41:28.000000000 +0100
++++ mc-4.6.2~pre1/src/fileopctx.h 2008-02-13 21:01:06.000000000 +0100
@@ -108,6 +108,14 @@
/* User interface data goes here */
@@ -791,8 +803,8 @@
diff -Nurwd mc-4.6.2~pre1.orig/src/main.c mc-4.6.2~pre1/src/main.c
---- mc-4.6.2~pre1.orig/src/main.c 2008-02-13 20:42:01.000000000 +0100
-+++ mc-4.6.2~pre1/src/main.c 2008-02-13 20:41:28.000000000 +0100
+--- mc-4.6.2~pre1.orig/src/main.c 2008-02-13 21:01:43.000000000 +0100
++++ mc-4.6.2~pre1/src/main.c 2008-02-13 21:01:06.000000000 +0100
@@ -81,6 +81,7 @@
#ifdef HAVE_CHARSET
@@ -841,7 +853,7 @@
{' ', "", ' ', 0},
diff -Nurwd mc-4.6.2~pre1.orig/src/Makefile.am mc-4.6.2~pre1/src/Makefile.am
--- mc-4.6.2~pre1.orig/src/Makefile.am 2006-02-04 12:13:30.000000000 +0100
-+++ mc-4.6.2~pre1/src/Makefile.am 2008-02-13 20:41:28.000000000 +0100
++++ mc-4.6.2~pre1/src/Makefile.am 2008-02-13 21:01:06.000000000 +0100
@@ -41,7 +41,8 @@
mc_LDADD = $(EDITLIB) $(SLANGLIB) $(VFSLIB) \
$(INTLLIBS) $(GLIB_LIBS) $(MCLIBS) $(LIBICONV)
@@ -865,7 +877,7 @@
widget.h win.c win.h wtools.c wtools.h unixcompat.h \
diff -Nurwd mc-4.6.2~pre1.orig/src/Makefile.in mc-4.6.2~pre1/src/Makefile.in
--- mc-4.6.2~pre1.orig/src/Makefile.in 2007-09-11 16:33:39.000000000 +0200
-+++ mc-4.6.2~pre1/src/Makefile.in 2008-02-13 20:41:28.000000000 +0100
++++ mc-4.6.2~pre1/src/Makefile.in 2008-02-13 21:01:06.000000000 +0100
@@ -95,12 +95,12 @@
mountlist.c mountlist.h mouse.c mouse.h myslang.h option.c \
option.h panel.h panelize.c panelize.h poptalloca.h popt.c \
@@ -911,7 +923,7 @@
util.c util.h utilunix.c view.c view.h vfsdummy.h widget.c \
diff -Nurwd mc-4.6.2~pre1.orig/src/panel.h mc-4.6.2~pre1/src/panel.h
--- mc-4.6.2~pre1.orig/src/panel.h 2004-12-03 20:17:47.000000000 +0100
-+++ mc-4.6.2~pre1/src/panel.h 2008-02-13 20:41:28.000000000 +0100
++++ mc-4.6.2~pre1/src/panel.h 2008-02-13 21:01:06.000000000 +0100
@@ -71,6 +71,19 @@
int searching;
@@ -942,7 +954,7 @@
diff -Nurwd mc-4.6.2~pre1.orig/src/recode.c mc-4.6.2~pre1/src/recode.c
--- mc-4.6.2~pre1.orig/src/recode.c 1970-01-01 00:00:00.000000000 +0000
-+++ mc-4.6.2~pre1/src/recode.c 2008-02-13 20:41:28.000000000 +0100
++++ mc-4.6.2~pre1/src/recode.c 2008-02-13 21:01:06.000000000 +0100
@@ -0,0 +1,153 @@
+#include "recode.h"
+#ifdef HAVE_CHARSET
@@ -1099,7 +1111,7 @@
+#endif //HAVE_CHARSET
diff -Nurwd mc-4.6.2~pre1.orig/src/recode.h mc-4.6.2~pre1/src/recode.h
--- mc-4.6.2~pre1.orig/src/recode.h 1970-01-01 00:00:00.000000000 +0000
-+++ mc-4.6.2~pre1/src/recode.h 2008-02-13 20:41:28.000000000 +0100
++++ mc-4.6.2~pre1/src/recode.h 2008-02-13 21:01:06.000000000 +0100
@@ -0,0 +1,48 @@
+#ifndef __RECODE_H__
+#define __RECODE_H__
@@ -1150,8 +1162,8 @@
+#endif // HAVE_CHARSET
+#endif //__RECODE_H__
diff -Nurwd mc-4.6.2~pre1.orig/src/screen.c mc-4.6.2~pre1/src/screen.c
---- mc-4.6.2~pre1.orig/src/screen.c 2008-02-13 20:42:01.000000000 +0100
-+++ mc-4.6.2~pre1/src/screen.c 2008-02-13 20:41:28.000000000 +0100
+--- mc-4.6.2~pre1.orig/src/screen.c 2008-02-13 21:01:43.000000000 +0100
++++ mc-4.6.2~pre1/src/screen.c 2008-02-13 21:01:06.000000000 +0100
@@ -50,6 +50,10 @@
#include "main.h" /* the_menubar */
#include "unixcompat.h"
@@ -1281,7 +1293,7 @@
{ ALT('l'), chdir_to_readlink },
diff -Nurwd mc-4.6.2~pre1.orig/src/screen.h mc-4.6.2~pre1/src/screen.h
--- mc-4.6.2~pre1.orig/src/screen.h 1970-01-01 00:00:00.000000000 +0000
-+++ mc-4.6.2~pre1/src/screen.h 2008-02-13 20:41:28.000000000 +0100
++++ mc-4.6.2~pre1/src/screen.h 2008-02-13 21:01:06.000000000 +0100
@@ -0,0 +1,11 @@
+#ifndef __SCREEN_H__
+#define __SCREEN_H__
@@ -1296,7 +1308,7 @@
+
diff -Nurwd mc-4.6.2~pre1.orig/src/selcodepage.c mc-4.6.2~pre1/src/selcodepage.c
--- mc-4.6.2~pre1.orig/src/selcodepage.c 2005-05-27 05:35:15.000000000 +0200
-+++ mc-4.6.2~pre1/src/selcodepage.c 2008-02-13 20:41:28.000000000 +0100
++++ mc-4.6.2~pre1/src/selcodepage.c 2008-02-13 21:01:06.000000000 +0100
@@ -45,14 +45,16 @@
}
@@ -1349,7 +1361,7 @@
if (errmsg) {
diff -Nurwd mc-4.6.2~pre1.orig/src/selcodepage.h mc-4.6.2~pre1/src/selcodepage.h
--- mc-4.6.2~pre1.orig/src/selcodepage.h 2005-06-14 15:14:49.000000000 +0200
-+++ mc-4.6.2~pre1/src/selcodepage.h 2008-02-13 20:41:28.000000000 +0100
++++ mc-4.6.2~pre1/src/selcodepage.h 2008-02-13 21:01:06.000000000 +0100
@@ -2,8 +2,8 @@
#define MC_SELCODEPAGE_H
@@ -1363,7 +1375,7 @@
#endif
diff -Nurwd mc-4.6.2~pre1.orig/src/setup.c mc-4.6.2~pre1/src/setup.c
--- mc-4.6.2~pre1.orig/src/setup.c 2006-02-23 16:32:18.000000000 +0100
-+++ mc-4.6.2~pre1/src/setup.c 2008-02-13 20:41:28.000000000 +0100
++++ mc-4.6.2~pre1/src/setup.c 2008-02-13 21:01:06.000000000 +0100
@@ -48,6 +48,8 @@
#ifdef HAVE_CHARSET
@@ -1447,8 +1459,8 @@
init_translation_table( source_codepage, display_codepage );
diff -Nurwd mc-4.6.2~pre1.orig/src/view.c mc-4.6.2~pre1/src/view.c
---- mc-4.6.2~pre1.orig/src/view.c 2008-02-13 20:42:01.000000000 +0100
-+++ mc-4.6.2~pre1/src/view.c 2008-02-13 20:41:28.000000000 +0100
+--- mc-4.6.2~pre1.orig/src/view.c 2008-02-13 21:01:43.000000000 +0100
++++ mc-4.6.2~pre1/src/view.c 2008-02-13 21:01:06.000000000 +0100
@@ -3232,7 +3232,7 @@
#ifdef HAVE_CHARSET
@@ -1459,8 +1471,8 @@
view_update (view);
return MSG_HANDLED;
diff -Nurwd mc-4.6.2~pre1.orig/vfs/vfs.c mc-4.6.2~pre1/vfs/vfs.c
---- mc-4.6.2~pre1.orig/vfs/vfs.c 2008-02-13 20:42:01.000000000 +0100
-+++ mc-4.6.2~pre1/vfs/vfs.c 2008-02-13 20:41:28.000000000 +0100
+--- mc-4.6.2~pre1.orig/vfs/vfs.c 2008-02-13 21:01:43.000000000 +0100
++++ mc-4.6.2~pre1/vfs/vfs.c 2008-02-13 21:01:06.000000000 +0100
@@ -53,6 +53,11 @@
#include "smbfs.h"
#include "local.h"
More information about the Pkg-mc-commits
mailing list