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

[winnie at alioth.debian.org]

Author: winnie
Date: 2008-02-16 15:42:00 +0000 (Sat, 16 Feb 2008)
New Revision: 41

Modified:
   trunk/debian/changelog
   trunk/debian/control
   trunk/debian/patches/01_mc.ext.in.mime.patch
Log:
do not only use w3m


Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2008-02-16 15:24:53 UTC (rev 40)
+++ trunk/debian/changelog	2008-02-16 15:42:00 UTC (rev 41)
@@ -1,4 +1,4 @@
-mc (1:4.6.2~pre1-2) UNRELEASED; urgency=low
+mc (1:4.6.2~pre1-2) unstable; urgency=low
 
   * Add a Suggests on file. (Closes: #435135)
   * Fix uzip errror by removing ancient patch. Thanks to pabs.
@@ -7,8 +7,8 @@
   * Added updated sh.syntax (Closes: #372139)
   * Added strace.syntax (Closes: #383319)
   * Added option to open gzipped/bziped2 html files. (Closes: #444293)
-  * Added option to open compressed pdf/ps/dvi files. (Closes: #314557
-  * Added option to open compressed pdf/ps/dvi files. (Closes: #314557))
+  * Added option to open compressed pdf/ps/dvi files. (Closes: #314557)
+    + Added xpdf suggest to mc
   * After all options fail, use mime-support in order to open something.
     (Closes: #360676) 
     + Therefore I'll have to depend on mime-support (added as depends)

Modified: trunk/debian/control
===================================================================
--- trunk/debian/control	2008-02-16 15:24:53 UTC (rev 40)
+++ trunk/debian/control	2008-02-16 15:42:00 UTC (rev 41)
@@ -10,7 +10,7 @@
 Package: mc
 Architecture: any
 Depends: ${shlibs:Depends}, mime-support
-Suggests: perl, mime-support, zip, unzip, bzip2, links | w3m | lynx, arj, file
+Suggests: perl, zip, unzip, bzip2, links | w3m | lynx, arj, file, xpdf
 Description: midnight commander - a powerful file manager
  GNU Midnight Commander is a text-mode full-screen file manager. It
  uses a two panel interface and a subshell for command execution. It

Modified: trunk/debian/patches/01_mc.ext.in.mime.patch
===================================================================
--- trunk/debian/patches/01_mc.ext.in.mime.patch	2008-02-16 15:24:53 UTC (rev 40)
+++ trunk/debian/patches/01_mc.ext.in.mime.patch	2008-02-16 15:42:00 UTC (rev 41)
@@ -281,12 +281,12 @@
 +# view gzipped HTML
 +regex/\.([hH][tT][mM][lL]?)\.([gG][zZ])$
 +        Open=zcat %f|run-mailcap text/html:-
-+        View=zcat %f|%view{ascii} w3m -dump -T 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:-
-+        View=bzcat %f|%view{ascii} w3m -dump -T 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
 +regex/\.(e|)ps\.gz$