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

winnie at alioth.debian.org winnie at alioth.debian.org
Sat Feb 16 17:19:55 UTC 2008


Author: winnie
Date: 2008-02-16 17:19:55 +0000 (Sat, 16 Feb 2008)
New Revision: 44

Modified:
   trunk/debian/changelog
   trunk/debian/patches/01_mc.ext.in.mime.patch
Log:
Closes #442024


Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2008-02-16 15:55:34 UTC (rev 43)
+++ trunk/debian/changelog	2008-02-16 17:19:55 UTC (rev 44)
@@ -1,3 +1,9 @@
+mc (1:4.6.2~pre1-3) UNRELEASED; urgency=low
+
+  * Open also files with colons with run-mailcap. (Closes: #442024) 
+
+ -- Patrick Winnertz <winnie at debian.org>  Sat, 16 Feb 2008 18:18:22 +0100
+
 mc (1:4.6.2~pre1-2) unstable; urgency=low
 
   * Add a Suggests on file. (Closes: #435135)

Modified: trunk/debian/patches/01_mc.ext.in.mime.patch
===================================================================
--- trunk/debian/patches/01_mc.ext.in.mime.patch	2008-02-16 15:55:34 UTC (rev 43)
+++ trunk/debian/patches/01_mc.ext.in.mime.patch	2008-02-16 17:19:55 UTC (rev 44)
@@ -146,12 +146,12 @@
  
  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 %f >/dev/null 2>&1 &); fi
-+ 	Open=run-mailcap audio/x-wav:%f
++ 	Open=run-mailcap audio/x-wav %f 2>&1
 + 	#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=run-mailcap application/x-mod:%f
++ 	Open=run-mailcap application/x-mod %f 2>&1
 +        #Open=mikmod %f
         #Open=tracker %f
  
@@ -161,19 +161,19 @@
  regex/\.([mM][pP]3)$
 -	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=run-mailcap audio/mpeg %f 2>&1
 + 	#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 >/dev/null 2>&1 &); fi
-+ 	Open=run-mailcap application/x-ogg:%f &
++ 	Open=run-mailcap application/x-ogg %f  2>&1 &
 + 	#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=run-mailcap audio/midi %f 2>&1
 + 	#Open=timidity %f
  
  regex/\.([wW][mM][aA])$
@@ -183,7 +183,7 @@
  
  regex/\.([rR][aA]?[mM])$
 -	Open=(realplay %f >/dev/null 2>&1 &)
-+	Open=run-mailcap audio/x-pn-realaudio:%f
++	Open=run-mailcap audio/x-pn-realaudio %f 2>&1
 +	#Open=(realplay %f >/dev/null 2>&1 &)
  
  include/video
@@ -198,14 +198,14 @@
  # Postscript
  type/^PostScript
 -	Open=(gv %f &)
-+	Open=run-mailcap application/postscript:%f
++	Open=run-mailcap application/postscript %f 2>&1
 +	#Open=(gv %f &)
  	View=%view{ascii} ps2ascii %f
  
  # PDF
  type/^PDF
 -	Open=(xpdf %f &)
-+	Open=run-mailcap application/pdf:%f &
++	Open=run-mailcap application/pdf %f 2>&1 &
 +	#Open=(xpdf %f &)
  	#Open=(acroread %f &)
  	#Open=(ghostview %f &)
@@ -216,7 +216,7 @@
  regex/\.([hH][tT][mM][lL]?)$
 -	Open=(if test -n "@X11_WWW@" && test -n "$DISPLAY"; then (@X11_WWW@ file://%d/%p &) 1>&2; else links %f || lynx -force_html %f || ${PAGER:-more} %f; fi) 2>/dev/null
 -	View=%view{ascii} lynx -dump -force_html %f
-+	Open=run-mailcap text/html:%f
++	Open=run-mailcap text/html %f 2>&1
 +	#Open=(if test -n "@X11_WWW@" && test -n "$DISPLAY"; then (@X11_WWW@ file://%d/%p &) 1>&2; else links %f || lynx -force_html %f || ${PAGER:-more} %f; fi) 2>/dev/null
 +	View=%view{ascii} links -dump %f 2>/dev/null || w3m -dump %f 2>/dev/null || lynx -dump -force_html %f
  
@@ -228,7 +228,7 @@
  regex/\.([Dd][oO][cCtT]|[Ww][rR][iI])$
 -	Open=(abiword %f >/dev/null 2>&1 &)
 -	View=%view{ascii} catdoc -w %f || word2x -f text %f - || strings %f
-+	Open=run-mailcap application/msword:%f
++	Open=run-mailcap application/msword %f 2>&1
 +	#Open=(abiword %f >/dev/null 2>&1 &)
 +	View=%view{ascii} antiword -t %f || catdoc -w %f || word2x -f text %f - || strings %f
  type/^Microsoft\ Word
@@ -239,18 +239,18 @@
  # RTF document
  regex/\.([rR][tT][fF])$
 -	Open=(abiword %f >/dev/null 2>&1 &)
-+	Open=run-mailcap text/rtf:%f
++	Open=run-mailcap text/rtf %f 2>&1
 +	#Open=(abiword %f >/dev/null 2>&1 &)
  
  # Microsoft Excel Worksheet
  regex/\.([xX][lL][sSwW])$
 -	Open=(gnumeric %f >/dev/null 2>&1 &)
-+	Open=run-mailcap application/vnd.ms-excel:%f
++	Open=run-mailcap application/vnd.ms-excel %f 2>&1
 +	#Open=(gnumeric %f >/dev/null 2>&1 &)
  	View=%view{ascii} xls2csv %f || strings %f
  type/^Microsoft\ Excel
 -	Open=(gnumeric %f >/dev/null 2>&1 &)
-+	Open=run-mailcap application/vnd.ms-excel:%f
++	Open=run-mailcap application/vnd.ms-excel %f 2>&1
 +	#Open=(gnumeric %f >/dev/null 2>&1 &)
  	View=%view{ascii} xls2csv %f || strings %f
  
@@ -260,7 +260,7 @@
  # DVI
  regex/\.([dD][vV][iI])$
 -	Open=if [ x$DISPLAY = x ]; then dvisvga %f; else (xdvi %f &); fi
-+	Open=run-mailcap application/x-dvi:%f
++	Open=run-mailcap application/x-dvi %f 2>&1
 +	#Open=if [ x$DISPLAY = x ]; then dvisvga %f; else (xdvi %f &); fi
  	View=%view{ascii} dvi2tty %f
  
@@ -280,12 +280,12 @@
 +
 +# view gzipped HTML
 +regex/\.([hH][tT][mM][lL]?)\.([gG][zZ])$
-+        Open=zcat %f|run-mailcap text/html:-
++        Open=zcat %f|run-mailcap text/html -
 +        View=zcat %f|%view{ascii} w3m -dump -T text/html 2>&1||zcat %f|%view{ascii} links -dump 2>&1||zcat %f|lynx -dump -force_html 2>&1
 +
 +# view bzipped HTML
 +regex/\.([hH][tT][mM][lL]?)\.([bB][zZ])2$
-+        Open=bzcat %f|run-mailcap text/html:-
++        Open=bzcat %f|run-mailcap text/html -
 +        View=bzcat %f|%view{ascii} w3m -dump -T text/html 2>&1||zcat %f|%view{ascii} links -dump 2>&1||zcat %f|lynx -dump -force_html 2>&1
 +
 +# view gzipped (E)PS




More information about the Pkg-mc-commits mailing list