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

[winnie at alioth.debian.org]

Author: winnie
Date: 2008-02-12 19:02:31 +0000 (Tue, 12 Feb 2008)
New Revision: 15

Modified:
   trunk/debian/changelog
   trunk/debian/patches/28_mc-dontrewrite.patch
   trunk/debian/patches/47_mc.menu.patch
Log:
two more patches


Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2008-01-25 09:06:51 UTC (rev 14)
+++ trunk/debian/changelog	2008-02-12 19:02:31 UTC (rev 15)
@@ -6,7 +6,7 @@
   * Added Homepage header to control file
   * Rediffed all patches for 4.6.2~pre1
 
- -- Patrick Winnertz <winnie at debian.org>  Mon, 14 Jan 2008 17:13:22 +0100
+ -- Patrick Winnertz <winnie at debian.org>  Tue, 12 Feb 2008 20:01:18 +0100
 
 mc (1:4.6.1-8) unstable; urgency=low
 

Modified: trunk/debian/patches/28_mc-dontrewrite.patch
===================================================================
--- trunk/debian/patches/28_mc-dontrewrite.patch	2008-01-25 09:06:51 UTC (rev 14)
+++ trunk/debian/patches/28_mc-dontrewrite.patch	2008-02-12 19:02:31 UTC (rev 15)
@@ -1,22 +1,12 @@
-diff -Nurwd mc-4.6.2~pre1/edit/editcmd.c mc-4.6.2~pre1.patched/edit/editcmd.c
---- mc-4.6.2~pre1/edit/editcmd.c	2007-05-02 13:22:01.000000000 +0200
-+++ mc-4.6.2~pre1/edit/editcmd.c	2008-01-25 08:15:57.000000000 +0100
-@@ -26,7 +26,6 @@
- #include <config.h>
- 
- #include <assert.h>
--#include <ctype.h>
- 
- #include <stdio.h>
- #include <stdarg.h>
-@@ -244,7 +243,8 @@
+diff -Nurwd ./mc-4.6.2~pre1/edit/editcmd.c ./mc-4.6.2~pre1.patched/edit/editcmd.c
+--- ./mc-4.6.2~pre1/edit/editcmd.c	2008-02-12 19:58:24.000000000 +0100
++++ ./mc-4.6.2~pre1.patched/edit/editcmd.c	2008-02-12 19:57:11.000000000 +0100
+@@ -243,7 +243,7 @@
      this_save_mode = option_save_mode;
      if (this_save_mode != EDIT_QUICK_SAVE) {
  	if (!vfs_file_is_local (filename) ||
 -	    (fd = mc_open (filename, O_WRONLY | O_BINARY)) == -1) {
-+            (fd = mc_open (filename, O_RDONLY | O_BINARY)) == -1) {
-+
++	    (fd = mc_open (filename, O_RDONLY | O_BINARY)) == -1) {
  	    /*
  	     * The file does not exists yet, so no safe save or
  	     * backup are necessary.
-Binärdateien mc-4.6.2~pre1/.swp and mc-4.6.2~pre1.patched/.swp sind verschieden.

Modified: trunk/debian/patches/47_mc.menu.patch
===================================================================
--- trunk/debian/patches/47_mc.menu.patch	2008-01-25 09:06:51 UTC (rev 14)
+++ trunk/debian/patches/47_mc.menu.patch	2008-02-12 19:02:31 UTC (rev 15)
@@ -1,13 +1,14 @@
---- lib/mc.menu	2005-05-02 18:08:11.000000000 +0200
-+++ lib/mc.menu	2005-05-02 18:08:37.000000000 +0200
-@@ -15,7 +15,7 @@ shell_patterns=0
+diff -Nurwd mc-4.6.2~pre1/lib/mc.menu mc-4.6.2~pre1.patched/lib/mc.menu
+--- mc-4.6.2~pre1/lib/mc.menu	2005-09-06 08:01:07.000000000 +0200
++++ mc-4.6.2~pre1.patched/lib/mc.menu	2008-01-25 10:06:19.000000000 +0100
+@@ -15,7 +15,7 @@
  
  0       Edit a bug report and send it to root
-	I=`mktemp ${MC_TMPDIR:-/tmp}/mail.XXXXXX` || exit 1
+ 	I=`mktemp ${MC_TMPDIR:-/tmp}/mail.XXXXXX` || exit 1
 -	${EDITOR-vi} $I
 +	${EDITOR-editor} $I
-	test -r $I && mail root < $I
-	rm -f $I
+ 	test -r $I && mail root < $I
+ 	rm -f $I
  
 @@ -330,3 +330,7 @@
  o       Open next a free console
@@ -17,9 +18,10 @@
 +x       Extract the contents of a Debian source package
 +        dpkg-source -x %f
 +
---- src/util.h 2006-06-13 04:39:20.000000000 +0300
-+++ src/util.h 2006-06-13 04:39:53.000000000 +0300
-@@ -217,7 +217,7 @@ void save_file_position (const char *fil
+diff -Nurwd mc-4.6.2~pre1/src/util.h mc-4.6.2~pre1.patched/src/util.h
+--- mc-4.6.2~pre1/src/util.h	2006-02-03 18:04:17.000000000 +0100
++++ mc-4.6.2~pre1.patched/src/util.h	2008-01-25 10:06:19.000000000 +0100
+@@ -222,7 +222,7 @@
  #define PATH_ENV_SEP ':'
  #define TMPDIR_DEFAULT "/tmp"
  #define SCRIPT_SUFFIX ""