[Pkg-mc-commits] r168 - in trunk/debian: . patches/mc.ext patches/vfs

[winnie at alioth.debian.org]

Author: winnie
Date: 2008-07-26 09:13:32 +0000 (Sat, 26 Jul 2008)
New Revision: 168

Modified:
   trunk/debian/changelog
   trunk/debian/control
   trunk/debian/patches/mc.ext/10_run_mailcap.patch
   trunk/debian/patches/vfs/07_srpm_support.patch
Log:
Some more fixes


Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2008-07-21 21:47:06 UTC (rev 167)
+++ trunk/debian/changelog	2008-07-26 09:13:32 UTC (rev 168)
@@ -8,7 +8,9 @@
     between me and the submitter. (Closes: 487611)
   * Highlight also .inc files as php if they are written in php. 
     (Closes: 487936)
-  * Enabled whitespace feature again. (Closes: #488465) 
+  * Enabled whitespace feature again. (Closes: #488465)
+  * Use odt2txt to show openoffice documents. (Closes: #492019)
+  * Fix typo in mc.ext (Closes: #489751)
 
  -- Patrick Winnertz <winnie at debian.org>  Mon, 21 Jul 2008 22:40:58 +0200
 

Modified: trunk/debian/control
===================================================================
--- trunk/debian/control	2008-07-21 21:47:06 UTC (rev 167)
+++ trunk/debian/control	2008-07-26 09:13:32 UTC (rev 168)
@@ -10,7 +10,7 @@
 Package: mc
 Architecture: any
 Depends: ${shlibs:Depends}
-Suggests: mime-support, perl, zip, unzip, bzip2, links | w3m | lynx, arj, file, xpdf, dbview
+Suggests: mime-support, perl, zip, unzip, bzip2, links | w3m | lynx, arj, file, xpdf, dbview, odt2txt
 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/mc.ext/10_run_mailcap.patch
===================================================================
--- trunk/debian/patches/mc.ext/10_run_mailcap.patch	2008-07-21 21:47:06 UTC (rev 167)
+++ trunk/debian/patches/mc.ext/10_run_mailcap.patch	2008-07-26 09:13:32 UTC (rev 168)
@@ -106,7 +106,7 @@
  
  type/^JPEG
 -	View=%view{ascii} identify %f; test -x /usr/bin/exif && echo && exif %f
-+	Viewh%view{ascii} identify %f; test -x /usr/bin/exif && echo && exif %f
++	View=%view{ascii} identify %f; test -x /usr/bin/exif && echo && exif %f
  	Include=image
  
  type/^PC\ bitmap

Modified: trunk/debian/patches/vfs/07_srpm_support.patch
===================================================================
--- trunk/debian/patches/vfs/07_srpm_support.patch	2008-07-21 21:47:06 UTC (rev 167)
+++ trunk/debian/patches/vfs/07_srpm_support.patch	2008-07-26 09:13:32 UTC (rev 168)
@@ -477,7 +477,7 @@
 +# StarOffice 6 and OpenOffice.org formats
 +regex/\.(odt|ott|sxw|stw|ods|ots|sxc|stc|odp|otp|sxi|sti|odg|otg|sxd|std|odb|odf|sxm|odm|sxg)$
 +	Open=(ooffice %f &)
-+	View=%view{ascii} unzip -p %f content.xml | o3totxt
++	View=%view{ascii} odt2txt
 +
 +# AbiWord
 +shell/.abw