95f47c2
diff -up mc-4.7.0-pre1/configure.ac.extensions mc-4.7.0-pre1/configure.ac
95f47c2
--- mc-4.7.0-pre1/configure.ac.extensions	2009-07-31 18:36:24.000000000 +0200
95f47c2
+++ mc-4.7.0-pre1/configure.ac	2009-08-05 12:51:08.000000000 +0200
95f47c2
@@ -67,7 +67,7 @@ AC_PROG_LN_S
95f47c2
 AC_CHECK_TOOL(AR, ar, ar)
95f47c2
 
95f47c2
 dnl Only list browsers here that can be run in background (i.e. with `&')
95f47c2
-AC_CHECK_PROGS(X11_WWW, [gnome-moz-remote mozilla konqueror opera netscape])
95f47c2
+AC_CHECK_PROGS(X11_WWW, [firefox gnome-moz-remote mozilla konqueror opera netscape])
95f47c2
 
95f47c2
 dnl
95f47c2
 dnl Ovverriding mmap support.  This has to be before AC_FUNC_MMAP is used.
95f47c2
diff -up mc-4.7.0-pre1/misc/mc.ext.in.extensions mc-4.7.0-pre1/misc/mc.ext.in
95f47c2
--- mc-4.7.0-pre1/misc/mc.ext.in.extensions	2009-06-23 20:55:11.000000000 +0200
95f47c2
+++ mc-4.7.0-pre1/misc/mc.ext.in	2009-08-05 13:01:48.000000000 +0200
95f47c2
@@ -221,8 +221,8 @@ regex/\.rpm$
95f47c2
 
95f47c2
 # deb
95f47c2
 regex/\.u?deb$
95f47c2
-	Open=%cd %p#deb
95f47c2
-	View=%view{ascii} dpkg-deb -I %f && echo && dpkg-deb -c %f
95f47c2
+	Open=%cd %p#uar
95f47c2
+	View=%view{ascii} file %f && nm %f
95f47c2
 
95f47c2
 # dpkg
95f47c2
 shell/.debd
95f47c2
@@ -397,11 +397,16 @@ regex/\.([wW][aA][wW]22)$
95f47c2
        Open=vplay -s 22 %f
95f47c2
 
95f47c2
 regex/\.([mM][pP]3)$
95f47c2
-	Open=if [ "$DISPLAY" = "" ]; then mpg123 %f; else (xmms %f >/dev/null 2>&1 &); fi
95f47c2
-	View=%view{ascii} mpg123 -vtn1 %f 2>&1 | sed -n '/^Title/,/^Comment/p;/^MPEG/,/^Audio/p'
95f47c2
+	Include=audio
95f47c2
+#	Open=if [ "$DISPLAY" = "" ]; then mpg123 %f; else (xmms %f >/dev/null 2>&1 &); fi
95f47c2
+#	View=%view{ascii} mpg123 -vtn1 %f 2>&1 | sed -n '/^Title/,/^Comment/p;/^MPEG/,/^Audio/p'
95f47c2
+
95f47c2
+regex/\.([mM][kK][aA])$
95f47c2
+	Include=audio
95f47c2
 
95f47c2
 regex/\.([oO][gG][gG|aA|vV|xX])$
95f47c2
-	Open=if [ "$DISPLAY" = "" ]; then ogg123 %f; else (xmms %f >/dev/null 2>&1 &); fi
95f47c2
+	Open=ogg123 %f
95f47c2
+#	Open=if [ "$DISPLAY" = "" ]; then ogg123 %f; else (xmms %f >/dev/null 2>&1 &); fi
95f47c2
 	View=%view{ascii} ogginfo %s
95f47c2
 
95f47c2
 regex/\.([sS][pP][xX]|[fF][lL][aA][cC])$
95f47c2
@@ -414,11 +419,15 @@ regex/\.([wW][mM][aA])$
95f47c2
 	Open=mplayer -vo null %f
95f47c2
 	View=%view{ascii} mplayer -quiet -slave -frames 0 -vo null -ao null -identify %f 2>/dev/null | tail +13 || file %f
95f47c2
 
95f47c2
+include/audio
95f47c2
+	Open=mplayer %f
95f47c2
+	View=%view{ascii} mplayer -identify -vo null -ao null -frames 0 %f 2>&1 | sed -n '/^ID_/p'
95f47c2
 
95f47c2
 ### Play lists ###
95f47c2
 
95f47c2
 regex/\.([mM]3[uU]|[pP][lL][sS])$
95f47c2
-	Open=if [ -z "$DISPLAY" ]; then mplayer -vo null -playlist %f; else (xmms -p %f >/dev/null 2>&1 &); fi
95f47c2
+	Open=mplayer -vo null -playlist %f
95f47c2
+#	Open=if [ -z "$DISPLAY" ]; then mplayer -vo null -playlist %f; else (xmms -p %f >/dev/null 2>&1 &); fi
95f47c2
 
95f47c2
 
95f47c2
 ### Video ###
95f47c2
@@ -432,6 +441,9 @@ regex/\.([aA][sS][fFxX])$
95f47c2
 regex/\.([dD][iI][vV][xX])$
95f47c2
 	Include=video
95f47c2
 
95f47c2
+regex/\.([mM][kK][vV])$
95f47c2
+	Include=video
95f47c2
+
95f47c2
 regex/\.([mM][oO][vV]|[qQ][tT])$
95f47c2
 	Include=video
95f47c2
 
95f47c2
@@ -496,22 +508,27 @@ shell/.abw
95f47c2
 
95f47c2
 # Microsoft Word Document
95f47c2
 regex/\.([Dd][oO][cCtT]|[Ww][rR][iI])$
95f47c2
-	Open=(abiword %f >/dev/null 2>&1 &)
95f47c2
+	Open=(ooffice %f &)
95f47c2
+#	Open=(abiword %f >/dev/null 2>&1 &)
95f47c2
 	View=%view{ascii} antiword -t %f || catdoc -w %f || word2x -f text %f - || strings %f
95f47c2
 type/^Microsoft\ Word
95f47c2
-	Open=(abiword %f >/dev/null 2>&1 &)
95f47c2
+	Open=(ooffice %f &)
95f47c2
+#	Open=(abiword %f >/dev/null 2>&1 &)
95f47c2
 	View=%view{ascii} antiword -t %f || catdoc -w %f || word2x -f text %f - || strings %f
95f47c2
 
95f47c2
 # RTF document
95f47c2
 regex/\.([rR][tT][fF])$
95f47c2
-	Open=(abiword %f >/dev/null 2>&1 &)
95f47c2
+	Open=(ooffice %f &)
95f47c2
+#	Open=(abiword %f >/dev/null 2>&1 &)
95f47c2
 
95f47c2
 # Microsoft Excel Worksheet
95f47c2
 regex/\.([xX][lL][sSwW])$
95f47c2
-	Open=(gnumeric %f >/dev/null 2>&1 &)
95f47c2
+	Open=(ooffice %f &)
95f47c2
+#	Open=(gnumeric %f >/dev/null 2>&1 &)
95f47c2
 	View=%view{ascii} xls2csv %f || strings %f
95f47c2
 type/^Microsoft\ Excel
95f47c2
-	Open=(gnumeric %f >/dev/null 2>&1 &)
95f47c2
+	Open=(ooffice %f &)
95f47c2
+#	Open=(gnumeric %f >/dev/null 2>&1 &)
95f47c2
 	View=%view{ascii} xls2csv %f || strings %f
95f47c2
 
95f47c2
 # Use OpenOffice.org to open any MS Office documents