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

winnie at alioth.debian.org winnie at alioth.debian.org
Thu Jan 24 23:07:53 UTC 2008


Author: winnie
Date: 2008-01-24 23:07:53 +0000 (Thu, 24 Jan 2008)
New Revision: 9

Added:
   trunk/debian/TODO
Removed:
   trunk/debian/patches/05_symcrash.patch
Modified:
   trunk/debian/changelog
   trunk/debian/patches/01_mc.ext.in.mime.patch
   trunk/debian/patches/02_debian_syntax.patch
   trunk/debian/patches/03_conffiles_in_mans.patch
   trunk/debian/patches/04_off64t.patch
   trunk/debian/patches/06_smbconf_path.patch
   trunk/debian/patches/08_awk.patch
   trunk/debian/patches/09_de.po.patch
   trunk/debian/patches/10_it.po.patch
   trunk/debian/patches/11_extfs_missing.patch
   trunk/debian/patches/13_syntax.patch
   trunk/debian/patches/14_cxx.syntax.patch
Log:
Rediffed some patches for mc 4.6.2~pre1


Added: trunk/debian/TODO
===================================================================
--- trunk/debian/TODO	                        (rev 0)
+++ trunk/debian/TODO	2008-01-24 23:07:53 UTC (rev 9)
@@ -0,0 +1,6 @@
+* review sound part of the 01-* patch: xmms is removed from archive.
+  (alternative?)
+
+* review manpages and correct paths in it
+
+

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2008-01-14 15:56:35 UTC (rev 8)
+++ trunk/debian/changelog	2008-01-24 23:07:53 UTC (rev 9)
@@ -1,11 +1,12 @@
-mc (1:4.6.1-9) unstable; urgency=low
+mc (1:4.6.2~pre1-1) unstable; urgency=low
 
   * New maintainer: pkg-mc-devel at lists.alioth.debian.org
   * New Uploader: myself
   * Bumped Standards-Version to 3.7.3
   * Added Homepage header to control file
+  * Rediffed all patches for 4.6.2~pre1
 
- -- Patrick Winnertz <winnie at debian.org>  Mon, 14 Jan 2008 16:48:15 +0100
+ -- Patrick Winnertz <winnie at debian.org>  Mon, 14 Jan 2008 17:13:22 +0100
 
 mc (1:4.6.1-8) unstable; urgency=low
 

Modified: trunk/debian/patches/01_mc.ext.in.mime.patch
===================================================================
--- trunk/debian/patches/01_mc.ext.in.mime.patch	2008-01-14 15:56:35 UTC (rev 8)
+++ trunk/debian/patches/01_mc.ext.in.mime.patch	2008-01-24 23:07:53 UTC (rev 9)
@@ -1,16 +1,5 @@
---- lib/mc.ext.in.orig	2006-06-22 21:05:05.000000000 +0200
-+++ lib/mc.ext.in	2006-10-10 17:53:46.000000000 +0200
-@@ -106,8 +106,8 @@
- 
- ### Archives ###
- 
--# .tgz, .tpz, .tar.gz, .tar.z, .tar.Z
--regex/\.t([gp]?z|ar\.g?[zZ])$
-+# .tgz, .tpz, .tar.gz, .tar.z, .tar.Z, .ipk
-+regex/\.t([gp]?z|ar\.g?[zZ])$|\.ipk$
- 	Open=%cd %p#utar
- 	View=%view{ascii} gzip -dc %f 2>/dev/null | tar tvvf -
- 
+--- ./lib/mc.ext.in.orig	2006-12-28 04:57:01.000000000 +0100
++++ ./lib/mc.ext.in	2008-01-24 22:50:57.000000000 +0100
 @@ -132,7 +132,7 @@
  # tar
  regex/\.(tar|TAR)$
@@ -29,13 +18,10 @@
  
  # ha
  regex/\.([Hh][Aa])$
-@@ -194,7 +194,16 @@
- # deb
- regex/\.u?deb$
+@@ -201,6 +201,15 @@
  	Open=%cd %p#deb
--	View=%view{ascii} dpkg-deb -c %f
-+	View=%view{ascii} dpkg-deb -I %f && echo && dpkg-deb -c %f
-+
+ 	View=%view{ascii} dpkg-deb -I %f && echo && dpkg-deb -c %f
+ 
 +# dpkg
 +shell/.debd
 +        Open=%cd %p#debd
@@ -43,46 +29,47 @@
 +# apt
 +shell/.deba
 +        Open=%cd %p#deba
-+        View=%view{ascii} apt-cache show `echo %p | sed 's/\([0-9a-z.-]*\).*/\1/'`
- 
++        View=%view{ascii} apt-cache show `echo %p | sed 's/\([0-9a-z.-]*\).*/\1/'`        
++
  # ISO9660
  regex/\.iso$
-@@ -210,28 +219,28 @@
+ 	Open=%cd %p#iso9660
+@@ -220,28 +229,28 @@
  
  # C
  shell/.c
 -	Open=%var{EDITOR:vi} %f
-+	Open=sensible-editor %f
++ 	Open=sensible-editor %f
  
  # Fortran
  shell/.f
 -	Open=%var{EDITOR:vi} %f
-+	Open=sensible-editor %f
++ 	Open=sensible-editor %f
  	
  # Header
  regex/\.(h|hpp)$
 -	Open=%var{EDITOR:vi} %f
-+	Open=sensible-editor %f
++ 	Open=sensible-editor %f
  
  # Object
- shell/.o
+ type/^ELF
 -	#Open=%var{PAGER:more} %f
-+	#Open=sensible-pager %f
++ 	#Open=sensible-pager %f
  	View=%view{ascii} file %f && nm %f
  
  # Asm
  shell/.s
 -	Open=%var{EDITOR:vi} %f
-+	Open=sensible-editor %f
++ 	Open=sensible-editor %f
  
  # C++
  regex/\.(C|cc|cpp)$
 -	Open=%var{EDITOR:vi} %f
-+	Open=sensible-editor %f
++ 	Open=sensible-editor %f
  
  
  ### Documentation ###
-@@ -252,7 +261,7 @@
+@@ -262,7 +271,7 @@
  	View=%view{ascii} file %f && nm %f
  
  regex/(([^0-9]|^[^\.]*)\.([1-9][A-Za-z]*|[ln])|\.man)$
@@ -90,8 +77,8 @@
 +	Open=case %d/%f in */log/*|*/logs/*) cat %f ;; *) nroff @MAN_FLAGS@ @MANDOC@ %f ;; esac | sensible-pager
  	View=%view{ascii,nroff} case %d/%f in */log/*|*/logs/*) cat %f ;; *) nroff @MAN_FLAGS@ @MANDOC@ %f ;; esac
  
- # Troff with me macros.
-@@ -262,25 +271,25 @@
+ # Perl pod page
+@@ -277,25 +286,25 @@
  	View=
  
  shell/.me
@@ -122,7 +109,7 @@
  	View=%view{ascii,nroff} case %d/%f in */log/*|*/logs/*) bzip2 -dc %f ;; *) bzip2 -dc %f | nroff @MAN_FLAGS@ @MANDOC@ ;; esac
  
  
-@@ -290,6 +299,7 @@
+@@ -305,6 +314,7 @@
  	Include=image
  
  type/^JPEG
@@ -130,8 +117,8 @@
  	Include=image
  
  type/^PC\ bitmap
-@@ -317,14 +327,16 @@
- 	Open=gimp %f
+@@ -332,14 +342,16 @@
+ 	Open=(gimp %f &)
  
  shell/.xbm
 -	Open=bitmap %f
@@ -149,45 +136,44 @@
  	View=%view{ascii} identify %f
  	#View=%view{ascii} asciiview %f
  
-@@ -332,25 +344,30 @@
+@@ -347,25 +359,30 @@
  ### Sound files ###
  
  regex/\.([wW][aA][vV]|[sS][nN][dD]|[vV][oO][cC]|[aA][uU]|[sS][mM][pP]|[aA][iI][fF][fF]|[sS][nN][dD])$
--       Open=if [ "$DISPLAY" = "" ]; then play %f; else (xmms -e %f 1>/dev/null 2>&1 &); fi
-+	Open=run-mailcap audio/x-wav:%f
-+	#Open=if [ "$DISPLAY" = "" ]; then play %f; else (xmms -e %f 1>/dev/null 2>&1 &); fi
+-       Open=if [ "$DISPLAY" = "" ]; then play %f; else (xmms %f >/dev/null 2>&1 &); fi
++ 	Open=run-mailcap audio/x-wav:%f
++ 	#Open=if [ "$DISPLAY" = "" ]; then play %f; else (xmms -e %f 1>/dev/null 2>&1 &); fi
  
  regex/\.([mM][oO][dD]|[sS]3[mM]|[xX][mM]|[iI][tT]|[mM][tT][mM]|669|[sS][tT][mM]|[uU][lL][tT]|[fF][aA][rR])$
 -       Open=mikmod %f
--       #Open=tracker %f
-+	Open=run-mailcap application/x-mod:%f
++ 	Open=run-mailcap application/x-mod:%f
 +        #Open=mikmod %f
-+        #Open=tracker %f
+        #Open=tracker %f
  
  regex/\.([wW][aA][wW]22)$
         Open=vplay -s 22 %f
  
  regex/\.([mM][pP]3)$
--	Open=if [ "$DISPLAY" = "" ]; then mpg123 %f; else (xmms %f &); fi
+-	Open=if [ "$DISPLAY" = "" ]; then mpg123 %f; else (xmms %f >/dev/null 2>&1 &); fi
 -	View=%view{ascii} mpg123 -vtn1 %f 2>&1 | sed -n '/^Title/,/^Comment/p;/^MPEG/,/^Audio/p'
-+	Open=run-mailcap audio/mpeg:%f
-+	#Open=if [ "$DISPLAY" = "" ]; then mpg123 %f; else (xmms %f &); fi
-+	View=%view{ascii} mpg123 -vtn1 %f 2>&1 | sed -n '/Title:/,/Comment:/p;/^MPEG/,/^Audio/p'
++ 	Open=run-mailcap audio/mpeg:%f
++ 	#Open=if [ "$DISPLAY" = "" ]; then mpg123 %f; else (xmms %f &); fi
++ 	View=%view{ascii} mpg123 -vtn1 %f 2>&1 | sed -n '/Title:/,/Comment:/p;/^MPEG/,/^Audio/p'
  
  regex/\.([oO][gG][gG])$
--	Open=if [ "$DISPLAY" = "" ]; then ogg123 %f; else (xmms %f &); fi
-+	Open=run-mailcap application/x-ogg:%f &
-+	#Open=if [ "$DISPLAY" = "" ]; then ogg123 %f; else (xmms %f &); fi
+-	Open=if [ "$DISPLAY" = "" ]; then ogg123 %f; else (xmms %f >/dev/null 2>&1 &); fi
++ 	Open=run-mailcap application/x-ogg:%f &
++ 	#Open=if [ "$DISPLAY" = "" ]; then ogg123 %f; else (xmms %f &); fi
  	View=%view{ascii} ogginfo %s
  
  regex/\.([mM][iI][dD][iI]?|[rR][mM][iI][dD]?)$
 -	Open=timidity %f
-+	Open=run-mailcap audio/midi:%f
-+	#Open=timidity %f
++ 	Open=run-mailcap audio/midi:%f
++ 	#Open=timidity %f
  
  regex/\.([wW][mM][aA])$
  	Open=mplayer -vo null %f
-@@ -390,10 +407,12 @@
+@@ -405,10 +422,12 @@
  	Include=video
  
  regex/\.([rR][aA]?[mM])$
@@ -202,7 +188,7 @@
  	#Open=(gtv %f >/dev/null 2>&1 &)
  	#Open=(xanim %f >/dev/null 2>&1 &)
  
-@@ -402,12 +421,14 @@
+@@ -417,12 +436,14 @@
  
  # Postscript
  type/^PostScript
@@ -219,7 +205,7 @@
  	#Open=(acroread %f &)
  	#Open=(ghostview %f &)
  	View=%view{ascii} pdftotext %f -
-@@ -417,8 +438,9 @@
+@@ -432,8 +453,9 @@
  
  # html
  regex/\.([hH][tT][mM][lL]?)$
@@ -231,7 +217,7 @@
  
  # StarOffice 5.2
  shell/.sdw
-@@ -435,22 +457,26 @@
+@@ -450,22 +472,26 @@
  
  # Microsoft Word Document
  regex/\.([Dd][oO][cCtT]|[Ww][rR][iI])$
@@ -264,7 +250,7 @@
  	View=%view{ascii} xls2csv %f || strings %f
  
  # Use OpenOffice.org to open any MS Office documents
-@@ -463,12 +489,14 @@
+@@ -478,12 +504,14 @@
  
  # DVI
  regex/\.([dD][vV][iI])$
@@ -281,7 +267,7 @@
  
  
  ### Miscellaneous ###
-@@ -509,24 +537,29 @@
+@@ -524,24 +552,29 @@
  	
  # gzip
  type/^gzip

Modified: trunk/debian/patches/02_debian_syntax.patch
===================================================================
--- trunk/debian/patches/02_debian_syntax.patch	2008-01-14 15:56:35 UTC (rev 8)
+++ trunk/debian/patches/02_debian_syntax.patch	2008-01-24 23:07:53 UTC (rev 9)
@@ -1,6 +1,5 @@
-diff -urN mc-4.6.0-pre2.orig/syntax/debian-changelog.syntax mc-4.6.0-pre2/syntax/debian-changelog.syntax
---- mc-4.6.0-pre2.orig/syntax/debian-changelog.syntax	1970-01-01 01:00:00.000000000 +0100
-+++ mc-4.6.0-pre2/syntax/debian-changelog.syntax	2002-12-29 18:11:08.000000000 +0100
+--- /dev/null	2008-01-24 11:33:29.248015015 +0100
++++ ./syntax/debian-changelog.syntax	2008-01-24 22:59:41.000000000 +0100
 @@ -0,0 +1,20 @@
 +context default
 +
@@ -22,9 +21,8 @@
 +    keyword whole bug			white/25
 +    keyword whole Bug			white/25
 +    keyword whole BUG			white/25
-diff -urN mc-4.6.0-pre2.orig/syntax/debian-control.syntax mc-4.6.0-pre2/syntax/debian-control.syntax
---- mc-4.6.0-pre2.orig/syntax/debian-control.syntax	1970-01-01 01:00:00.000000000 +0100
-+++ mc-4.6.0-pre2/syntax/debian-control.syntax	2002-12-29 18:11:13.000000000 +0100
+--- /dev/null	2008-01-24 11:33:29.248015015 +0100
++++ ./syntax/debian-control.syntax	2008-01-24 22:59:41.000000000 +0100
 @@ -0,0 +1,23 @@
 +context default
 +    keyword linestart Source		brightmagenta/20
@@ -49,9 +47,8 @@
 +    keyword <*@*>			brightred/19
 +
 +context linestart \s \n brown/22
-diff -urN mc-4.6.0-pre2.orig/syntax/debian-sources-list.syntax mc-4.6.0-pre2/syntax/debian-sources-list.syntax
---- mc-4.6.0-pre2.orig/syntax/debian-sources-list.syntax	1970-01-01 01:00:00.000000000 +0100
-+++ mc-4.6.0-pre2/syntax/debian-sources-list.syntax	2002-12-29 18:11:16.000000000 +0100
+--- /dev/null	2008-01-24 11:33:29.248015015 +0100
++++ ./syntax/debian-sources-list.syntax	2008-01-24 22:59:41.000000000 +0100
 @@ -0,0 +1,12 @@
 +context default
 +    keyword linestart deb-src	brightmagenta/20
@@ -65,38 +62,35 @@
 +context file\:\/ \s brightcyan/14
 +
 +###############################################################################
-diff -urN mc-4.6.0-pre2.orig/syntax/Makefile.am mc-4.6.0-pre2/syntax/Makefile.am
---- mc-4.6.0-pre2.orig/syntax/Makefile.am	2002-09-22 02:06:27.000000000 +0200
-+++ mc-4.6.0-pre2/syntax/Makefile.am	2002-12-29 18:01:24.000000000 +0100
-@@ -5,6 +5,9 @@
- 	ada95.syntax		\
+--- ./syntax/Makefile.in	2007-09-11 16:33:39.000000000 +0200
++++ ./syntax/Makefile.in	2008-01-24 22:59:12.000000000 +0100
+@@ -241,6 +241,9 @@
+ 	assembler.syntax	\
  	c.syntax		\
  	changelog.syntax	\
-+	debian-changelog.syntax \
-+	debian-control.syntax   \
-+	debian-sources-list.syntax \
- 	diff.syntax		\
- 	dos.syntax		\
- 	fortran.syntax		\
-diff -urN mc-4.6.0-pre2.orig/syntax/Makefile.in mc-4.6.0-pre2/syntax/Makefile.in
---- mc-4.6.0-pre2.orig/syntax/Makefile.in	2002-12-26 22:38:19.000000000 +0100
-+++ mc-4.6.0-pre2/syntax/Makefile.in	2002-12-29 18:01:45.000000000 +0100
-@@ -190,6 +190,9 @@
- 	ada95.syntax		\
++ 	debian-changelog.syntax \
++ 	debian-control.syntax   \
++ 	debian-sources-list.syntax \
+ 	cs.syntax		\
+ 	css.syntax		\
+ 	d.syntax		\
+--- ./syntax/Makefile.am	2007-08-27 08:56:47.000000000 +0200
++++ ./syntax/Makefile.am	2008-01-24 22:59:18.000000000 +0100
+@@ -5,6 +5,9 @@
+ 	assembler.syntax	\
  	c.syntax		\
  	changelog.syntax	\
-+	debian-changelog.syntax \
-+	debian-control.syntax   \
-+	debian-sources-list.syntax \
- 	diff.syntax		\
- 	dos.syntax		\
- 	fortran.syntax		\
-diff -urN mc-4.6.0-pre2.orig/syntax/Syntax mc-4.6.0-pre2/syntax/Syntax
---- mc-4.6.0-pre2.orig/syntax/Syntax	2003-01-14 22:26:40.000000000 +0100
-+++ mc-4.6.0-pre2/syntax/Syntax	2002-12-13 09:12:52.000000000 +0100
-@@ -116,6 +116,21 @@
- file [Ss]yntax$ Syntax\sHighlighting\sdefinitions ^#\ssyntax\srules\sversion\s
- include syntax.syntax
++ 	debian-changelog.syntax \
++ 	debian-control.syntax   \
++ 	debian-sources-list.syntax \
+ 	cs.syntax		\
+ 	css.syntax		\
+ 	d.syntax		\
+--- ./syntax/Syntax	2007-08-27 08:56:47.000000000 +0200
++++ ./syntax/Syntax	2008-01-24 23:02:04.000000000 +0100
+@@ -148,5 +148,20 @@
+ file Don_t_match_me Mail\sfolder ^From\s
+ include mail.syntax
  
 +file sources.list$ sources\slist
 +include debian-sources-list.syntax
@@ -115,4 +109,3 @@
 +
  file .\* unknown
  include unknown.syntax
- 

Modified: trunk/debian/patches/03_conffiles_in_mans.patch
===================================================================
--- trunk/debian/patches/03_conffiles_in_mans.patch	2008-01-14 15:56:35 UTC (rev 8)
+++ trunk/debian/patches/03_conffiles_in_mans.patch	2008-01-24 23:07:53 UTC (rev 9)
@@ -1,7 +1,7 @@
-diff -urN mc-4.6.0-pre3.orig/doc/mc.1.in mc-4.6.0-pre3/doc/mc.1.in
---- mc-4.6.0-pre3.orig/doc/mc.1.in	2003-01-14 21:01:34.000000000 +0100
-+++ mc-4.6.0-pre3/doc/mc.1.in	2003-01-14 21:59:38.000000000 +0100
-@@ -1337,7 +1337,7 @@
+diff -Nurwd mc-4.6.2~pre1/doc/mc.1.in mc-4.6.2~pre1/doc/mc.1.in
+--- mc-4.6.2~pre1/doc/mc.1.in	2007-09-10 16:25:30.000000000 +0200
++++ mc-4.6.2~pre1/doc/mc.1.in	2008-01-24 23:04:13.000000000 +0100
+@@ -1396,7 +1396,7 @@
  but only if it is owned by user or root and is not world-writable.
  If no such file found, ~/.mc/menu is tried in the same way,
  and otherwise mc uses the default system-wide menu
@@ -10,7 +10,7 @@
  .PP
  The format of the menu file is very simple. Lines that start with
  anything but space or tab are considered entries for the menu (in
-@@ -1855,7 +1855,7 @@
+@@ -1923,7 +1923,7 @@
  At startup the Midnight Commander will try to load initialization
  information from the ~/.mc/ini file. If this file doesn't exist, it will
  load the information from the system-wide configuration file, located in
@@ -19,7 +19,7 @@
  exist, MC uses the default settings.
  .PP
  The
-@@ -3045,7 +3045,7 @@
+@@ -3251,7 +3251,7 @@
  .IP
  The help file for the program.
  .PP
@@ -28,7 +28,7 @@
  .IP
  The default system-wide extensions file.
  .PP
-@@ -3054,12 +3054,12 @@
+@@ -3260,12 +3260,12 @@
  User's own extension, view configuration and edit configuration
  file.  They override the contents of the system wide files if present.
  .PP
@@ -43,19 +43,19 @@
  .IP
  Global settings for the Midnight Commander.  Settings in this file
  affect all users, whether they have ~/.mc/ini or not.  Currently, only
-@@ -3077,7 +3077,7 @@
+@@ -3283,7 +3283,7 @@
  .IP
- This file contains the hints (cookies) displayed by the program.
+ This file contains the hints displayed by the program.
  .PP
 -.I @prefix@/share/mc/mc.menu
 +.I /etc/mc/mc.menu
  .IP
  This file contains the default system-wide applications menu.
  .PP
-diff -urN mc-4.6.0-pre3.orig/doc/mcedit.1.in mc-4.6.0-pre3/doc/mcedit.1.in
---- mc-4.6.0-pre3.orig/doc/mcedit.1.in	2003-01-20 15:18:36.000000000 +0100
-+++ mc-4.6.0-pre3/doc/mcedit.1.in	2003-01-23 18:57:57.000000000 +0100
-@@ -436,12 +436,12 @@
+diff -Nurwd mc-4.6.2~pre1/doc/mcedit.1.in mc-4.6.2~pre1/doc/mcedit.1.in
+--- mc-4.6.2~pre1/doc/mcedit.1.in	2003-03-04 11:34:28.000000000 +0100
++++ mc-4.6.2~pre1/doc/mcedit.1.in	2008-01-24 23:04:13.000000000 +0100
+@@ -464,12 +464,12 @@
  .IP
  The help file for the program.
  .PP
@@ -70,9 +70,9 @@
  .IP
  Global settings for the Midnight Commander.  Settings in this file
  affect all users, whether they have ~/.mc/ini or not.
-diff -urN mc-4.6.0-pre3.orig/doc/mcview.1.in mc-4.6.0-pre3/doc/mcview.1.in
---- mc-4.6.0-pre3.orig/doc/mcview.1.in	2003-01-20 15:18:36.000000000 +0100
-+++ mc-4.6.0-pre3/doc/mcview.1.in	2003-01-23 18:58:24.000000000 +0100
+diff -Nurwd mc-4.6.2~pre1/doc/mcview.1.in mc-4.6.2~pre1/doc/mcview.1.in
+--- mc-4.6.2~pre1/doc/mcview.1.in	2003-01-20 15:08:22.000000000 +0100
++++ mc-4.6.2~pre1/doc/mcview.1.in	2008-01-24 23:04:13.000000000 +0100
 @@ -65,12 +65,12 @@
  .IP
  The help file for the program.

Modified: trunk/debian/patches/04_off64t.patch
===================================================================
--- trunk/debian/patches/04_off64t.patch	2008-01-14 15:56:35 UTC (rev 8)
+++ trunk/debian/patches/04_off64t.patch	2008-01-24 23:07:53 UTC (rev 9)
@@ -187,3 +187,193 @@
  };
  
  /* Data associated with an open file */
+diff -Nurwd mc-4.6.2~pre1/vfs/cpio.c mc-4.6.2~pre1/vfs/cpio.c
+--- mc-4.6.2~pre1/vfs/cpio.c	2005-05-27 05:35:16.000000000 +0200
++++ mc-4.6.2~pre1/vfs/cpio.c	2008-01-24 23:07:35.000000000 +0100
+@@ -90,7 +90,7 @@
+ };
+ 
+ /* FIXME: should be off_t instead of int. */
+-static int cpio_position;
++static off_t cpio_position;
+ 
+ static int cpio_find_head(struct vfs_class *me, struct vfs_s_super *super);
+ static int cpio_read_bin_head(struct vfs_class *me, struct vfs_s_super *super);
+@@ -114,7 +114,7 @@
+     return l;
+ }
+ 
+-static int cpio_skip_padding(struct vfs_s_super *super)
++static off_t cpio_skip_padding(struct vfs_s_super *super)
+ {
+     switch(super->u.arch.type) {
+     case CPIO_BIN:
+diff -Nurwd mc-4.6.2~pre1/vfs/direntry.c mc-4.6.2~pre1/vfs/direntry.c
+--- mc-4.6.2~pre1/vfs/direntry.c	2006-03-30 15:04:50.000000000 +0200
++++ mc-4.6.2~pre1/vfs/direntry.c	2008-01-24 23:09:01.000000000 +0100
+@@ -849,7 +849,7 @@
+     return 0;
+ }
+ 
+-static int
++static off_t
+ vfs_s_lseek (void *fh, off_t offset, int whence)
+ {
+     off_t size = FH->ino->st.st_size;
+@@ -858,7 +858,7 @@
+         vfs_die ("cannot lseek() after linear_read!");
+ 
+     if (FH->handle != -1){	/* If we have local file opened, we want to work with it */
+-	int retval = lseek (FH->handle, offset, whence);
++	off_t retval = lseek (FH->handle, offset, whence);
+ 	if (retval == -1)
+ 	    FH->ino->super->me->verrno = errno;
+ 	return retval;
+diff -Nurwd mc-4.6.2~pre1/vfs/extfs.c mc-4.6.2~pre1/vfs/extfs.c
+--- mc-4.6.2~pre1/vfs/extfs.c	2006-03-23 16:00:50.000000000 +0100
++++ mc-4.6.2~pre1/vfs/extfs.c	2008-01-24 23:06:15.000000000 +0100
+@@ -1140,7 +1140,7 @@
+     return 0;
+ }
+ 
+-static int extfs_lseek (void *data, off_t offset, int whence)
++static off_t extfs_lseek (void *data, off_t offset, int whence)
+ {
+     struct pseudofile *file = (struct pseudofile *) data;
+ 
+diff -Nurwd mc-4.6.2~pre1/vfs/local.c mc-4.6.2~pre1/vfs/local.c
+--- mc-4.6.2~pre1/vfs/local.c	2005-07-05 23:01:57.000000000 +0200
++++ mc-4.6.2~pre1/vfs/local.c	2008-01-24 23:06:15.000000000 +0100
+@@ -226,7 +226,7 @@
+     return chdir (path);
+ }
+ 
+-int
++off_t
+ local_lseek (void *data, off_t offset, int whence)
+ {
+     int fd = * (int *) data;
+diff -Nurwd mc-4.6.2~pre1/vfs/local.h mc-4.6.2~pre1/vfs/local.h
+--- mc-4.6.2~pre1/vfs/local.h	2005-07-05 23:01:57.000000000 +0200
++++ mc-4.6.2~pre1/vfs/local.h	2008-01-24 23:09:40.000000000 +0100
+@@ -11,6 +11,6 @@
+ extern int local_read (void *data, char *buffer, int count);
+ extern int local_fstat (void *data, struct stat *buf);
+ extern int local_errno (struct vfs_class *me);
+-extern int local_lseek (void *data, off_t offset, int whence);
++extern off_t local_lseek (void *data, off_t offset, int whence);
+ 
+ #endif
+diff -Nurwd mc-4.6.2~pre1/vfs/mcfs.c mc-4.6.2~pre1/vfs/mcfs.c
+--- mc-4.6.2~pre1/vfs/mcfs.c	2005-06-08 02:34:55.000000000 +0200
++++ mc-4.6.2~pre1/vfs/mcfs.c	2008-01-24 23:06:15.000000000 +0100
+@@ -1068,7 +1068,7 @@
+     return 0;
+ }
+ 
+-static int
++static off_t
+ mcfs_lseek (void *data, off_t offset, int whence)
+ {
+     mcfs_handle *info = (mcfs_handle *) data;
+diff -Nurwd mc-4.6.2~pre1/vfs/smbfs.c mc-4.6.2~pre1/vfs/smbfs.c
+--- mc-4.6.2~pre1/vfs/smbfs.c	2005-11-11 03:22:02.000000000 +0100
++++ mc-4.6.2~pre1/vfs/smbfs.c	2008-01-24 23:06:15.000000000 +0100
+@@ -1624,7 +1624,7 @@
+ 
+ #define smbfs_lstat smbfs_stat	/* no symlinks on smb filesystem? */
+ 
+-static int
++static off_t
+ smbfs_lseek (void *data, off_t offset, int whence)
+ {
+     smbfs_handle *info = (smbfs_handle *) data;
+diff -Nurwd mc-4.6.2~pre1/vfs/tar.c mc-4.6.2~pre1/vfs/tar.c
+--- mc-4.6.2~pre1/vfs/tar.c	2006-04-18 09:27:21.000000000 +0200
++++ mc-4.6.2~pre1/vfs/tar.c	2008-01-24 23:06:15.000000000 +0100
+@@ -209,7 +209,7 @@
+ }
+ 
+ /* As we open one archive at a time, it is safe to have this static */
+-static int current_tar_position = 0;
++static off_t current_tar_position = 0;
+ 
+ /* Returns fd of the open tar file */
+ static int
+@@ -521,7 +521,7 @@
+ 	struct stat st;
+ 	struct vfs_s_entry *entry;
+ 	struct vfs_s_inode *inode, *parent;
+-	long data_position;
++	off_t data_position;
+ 	char *q;
+ 	int len;
+ 	char *current_file_name, *current_link_name;
+@@ -750,8 +750,9 @@
+     int fd = FH_SUPER->u.arch.fd;
+     struct vfs_class *me = FH_SUPER->me;
+ 
+-    if (mc_lseek (fd, begin + FH->pos, SEEK_SET) != 
+-        begin + FH->pos) ERRNOR (EIO, -1);
++
++    off_t o = mc_lseek(fd, begin + FH->pos, SEEK_SET);
++    if ( o != begin + FH->pos) ERRNOR (EIO, -1);
+ 
+     count = MIN(count, FH->ino->st.st_size - FH->pos);
+ 
+diff -Nurwd mc-4.6.2~pre1/vfs/undelfs.c mc-4.6.2~pre1/vfs/undelfs.c
+--- mc-4.6.2~pre1/vfs/undelfs.c	2005-05-27 05:35:16.000000000 +0200
++++ mc-4.6.2~pre1/vfs/undelfs.c	2008-01-24 23:06:15.000000000 +0100
+@@ -648,7 +648,7 @@
+ }
+ 
+ /* this has to stay here for now: vfs layer does not know how to emulate it */
+-static int
++static off_t
+ undelfs_lseek(void *vfs_info, off_t offset, int whence)
+ {
+     return -1;
+diff -Nurwd mc-4.6.2~pre1/vfs/vfs.c mc-4.6.2~pre1/vfs/vfs.c
+--- mc-4.6.2~pre1/vfs/vfs.c	2005-07-05 23:01:57.000000000 +0200
++++ mc-4.6.2~pre1/vfs/vfs.c	2008-01-24 23:06:15.000000000 +0100
+@@ -627,14 +627,14 @@
+ off_t mc_lseek (int fd, off_t offset, int whence)
+ {
+     struct vfs_class *vfs;
+-    int result;
++    off_t result;
+ 
+     if (fd == -1)
+ 	return -1;
+ 
+     vfs = vfs_op (fd);
+     result = vfs->lseek ? (*vfs->lseek)(vfs_info (fd), offset, whence) : -1;
+-    if (result == -1)
++    if (result == (off_t)-1)
+         errno = vfs->lseek ? ferrno (vfs) : E_NOTSUPP;
+     return result;
+ }
+diff -Nurwd mc-4.6.2~pre1/vfs/vfs-impl.h mc-4.6.2~pre1/vfs/vfs-impl.h
+--- mc-4.6.2~pre1/vfs/vfs-impl.h	2005-11-15 23:27:45.000000000 +0100
++++ mc-4.6.2~pre1/vfs/vfs-impl.h	2008-01-24 23:06:15.000000000 +0100
+@@ -70,7 +70,7 @@
+     int (*rename) (struct vfs_class *me, const char *p1, const char *p2);
+     int (*chdir) (struct vfs_class *me, const char *path);
+     int (*ferrno) (struct vfs_class *me);
+-    int (*lseek) (void *vfs_info, off_t offset, int whence);
++    off_t (*lseek) (void *vfs_info, off_t offset, int whence);
+     int (*mknod) (struct vfs_class *me, const char *path, int mode, int dev);
+ 
+     vfsid (*getid) (struct vfs_class *me, const char *path);
+diff -Nurwd mc-4.6.2~pre1/vfs/xdirentry.h mc-4.6.2~pre1/vfs/xdirentry.h
+--- mc-4.6.2~pre1/vfs/xdirentry.h	2006-01-27 23:16:45.000000000 +0100
++++ mc-4.6.2~pre1/vfs/xdirentry.h	2008-01-24 23:06:15.000000000 +0100
+@@ -94,7 +94,7 @@
+     char *linkname;		/* Symlink's contents */
+     char *localname;		/* Filename of local file, if we have one */
+     struct timeval timestamp;	/* Subclass specific */
+-    long data_offset;		/* Subclass specific */
++    off_t data_offset;		/* Subclass specific */
+ };
+ 
+ /* Data associated with an open file */

Deleted: trunk/debian/patches/05_symcrash.patch
===================================================================
--- trunk/debian/patches/05_symcrash.patch	2008-01-14 15:56:35 UTC (rev 8)
+++ trunk/debian/patches/05_symcrash.patch	2008-01-24 23:07:53 UTC (rev 9)
@@ -1,45 +0,0 @@
---- mc-4.6.1/src/util.c.symcrash	2005-09-13 12:32:54.000000000 +0200
-+++ mc-4.6.1/src/util.c	2005-09-13 12:39:09.000000000 +0200
-@@ -1406,21 +1406,23 @@
-  * as needed up in first and then goes down using second */
- char *diff_two_paths (const char *first, const char *second) 
- {
--    char *p, *q, *r, *s, *buf = 0;
-+    char *p, *q, *r, *s, *buf = NULL;
-     int i, j, prevlen = -1, currlen;
-     char *my_first = NULL, *my_second = NULL;
-     
-     my_first = resolve_symlinks (first);
-     if (my_first == NULL)
-         return NULL;
-+    my_second= resolve_symlinks (second);
-+    if (my_second == NULL) {
-+	g_free (my_first);
-+	return NULL;
-+    }
-     for (j = 0; j < 2; j++) {
- 	p = my_first;
- 	if (j) {
--	    my_second = resolve_symlinks (second);
--	    if (my_second == NULL) {
--		g_free (my_first);
-+	    if (my_second == NULL)
- 	        return buf;
--	    }
- 	}
- 	q = my_second;
- 	for (;;) {
---- mc-4.6.1/src/file.c.symcrash	2005-09-13 12:32:54.000000000 +0200
-+++ mc-4.6.1/src/file.c	2005-09-13 12:29:16.000000000 +0200
-@@ -387,9 +387,9 @@
- 	char *p, *q, *s;
- 
- 	const char *r = strrchr (src_path, PATH_SEP);
--
-+	
- 	if (r) {
--	    p = g_strndup (src_path, r - src_path);
-+	    p = g_strndup (src_path, r - src_path + 1);
- 	    if (*dst_path == PATH_SEP)
- 		q = g_strdup (dst_path);
- 	    else

Modified: trunk/debian/patches/06_smbconf_path.patch
===================================================================
--- trunk/debian/patches/06_smbconf_path.patch	2008-01-14 15:56:35 UTC (rev 8)
+++ trunk/debian/patches/06_smbconf_path.patch	2008-01-24 23:07:53 UTC (rev 9)
@@ -1,6 +1,7 @@
---- vfs/smbfs.c.orig	2002-12-13 15:57:39.000000000 +0100
-+++ vfs/smbfs.c	2002-12-13 15:57:46.000000000 +0100
-@@ -259,7 +259,7 @@
+diff -Nurwd mc-4.6.2~pre1/vfs/smbfs.c mc-4.6.2~pre1.patched/vfs/smbfs.c
+--- mc-4.6.2~pre1/vfs/smbfs.c	2005-11-11 03:22:02.000000000 +0100
++++ mc-4.6.2~pre1/vfs/smbfs.c	2008-01-24 23:17:43.000000000 +0100
+@@ -294,7 +294,7 @@
  static int
  smbfs_init (struct vfs_class * me)
  {

Modified: trunk/debian/patches/08_awk.patch
===================================================================
--- trunk/debian/patches/08_awk.patch	2008-01-14 15:56:35 UTC (rev 8)
+++ trunk/debian/patches/08_awk.patch	2008-01-24 23:07:53 UTC (rev 9)
@@ -1,8 +1,8 @@
-diff -urN mc-4.6.0.orig/configure mc-4.6.0/configure
---- mc-4.6.0.orig/configure	2003-02-05 19:09:04.000000000 +0100
-+++ mc-4.6.0/configure	2003-03-03 21:23:03.000000000 +0100
-@@ -1489,7 +1489,7 @@
- echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
+diff -Nurwd mc-4.6.2~pre1/configure mc-4.6.2~pre1.patched/configure
+--- mc-4.6.2~pre1/configure	2007-09-11 16:33:32.000000000 +0200
++++ mc-4.6.2~pre1/configure	2008-01-24 23:37:34.000000000 +0100
+@@ -1562,7 +1562,7 @@
+   fi
  fi
  
 -for ac_prog in gawk mawk nawk awk

Modified: trunk/debian/patches/09_de.po.patch
===================================================================
--- trunk/debian/patches/09_de.po.patch	2008-01-14 15:56:35 UTC (rev 8)
+++ trunk/debian/patches/09_de.po.patch	2008-01-24 23:07:53 UTC (rev 9)
@@ -1,15 +1,16 @@
---- po/de.po.orig	2005-06-11 16:42:51.000000000 +0200
-+++ po/de.po	2005-06-14 18:55:30.000000000 +0200
-@@ -1411,7 +1411,7 @@
- #: src/cmd.c:988
+diff -Nurwd mc-4.6.2~pre1/po/de.po mc-4.6.2~pre1.patched/po/de.po
+--- mc-4.6.2~pre1/po/de.po	2007-09-11 16:35:05.000000000 +0200
++++ mc-4.6.2~pre1/po/de.po	2008-01-24 23:42:24.000000000 +0100
+@@ -1147,7 +1147,7 @@
+ 
  #, c-format
  msgid " edit symlink: %s "
 -msgstr " symbolschen Link barbeiten: %s"
 +msgstr " symbolschen Link bearbeiten: %s"
  
- #: src/cmd.c:999
  #, c-format
-@@ -1561,7 +1561,7 @@
+ msgid "`%s' is not a symbolic link"
+@@ -1246,7 +1246,7 @@
  " Cannot create temporary command file \n"
  " %s "
  msgstr ""
@@ -17,8 +18,8 @@
 +" Kann temporäre Befehlsdatei nicht anlegen \n"
  " %s "
  
- #: src/ext.c:117 src/user.c:585
-@@ -1669,7 +1669,7 @@
+ msgid " Parameter "
+@@ -1332,7 +1332,7 @@
  " Cannot stat source file \"%s\" \n"
  " %s "
  msgstr ""
@@ -26,31 +27,31 @@
 +" Kann Quelldatei \"%s\" nicht untersuchen \n"
  " %s "
  
- #: src/file.c:517 src/file.c:1058
-@@ -2575,7 +2575,7 @@
- #: src/learn.c:115
  #, c-format
+@@ -2071,7 +2071,7 @@
+ 
+ #, c-format
  msgid " You have entered \"%s\""
 -msgstr " Sie haben \"%s\" einggeben"
 +msgstr " Sie haben \"%s\" eingegeben"
  
  #. TRANSLATORS: This label appears near learned keys.  Keep it short.
- #: src/learn.c:164
-@@ -2667,7 +2667,7 @@
+ msgid "OK"
+@@ -2145,7 +2145,7 @@
+ msgstr "FT&P-Verbindung..."
  
- #: src/main.c:811 src/main.c:835
  msgid "S&hell link..."
 -msgstr "Shell-Verbindung..."
 +msgstr "S&hell-Verbindung..."
  
- #: src/main.c:813 src/main.c:837
  msgid "SM&B link..."
-@@ -4199,7 +4199,7 @@
- #: vfs/ftpfs.c:684
+ msgstr "SM&B-Verbindung..."
+@@ -3383,7 +3383,7 @@
+ 
  #, c-format
  msgid "ftpfs: connection to server failed: %s"
 -msgstr "ftpfs: Verbindung zum Server fehlgeschlgen: %s"
 +msgstr "ftpfs: Verbindung zum Server fehlgeschlagen: %s"
  
- #: vfs/ftpfs.c:725
  #, c-format
+ msgid "Waiting to retry... %d (Control-C to cancel)"

Modified: trunk/debian/patches/10_it.po.patch
===================================================================
--- trunk/debian/patches/10_it.po.patch	2008-01-14 15:56:35 UTC (rev 8)
+++ trunk/debian/patches/10_it.po.patch	2008-01-24 23:07:53 UTC (rev 9)
@@ -1,11 +1,12 @@
---- mc-4.6.0-4.6.1-pre4.orig/po/it.po
-+++ mc-4.6.0-4.6.1-pre4/po/it.po
-@@ -2097,7 +2097,7 @@
+diff -Nurwd mc-4.6.2~pre1/po/it.po mc-4.6.2~pre1.patched/po/it.po
+--- mc-4.6.2~pre1/po/it.po	2007-09-11 16:35:06.000000000 +0200
++++ mc-4.6.2~pre1/po/it.po	2008-01-24 23:44:48.000000000 +0100
+@@ -1683,7 +1683,7 @@
+ msgstr "&Riprendi"
  
- #: src/filegui.c:524
  msgid "A&ppend"
 -msgstr "Atta&cca"
 +msgstr "atta&Cca"
  
- #: src/filegui.c:527
  msgid "Overwrite this target?"
+ msgstr "Sovrascrivo questo file?"

Modified: trunk/debian/patches/11_extfs_missing.patch
===================================================================
--- trunk/debian/patches/11_extfs_missing.patch	2008-01-14 15:56:35 UTC (rev 8)
+++ trunk/debian/patches/11_extfs_missing.patch	2008-01-24 23:07:53 UTC (rev 9)
@@ -1,9 +1,9 @@
-diff -pruN vfs/extfs/uzip.in vfs/extfs/uzip.in
---- vfs/extfs/uzip.in	2004-09-03 14:40:11.000000000 +0200
-+++ vfs/extfs/uzip.in	2005-02-06 13:02:49.000000000 +0100
-@@ -34,6 +34,14 @@ my $cmd_delete = "$app_zip -d";
- # Command used to extract a file to standard out
- my $cmd_extract = "$app_unzip -p";
+diff -Nurwd mc-4.6.2~pre1/vfs/extfs/uzip.in mc-4.6.2~pre1.patched/vfs/extfs/uzip.in
+--- mc-4.6.2~pre1/vfs/extfs/uzip.in	2006-05-06 10:31:53.000000000 +0200
++++ mc-4.6.2~pre1.patched/vfs/extfs/uzip.in	2008-01-24 23:55:20.000000000 +0100
+@@ -42,6 +42,14 @@
+ # (size) (method) (zippedsize) (zipratio) (mm)(dd)(yy)(HH)(MM) (cksum) (fname)
+ my $regex_nonzipinfo_line = qr"^\s*(\d+)\s+(\S+)\s+(\d+)\s+(-?\d+\%)\s+(\d?\d)-(\d?\d)-(\d\d)\s+(\d?\d):(\d\d)\s+([0-9a-f]+)\s\s(.*)$";
  
 +# -rw-r--r--  2.2 unx     2891 tx     1435 defN 20000330.211927 ./edit.html
 +# (perm) (?) (?) (size) (?) (zippedsize) (method) (yyyy)(mm)(dd)(HH)(MM) (fname)
@@ -16,9 +16,9 @@
  #
  # Main code
  #
-@@ -50,6 +58,50 @@ my $aarchive = absolutize($archive, $old
- my $cmd_list = ($op_has_zipinfo ? $cmd_list_zi : $cmd_list_nzi);
- my ($qarchive, $aqarchive) = map (quotemeta, $archive, $aarchive);
+@@ -102,6 +110,50 @@
+     return $fname;
+ }
  
 +# Strip all "." and ".." path components from a pathname.
 +sub zipfs_canonicalize_pathname($) {
@@ -67,61 +67,3 @@
  if ($cmd eq 'list')    { &mczipfs_list(@ARGV); }
  if ($cmd eq 'rm')      { &mczipfs_rm(@ARGV); }
  if ($cmd eq 'rmdir')   { &mczipfs_rmdir(@ARGV); }
-@@ -63,7 +115,12 @@ exit 1;
- 
- # Remove a file from the archive.
- sub mczipfs_rm {
--	my ($qfile) = map { &zipquotemeta($_) } @_;
-+	my ($qfile) = map { &zipquotemeta(zipfs_realpathname($_)) } @_;
-+
-+	# "./" at the beginning of pathnames is stripped by Info-ZIP,
-+	# so convert it to "[.]/" to prevent stripping.
-+	$qfile =~ s/^\\\./[.]/;
-+
- 	&checkargs(1, 'archive file', @_);
- 	&safesystem("$cmd_delete $qarchive $qfile >/dev/null");
- 	exit;
-@@ -74,7 +131,7 @@ sub mczipfs_rm {
- # additional slash to the directory name to remove. I am not
- # sure this is absolutely necessary, but it doesn't hurt.
- sub mczipfs_rmdir {
--	my ($qfile) = map { &zipquotemeta($_) } @_;
-+	my ($qfile) = map { &zipquotemeta(zipfs_realpathname($_)) } @_;
- 	&checkargs(1, 'archive directory', @_);
- 	&safesystem("$cmd_delete $qarchive $qfile/ >/dev/null", 12);
-   exit;
-@@ -84,7 +141,7 @@ sub mczipfs_rmdir {
- # Note that we don't need to check if the file is a link,
- # because mc apparently doesn't call copyout for symbolic links.
- sub mczipfs_copyout {
--	my ($qafile, $qfsfile) = map { &zipquotemeta($_) } @_;
-+	my ($qafile, $qfsfile) = map { &zipquotemeta(zipfs_realpathname($_)) } @_;
- 	&checkargs(1, 'archive file', @_);
- 	&checkargs(2, 'local file', @_);
- 	&safesystem("$cmd_extract $qarchive $qafile > $qfsfile", 11);
-@@ -195,14 +252,14 @@ sub mczipfs_list {
- 			next if /^Archive:/;
- 			next if /^\d+ file/;
- 			next if /^Empty zipfile\.$/;
--			my @match = /^(.{10}) +([\d.]+) +([a-z\d]+) +(\d+) +([^ ]{2}) +(\d+) +([^ ]{4}) +(\d{4})(\d\d)(\d\d)\.(\d\d)(\d\d)(\d\d) +(.*)$/;
-+			my @match = /$regex_zipinfo_line/;
- 			next if ($#match != 13);
- 			&checked_print_file(@match);
- 		}
- 	} else {
- 		while (<PIPE>) {
- 			chomp;
--			my @match = /^ *(\d+) +([^ ]+) +(\d+) +(-?\d+\%) +(\d?\d)-(\d?\d)-(\d\d) (\d?\d):(\d\d) +([0-9a-f]+) +(.*)$/;
-+			my @match = /$regex_nonzipinfo_line/;
- 			next if ($#match != 10);
- 			my @rmatch = ('', '', 'unknown', $match[0], '', $match[2], $match[1],
- 					$match[6] + ($match[6] < 70 ? 2000 : 1900), $match[4], $match[5],
-@@ -230,7 +287,7 @@ sub mczipfs_list {
- sub mczipfs_run {
- 	my ($afile) = @_;
- 	&checkargs(1, 'archive file', @_);
--	my $qafile = &zipquotemeta($afile);
-+	my $qafile = &zipquotemeta(zipfs_realpathname($afile));
- 	my $tmpdir = &mktmpdir();
- 	my $tmpfile = File::Basename::basename($afile);
- 

Modified: trunk/debian/patches/13_syntax.patch
===================================================================
--- trunk/debian/patches/13_syntax.patch	2008-01-14 15:56:35 UTC (rev 8)
+++ trunk/debian/patches/13_syntax.patch	2008-01-24 23:07:53 UTC (rev 9)
@@ -1,13 +1,15 @@
---- syntax/Syntax	Sun Mar  6 14:11:31 2005
-+++ syntax/Syntax	Sun Mar  6 19:00:44 2005
-@@ -41,8 +41,9 @@
- file ..\*\\.(rb|RB)$ Ruby\sProgram ^#!\s\*/.\*/ruby
+diff -Nurwd mc-4.6.2~pre1/syntax/Syntax mc-4.6.2~pre1.patched/syntax/Syntax
+--- mc-4.6.2~pre1/syntax/Syntax	2007-08-27 08:56:47.000000000 +0200
++++ mc-4.6.2~pre1.patched/syntax/Syntax	2008-01-24 23:52:28.000000000 +0100
+@@ -46,9 +46,10 @@
+ file ..\*\\.(rb|RB)$ Ruby\sProgram ^#!.\*([\s/]ruby|@RUBY@)
  include ruby.syntax
  
 -file ..\*\\.(man|[0-9n]|[0-9]x)$ NROFF\sSource
 +file ..\*\\.(man|[0-9n]|[0-9](x|ncurses|ssl|p|pm|menu|form|vga|t|td))$ NROFF\sSource
  include nroff.syntax
+ 
 +
- 
  file ..\*\\.(htm|html|HTM|HTML)$ HTML\sFile
  include html.syntax
+ 

Modified: trunk/debian/patches/14_cxx.syntax.patch
===================================================================
--- trunk/debian/patches/14_cxx.syntax.patch	2008-01-14 15:56:35 UTC (rev 8)
+++ trunk/debian/patches/14_cxx.syntax.patch	2008-01-24 23:07:53 UTC (rev 9)
@@ -1,15 +1,6 @@
---- mc-4.6.0-4.6.1-pre4.orig/syntax/Makefile.in
-+++ mc-4.6.0-4.6.1-pre4/syntax/Makefile.in
-@@ -227,6 +227,7 @@
- 	aspx.syntax		\
- 	assembler.syntax	\
- 	c.syntax		\
-+	cxx.syntax		\
- 	cs.syntax		\
- 	changelog.syntax	\
- 	diff.syntax		\
---- mc-4.6.0-4.6.1-pre4.orig/syntax/cxx.syntax
-+++ mc-4.6.0-4.6.1-pre4/syntax/cxx.syntax
+diff -Nurwd mc-4.6.2~pre1/syntax/cxx.syntax mc-4.6.2~pre1.patched/syntax/cxx.syntax
+--- mc-4.6.2~pre1/syntax/cxx.syntax	1970-01-01 00:00:00.000000000 +0000
++++ mc-4.6.2~pre1.patched/syntax/cxx.syntax	2008-01-24 23:57:05.000000000 +0100
 @@ -0,0 +1,128 @@
 +context default
 +    keyword whole auto yellow
@@ -139,3 +130,14 @@
 +    keyword \\\{abtnvfr\} brightgreen
 +
 +
+diff -Nurwd mc-4.6.2~pre1/syntax/Makefile.in mc-4.6.2~pre1.patched/syntax/Makefile.in
+--- mc-4.6.2~pre1/syntax/Makefile.in	2007-09-11 16:33:39.000000000 +0200
++++ mc-4.6.2~pre1.patched/syntax/Makefile.in	2008-01-24 23:58:04.000000000 +0100
+@@ -240,6 +240,7 @@
+ 	aspx.syntax		\
+ 	assembler.syntax	\
+ 	c.syntax		\
++	cxx.syntax              \
+ 	changelog.syntax	\
+ 	cs.syntax		\
+ 	css.syntax		\




More information about the Pkg-mc-commits mailing list