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

[winnie at alioth.debian.org]

Author: winnie
Date: 2008-08-29 12:14:46 +0000 (Fri, 29 Aug 2008)
New Revision: 171

Modified:
   trunk/debian/changelog
   trunk/debian/patches/vfs/07_srpm_support.patch
Log:
Fix bug now really


Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2008-07-26 15:45:07 UTC (rev 170)
+++ trunk/debian/changelog	2008-08-29 12:14:46 UTC (rev 171)
@@ -1,3 +1,9 @@
+mc (2:4.6.2~git20080311-4) unstable; urgency=low
+
+  * Corrected fix for odt2txt issue (Closes: #492019) 
+
+ -- Patrick Winnertz <winnie at debian.org>  Sat, 09 Aug 2008 11:37:03 +0200
+
 mc (2:4.6.2~git20080311-3) unstable; urgency=medium
 
   * Correct translation of Free space. Thanks to Sven Joachim. 

Modified: trunk/debian/patches/vfs/07_srpm_support.patch
===================================================================
--- trunk/debian/patches/vfs/07_srpm_support.patch	2008-07-26 15:45:07 UTC (rev 170)
+++ trunk/debian/patches/vfs/07_srpm_support.patch	2008-08-29 12:14:46 UTC (rev 171)
@@ -1,8 +1,8 @@
-diff --git a/lib/mc.ext.in b/lib/mc.ext.in
-index dfe72bb..7044ff1 100644
---- a/lib/mc.ext.in
-+++ b/lib/mc.ext.in
-@@ -197,7 +197,11 @@ regex/\.trpm$
+Index: mc-4.6.2~git20080311/lib/mc.ext.in
+===================================================================
+--- mc-4.6.2~git20080311.orig/lib/mc.ext.in	2008-08-09 11:35:24.000000000 +0200
++++ mc-4.6.2~git20080311/lib/mc.ext.in	2008-08-09 11:35:47.000000000 +0200
+@@ -206,7 +206,11 @@
  	View=%view{ascii} rpm -qivl --scripts `basename %p .trpm`
  
  # RPM packages (SuSE uses *.spm for source packages)
@@ -15,817 +15,12 @@
  	Open=%cd %p#rpm
  	View=%view{ascii} if rpm --nosignature --version >/dev/null 2>&1; then RPM="rpm --nosignature" ; else RPM="rpm" ; fi ; $RPM -qivlp --scripts %f
  
-diff --git a/lib/mc.ext.in.orig b/lib/mc.ext.in.orig
-new file mode 100644
-index 0000000..dfe72bb
---- /dev/null
-+++ b/lib/mc.ext.in.orig
-@@ -0,0 +1,571 @@
-+# Midnight Commander 3.0 extension file
-+# Warning: Structure of this file has changed completely with version 3.0
-+#
-+# All lines starting with # or empty lines are thrown away.
-+# Lines starting in the first column should have following format:
-+#
-+# keyword/descNL, i.e. everything after keyword/ until new line is desc
-+#
-+# keyword can be: 
-+#
-+#    shell (desc is, when starting with a dot, any extension (no wildcars), 
-+#          i.e. matches all the files *desc . Example: .tar matches *.tar;
-+#          if it doesn't start with a dot, it matches only a file of that name)
-+#
-+#    regex (desc is an extended regular expression)
-+#          Please note that we are using the GNU regex library and thus
-+#          \| matches the literal | and | has special meaning (or) and
-+#          () have special meaning and \( \) stand for literal ( ).
-+#
-+#    type  (file matches this if `file %f` matches regular expression desc
-+#          (the filename: part from `file %f` is removed))
-+#
-+#    directory (matches any directory matching regular expression desc)
-+#
-+#    include (matches an include directive)
-+#
-+#    default (matches any file no matter what desc is)
-+#
-+# Other lines should start with a space or tab and should be in the format:
-+#
-+# keyword=commandNL (with no spaces around =), where keyword should be: 
-+#
-+#    Open (if the user presses Enter or doubleclicks it), 
-+#
-+#    View (F3), Edit (F4)
-+#
-+#    Include is the keyword used to add any further entries from an include/
-+#    section
-+#
-+# command is any one-line shell command, with the following substitutions:
-+#
-+# %% -> % character
-+# %p -> name of the current file (without path, but pwd is its path)
-+# %f -> name of the current file. Unlike %p, if file is located on a 
-+#	non-local virtual filesystem, i.e. either tarfs, mcfs or ftpfs,
-+#	then the file will be temporarily copied into a local directory
-+#	and %f will be the full path to this local temporal file.
-+#	If you don't want to get a local copy and want to get the
-+#	virtual fs path (like /#ftp:ftp.cvut.cz/pub/hungry/xword), then
-+#	use %d/%p instead of %f.
-+# %d -> name of the current directory (pwd, without trailing slash)
-+# %s -> "selected files", i.e. space separated list of tagged files if any
-+#       or name of the current file
-+# %t -> list of tagged files
-+# %u -> list of tagged files (they'll be untaged after the command)
-+#
-+# (If these 6 letters are in uppercase, they refer to the other panel.
-+# But you shouldn't have to use it in this file.)
-+#
-+#
-+# %cd -> the rest is a path mc should change into (cd won't work, since it's
-+#	a child process).  %cd handles even vfs names.
-+#
-+# %view -> the command you type will be piped into mc's internal file viewer
-+#	if you type only the %view and no command, viewer will load %f file
-+#	instead (i.e. no piping, so it is different to %view cat %f)
-+#	%view may be directly followed by {} with a list of any of
-+#	ascii (Ascii mode), hex (Hex mode), nroff (color highlighting for
-+#	text using backspace for bold and underscore) and unform
-+#	(no highlighting for nroff sequences) separated by commas.
-+#
-+# %var -> You use it like this: %var{VAR:default}.  This macro will expand
-+#       to the value of the VAR variable in the environment if it's set
-+#       otherwise the value in default will be used.  This is similar to
-+#       the Bourne shell ${VAR-default} construct.
-+#
-+# Rules are applied from top to bottom, thus the order is important.
-+# If some actions are missing, search continues as if this target didn't
-+# match (i.e. if a file matches the first and second entry and View action
-+# is missing in the first one, then on pressing F3 the View action from
-+# the second entry will be used. default should catch all the actions.
-+#
-+# Any new entries you develop for you are always welcome if they are
-+# useful on more than one system.  You can send your modifications
-+# by e-mail to mc-devel at gnome.org
-+
-+
-+### Changes ###
-+#
-+# Reorganization: 2000-05-01 Michal Svec <rebel at penguin.cz>
-+
-+
-+### TODO ###
-+#
-+# Postscript	Open: ps2svga [gs -DEVICE=jpeg|zgv or something]
-+# Images		asciiview
-+# 
-+# All X Apps	[Nothing/Warning] if no DISPLAY
-+# Not found	[Default/Warning]
-+# Empty Output	[Default/Warning]
-+# Edit:		CopyOut+EDIT+CopyIn
-+# Security	Check gzip/bzip EDIT (mktemp)
-+# 
-+# Maybe:	Open/XOpen/GOpen/KOpen/... for Console/X/GNOME/KDE/etc.
-+
-+
-+### Archives ###
-+
-+# .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 -
-+
-+regex/\.tar\.bz$
-+	# Open=%cd %p#utar
-+	View=%view{ascii} bzip -dc %f 2>/dev/null | tar tvvf -
-+
-+regex/\.t(ar\.bz2|bz|b2)$
-+	Open=%cd %p#utar
-+	View=%view{ascii} bzip2 -dc %f 2>/dev/null | tar tvvf -
-+
-+# .tar.lzma, .tlz
-+regex/\.t(ar\.lzma|lz)$
-+	Open=%cd %p#utar
-+	View=%view{ascii} lzma -dc %f 2>/dev/null | tar tvvf -
-+
-+# .tar.F - used in QNX
-+regex/\.tar\.F$
-+	# Open=%cd %p#utar
-+	View=%view{ascii} freeze -dc %f 2>/dev/null | tar tvvf -
-+
-+# .qpr/.qpk - QNX Neutrino package installer files 
-+regex/\.(qp[rk])$
-+	Open=%cd %p#utar
-+	View=%view{ascii} gzip -dc %f 2>/dev/null | tar tvvf -
-+
-+# tar
-+regex/\.(tar|TAR)$
-+	Open=%cd %p#utar
-+	View=%view{ascii} tar tvvf %f
-+
-+# lha
-+type/^LHa\ .*archive
-+	Open=%cd %p#ulha
-+	View=%view{ascii} lha l %f
-+
-+# arj
-+regex/\.a(rj|[0-9][0-9])$
-+	Open=%cd %p#uarj
-+	View=%view{ascii} unarj l %f
-+
-+# ha
-+regex/\.([Hh][Aa])$
-+	Open=%cd %p#uha
-+	View=%view{ascii} ha lf %f
-+
-+# rar
-+regex/\.[rR]([aA][rR]|[0-9][0-9])$
-+	Open=%cd %p#urar
-+	View=%view{ascii} rar v -c- %f
-+
-+# ALZip
-+regex/\.(alz|ALZ)$
-+	Open=%cd %p#ualz
-+	View=%view{ascii} unalz -l %f
-+
-+# cpio
-+shell/.cpio.Z
-+	Open=%cd %p#ucpio
-+	View=%view{ascii} gzip -dc '%f' | cpio -itv 2>/dev/null
-+
-+shell/.cpio.gz
-+	Open=%cd %p#ucpio
-+	View=%view{ascii} gzip -dc '%f' | cpio -itv 2>/dev/null
-+
-+shell/.cpio
-+	Open=%cd %p#ucpio
-+	View=%view{ascii} cpio -itv <'%f' 2>/dev/null
-+
-+# ls-lR
-+regex/(^|\.)ls-?lR(\.g?z|Z|bz2)?$
-+	Open=%cd %p#lslR
-+
-+# patch
-+regex/\.(diff|patch)(\.(bz2|gz|Z))?$
-+        Open=%cd %p#patchfs
-+
-+# ar library
-+regex/\.s?a$
-+	Open=%cd %p#uar
-+	#Open=%view{ascii} ar tv %f
-+	View=%view{ascii} file %f && nm %f
-+
-+# trpm
-+regex/\.trpm$
-+	Open=%cd %p#trpm
-+	View=%view{ascii} rpm -qivl --scripts `basename %p .trpm`
-+
-+# RPM packages (SuSE uses *.spm for source packages)
-+regex/\.(rpm|spm)$
-+	Open=%cd %p#rpm
-+	View=%view{ascii} if rpm --nosignature --version >/dev/null 2>&1; then RPM="rpm --nosignature" ; else RPM="rpm" ; fi ; $RPM -qivlp --scripts %f
-+
-+# deb
-+regex/\.u?deb$
-+	Open=%cd %p#deb
-+	View=%view{ascii} dpkg-deb -I %f && echo && dpkg-deb -c %f
-+
-+# ISO9660
-+regex/\.iso$
-+	Open=%cd %p#iso9660
-+	View=%view{ascii} isoinfo -l -i %f
-+
-+# 7zip archives (they are not man pages)
-+shell/.7z
-+	Open=%cd %p#u7z
-+	View=%view{ascii} 7za l %f 2>/dev/null
-+
-+# Mailboxes
-+type/^ASCII\ mail\ text
-+	Open=%cd %p#mailfs
-+
-+
-+### Sources ###
-+
-+# C
-+shell/.c
-+	Open=%var{EDITOR:vi} %f
-+
-+# Fortran
-+shell/.f
-+	Open=%var{EDITOR:vi} %f
-+	
-+# Header
-+regex/\.(h|hpp)$
-+	Open=%var{EDITOR:vi} %f
-+
-+# Object
-+type/^ELF
-+	#Open=%var{PAGER:more} %f
-+	View=%view{ascii} file %f && nm %f
-+
-+# Asm
-+shell/.s
-+	Open=%var{EDITOR:vi} %f
-+
-+# C++
-+regex/\.(C|cc|cpp)$
-+	Open=%var{EDITOR:vi} %f
-+
-+
-+### Documentation ###
-+
-+# Texinfo
-+regex/\.(te?xi|texinfo)$
-+
-+# GNU Info page
-+type/^Info\ text
-+	Open=info -f %f
-+
-+shell/.info
-+	Open=info -f %f
-+
-+# Manual page
-+# Exception - .so libraries are not manual pages
-+regex/\.(so|so\.[0-9\.]*)$
-+	View=%view{ascii} file %f && nm %f
-+
-+regex/(([^0-9]|^[^\.]*)\.([1-9][A-Za-z]*|[ln])|\.man)$
-+	Open=case %d/%f in */log/*|*/logs/*) cat %f ;; *) nroff @MAN_FLAGS@ @MANDOC@ %f ;; esac | %var{PAGER:more}
-+	View=%view{ascii,nroff} case %d/%f in */log/*|*/logs/*) cat %f ;; *) nroff @MAN_FLAGS@ @MANDOC@ %f ;; esac
-+
-+# Perl pod page
-+shell/.pod
-+	Open=pod2man %f | nroff @MAN_FLAGS@ @MANDOC@ | %var{PAGER:more}
-+	View=%view{ascii,nroff} pod2man %f | nroff @MAN_FLAGS@ @MANDOC@
-+
-+# Troff with me macros.
-+# Exception - "read.me" is not a nroff file.
-+shell/read.me
-+	Open=
-+	View=
-+
-+shell/.me
-+	Open=nroff @MAN_FLAGS@ -me %f | %var{PAGER:more}
-+	View=%view{ascii,nroff} nroff @MAN_FLAGS@ -me %f
-+
-+# Troff with ms macros.
-+shell/.ms
-+	Open=nroff @MAN_FLAGS@ -ms %f | %var{PAGER:more}
-+	View=%view{ascii,nroff} nroff @MAN_FLAGS@ -ms %f
-+
-+# Manual page - compressed
-+regex/([^0-9]|^[^\.]*)\.([1-9][A-Za-z]*|[ln])\.g?[Zz]$
-+	Open=case %d/%f in */log/*|*/logs/*) gzip -dc %f ;; *) gzip -dc %f | nroff @MAN_FLAGS@ @MANDOC@ ;; esac | %var{PAGER:more}
-+	View=%view{ascii,nroff} case %d/%f in */log/*|*/logs/*) gzip -dc %f ;; *) gzip -dc %f | nroff @MAN_FLAGS@ @MANDOC@ ;; esac
-+
-+regex/([^0-9]|^[^\.]*)\.([1-9][A-Za-z]*|[ln])\.bz$
-+	Open=case %d/%f in */log/*|*/logs/*) bzip -dc %f ;; *) bzip -dc %f | nroff @MAN_FLAGS@ @MANDOC@ ;; esac | %var{PAGER:more}
-+	View=%view{ascii,nroff} case %d/%f in */log/*|*/logs/*) bzip -dc %f ;; *) bzip -dc %f | nroff @MAN_FLAGS@ @MANDOC@ ;; esac
-+
-+regex/([^0-9]|^[^\.]*)\.([1-9][A-Za-z]*|[ln])\.bz2$
-+	Open=case %d/%f in */log/*|*/logs/*) bzip2 -dc %f ;; *) bzip2 -dc %f | nroff @MAN_FLAGS@ @MANDOC@ ;; esac | %var{PAGER:more}
-+	View=%view{ascii,nroff} case %d/%f in */log/*|*/logs/*) bzip2 -dc %f ;; *) bzip2 -dc %f | nroff @MAN_FLAGS@ @MANDOC@ ;; esac
-+
-+regex/([^0-9]|^[^\.]*)\.([1-9][A-Za-z]*|[ln])\.lzma$
-+	Open=case %d/%f in */log/*|*/logs/*) lzma -dc %f ;; *) lzma -dc %f | nroff @MAN_FLAGS@ @MANDOC@ ;; esac | %var{PAGER:more}
-+	View=%view{ascii,nroff} case %d/%f in */log/*|*/logs/*) lzma -dc %f ;; *) lzma -dc %f | nroff @MAN_FLAGS@ @MANDOC@ ;; esac
-+
-+
-+### Images ###
-+
-+type/^GIF
-+	Include=image
-+
-+type/^JPEG
-+	Include=image
-+
-+type/^PC\ bitmap
-+	Include=image
-+
-+type/^PNG
-+	Include=image
-+
-+type/^TIFF
-+	Include=image
-+
-+type/^PBM
-+	Include=image
-+
-+type/^PGM
-+	Include=image
-+
-+type/^PPM
-+	Include=image
-+
-+type/^Netpbm
-+	Include=image
-+
-+shell/.xcf
-+	Open=(gimp %f &)
-+
-+shell/.xbm
-+	Open=bitmap %f
-+
-+shell/.xpm
-+	Include=image
-+	View=sxpm %f
-+
-+include/image
-+	Open=if [ "$DISPLAY" = "" ]; then zgv %f; else (gqview %f &); fi
-+	View=%view{ascii} identify %f
-+	#View=%view{ascii} asciiview %f
-+
-+
-+### 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 %f >/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
-+
-+regex/\.([wW][aA][wW]22)$
-+       Open=vplay -s 22 %f
-+
-+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'
-+
-+regex/\.([oO][gG][gG])$
-+	Open=if [ "$DISPLAY" = "" ]; then ogg123 %f; else (xmms %f >/dev/null 2>&1 &); fi
-+	View=%view{ascii} ogginfo %s
-+
-+regex/\.([mM][iI][dD][iI]?|[rR][mM][iI][dD]?)$
-+	Open=timidity %f
-+
-+regex/\.([wW][mM][aA])$
-+	Open=mplayer -vo null %f
-+	View=%view{ascii} mplayer -quiet -slave -frames 0 -vo null -ao null -identify %f 2>/dev/null | tail +13 || file %f
-+
-+
-+### Play lists ###
-+
-+regex/\.([mM]3[uU]|[pP][lL][sS])$
-+	Open=if [ -z "$DISPLAY" ]; then mplayer -vo null -playlist %f; else (xmms -p %f >/dev/null 2>&1 &); fi
-+
-+
-+### Video ###
-+
-+regex/\.([aA][vV][iI])$
-+	Include=video
-+
-+regex/\.([aA][sS][fFxX])$
-+	Include=video
-+
-+regex/\.([dD][iI][vV][xX])$
-+	Include=video
-+
-+regex/\.([mM][oO][vV]|[qQ][tT])$
-+	Include=video
-+
-+regex/\.([mM][pP]4|[mM][pP][eE]?[gG])$
-+	Include=video
-+
-+regex/\.([vV][oO][bB])$
-+	Include=video
-+
-+regex/\.([wW][mM][vV])$
-+	Include=video
-+
-+regex/\.([fF][lL][iIcCvV])$
-+	Include=video
-+
-+regex/\.([oO][gG][mM])$
-+	Include=video
-+
-+regex/\.([rR][aA]?[mM])$
-+	Open=(realplay %f >/dev/null 2>&1 &)
-+
-+include/video
-+	Open=(mplayer %f >/dev/null 2>&1 &)
-+	#Open=(gtv %f >/dev/null 2>&1 &)
-+	#Open=(xanim %f >/dev/null 2>&1 &)
-+
-+
-+### Documents ###
-+
-+# Postscript
-+type/^PostScript
-+	Open=(gv %f &)
-+	View=%view{ascii} ps2ascii %f
-+
-+# PDF
-+type/^PDF
-+	Open=(xpdf %f &)
-+	#Open=(acroread %f &)
-+	#Open=(ghostview %f &)
-+	View=%view{ascii} pdftotext %f -
-+
-+# The following code very ugly and should not be taken as example.
-+# It should be cleaned up when the new format of mc.ext is developed.
-+
-+# html
-+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
-+
-+# StarOffice 5.2
-+shell/.sdw
-+	Open=(ooffice %f &)
-+
-+# 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 &)
+@@ -493,7 +497,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
-+	Open=(abiword %f &)
-+
-+# Microsoft Word Document
-+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
-+type/^Microsoft\ Word
-+	Open=(abiword %f >/dev/null 2>&1 &)
-+	View=%view{ascii} catdoc -w %f || word2x -f text %f - || strings %f
-+
-+# RTF document
-+regex/\.([rR][tT][fF])$
-+	Open=(abiword %f >/dev/null 2>&1 &)
-+
-+# Microsoft Excel Worksheet
-+regex/\.([xX][lL][sSwW])$
-+	Open=(gnumeric %f >/dev/null 2>&1 &)
-+	View=%view{ascii} xls2csv %f || strings %f
-+type/^Microsoft\ Excel
-+	Open=(gnumeric %f >/dev/null 2>&1 &)
-+	View=%view{ascii} xls2csv %f || strings %f
-+
-+# Use OpenOffice.org to open any MS Office documents
-+type/^Microsoft\ Office\ Document
-+	Open=(ooffice %f &)
-+
-+# Framemaker
-+type/^FrameMaker
-+	Open=fmclient -f %f
-+
-+# DVI
-+regex/\.([dD][vV][iI])$
-+	Open=if [ x$DISPLAY = x ]; then dvisvga %f; else (xdvi %f &); fi
-+	View=%view{ascii} dvi2tty %f
-+
-+# TeX
-+regex/\.([Tt][Ee][Xx])$
-+	Open=%var{EDITOR:vi} %f
-+
-+
-+### Miscellaneous ###
-+
-+# Makefile
-+regex/[Mm]akefile$
-+	Open=make -f %f %{Enter parameters}
-+
-+# Imakefile
-+shell/Imakefile
-+	Open=xmkmf -a
-+
-+# Makefile.PL (MakeMaker)
-+regex/^Makefile.(PL|pl)$
-+	Open=%var{PERL:perl} %f
-+
-+# dbf
-+regex/\.([dD][bB][fF])$
-+       Open=%view{ascii} dbview %f
-+       View=%view{ascii} dbview -b %f
-+
-+# REXX script
-+regex/\.(rexx?|cmd)$
-+       Open=rexx %f %{Enter parameters};echo "Press ENTER";read y
-+
-+
-+### Plain compressed files ###
-+
-+# zip
-+type/^([Zz][Ii][Pp])\ archive
-+	Open=%cd %p#uzip
-+	View=%view{ascii} unzip -v %f
-+
-+# zoo
-+regex/\.([Zz][Oo][Oo])$
-+	Open=%cd %p#uzoo
-+	View=%view{ascii} zoo l %f
-+	
-+# gzip
-+type/^gzip
-+	Open=gzip -dc %f | %var{PAGER:more}
-+	View=%view{ascii} gzip -dc %f 2>/dev/null
-+
-+# bzip2
-+type/^bzip2
-+	Open=bzip2 -dc %f | %var{PAGER:more}
-+	View=%view{ascii} bzip2 -dc %f 2>/dev/null
-+
-+# bzip
-+type/^bzip
-+	Open=bzip -dc %f | %var{PAGER:more}
-+	View=%view{ascii} bzip -dc %f 2>/dev/null
-+
-+# compress
-+type/^compress
-+	Open=gzip -dc %f | %var{PAGER:more}
-+	View=%view{ascii} gzip -dc %f 2>/dev/null
-+
-+# lzma
-+regex/\.lzma$
-+	Open=lzma -dc %f | %var{PAGER:more}
-+	View=%view{ascii} lzma -dc %f 2>/dev/null
-+
-+
-+### Default ###
-+
-+# Default target for anything not described above
-+default/*
-+	Open=
-+	View=
-+
-+
-+### EOF ###
-diff --git a/vfs/extfs/Makefile.am b/vfs/extfs/Makefile.am
-index e7efbe4..ee12065 100644
---- a/vfs/extfs/Makefile.am
-+++ b/vfs/extfs/Makefile.am
-@@ -4,7 +4,7 @@ extfsdir = $(pkgdatadir)/extfs
- EXTFS_MISC  = README extfs.ini sfs.ini
  
- # Scripts hat don't need adaptation to the local system
--EXTFS_CONST = bpp rpm trpm u7z
-+EXTFS_CONST = bpp rpm trpm srpm u7z
- 
- # Scripts that need adaptation to the local system - source files
- EXTFS_IN    = 			\
-diff --git a/vfs/extfs/extfs.ini b/vfs/extfs/extfs.ini
-index 4dbdf61..0470656 100644
---- a/vfs/extfs/extfs.ini
-+++ b/vfs/extfs/extfs.ini
-@@ -17,6 +17,7 @@ uar
- 
- # Packages from popular Linux distributions
- rpm
-+srpm
- deb
- 
- # a: - mtools filesystem
-diff --git a/vfs/extfs/srpm b/vfs/extfs/srpm
-new file mode 100644
-index 0000000..e8affa3
---- /dev/null
-+++ b/vfs/extfs/srpm
-@@ -0,0 +1,206 @@
-+#! /bin/sh
-+#
-+# Written by Erik Troan (ewt at redhat.com) 1996
-+#            Jakub Jelinek (jj at sunsite.mff.cuni.cz) 1996,2004
-+#            Tomasz K³oczko (kloczek at rudy.mif.pg.gda.pl) 1997
-+# minor changes by Wojtek Pilorz (wpilorz at bdk.lublin.pl) 1997
-+# minor changes by Michele Marziani (marziani at fe.infn.it) 1997
-+# bug files by Marc Merlin (marcsoft at merlins.org) 1998
-+# locale bugfix by Michal Svec (rebel at penguin.cz) 2000
-+# Whitespace(s) & single quote(s) in filename workaround
-+#   by Andrew V. Samoilov <sav at bcs.zp.ua> 2004
-+# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=64007
-+#
-+# (C) 1996-2004 The Free Software Foundation.
-+#
-+
-+# override any locale for dates
-+unset LC_ALL
-+LC_TIME=C
-+export LC_TIME
-+
-+if rpmbuild --version >/dev/null 2>&1; then
-+	RPMBUILD="rpmbuild"
-+else
-+	RPMBUILD="rpm"
-+fi
-+
-+if rpm --nosignature --version >/dev/null 2>&1; then
-+  RPM="rpm --nosignature"
-+  RPMBUILD="$RPMBUILD --nosignature"
-+else
-+  RPM="rpm"
-+fi
-+RPM2CPIO="rpm2cpio"
-+SED="sed"
-+# Surround the whole filename with single quotes and handle specially
-+# \', ' and \ at the end of the string.
-+SEDCMD="s/\\(\\\\\\?\\)'/'\\1\\1\\\\''/g;s/\\\\\$/'\\\\\\\\'/;s/^/'/;s/\$/'/"
-+
-+mcrpmfs_list ()
-+{
-+    # set MCFASTRPM_DFLT to 1 for faster rpm files handling by default, to 0 for
-+    # slower handling
-+    MCFASTRPM_DFLT=0
-+    if test -z "$MCFASTRPM"; then
-+      MCFASTRPM=$MCFASTRPM_DFLT
-+    fi
-+    f="`echo "$1" | $SED "$SEDCMD"`"
-+    FILEPREF="-r--r--r--   1 root     root    "
-+    DESC=`$RPM -qip "$f" 2>/dev/null` || {
-+	echo "$FILEPREF 0 "`date +"%b %d %H:%M"`" ERROR"
-+	exit 1
-+    }
-+    DATE=`$RPM -qp --qf "%{BUILDTIME:date}\n" "$f" | cut -c 5-11,21-24`
-+    HEADERSIZE=`echo "$DESC" | wc -c`
-+    echo "-r--r--r--   1 root     root  $HEADERSIZE $DATE HEADER"
-+    echo "-r-xr-xr-x   1 root     root    39 $DATE INSTALL"
-+    echo "-r-xr-xr-x   1 root     root    39 $DATE REBUILD"
-+    echo "dr-xr-xr-x   3 root     root	   0 $DATE INFO"
-+    echo "$FILEPREF 0 $DATE INFO/NAME-VERSION-RELEASE"
-+    echo "$FILEPREF 0 $DATE INFO/GROUP"
-+    echo "$FILEPREF 0 $DATE INFO/BUILDHOST"
-+    echo "$FILEPREF 0 $DATE INFO/SOURCERPM"
-+    if test "$MCFASTRPM" = 0 ; then
-+     test "`$RPM -qp --qf \"%{DISTRIBUTION}\" \"$f\"`" = "(none)" ||
-+ 	 echo "$FILEPREF 0 $DATE INFO/DISTRIBUTION"
-+     test "`$RPM -qp --qf \"%{VENDOR}\" \"$f\"`" = "(none)" ||
-+	 echo "$FILEPREF 0 $DATE INFO/VENDOR"
-+     test "`$RPM -qp --qf \"%{DESCRIPTION}\" \"$f\"`" = "(none)" ||
-+         echo "$FILEPREF 0 $DATE INFO/DESCRIPTION"
-+     test "`$RPM -qp --qf \"%{SUMMARY}\" \"$f\"`" = "(none)" ||
-+         echo "$FILEPREF 0 $DATE INFO/SUMMARY"
-+     if test "`$RPM -qp --qf \"%{RPMTAG_PREIN}%{RPMTAG_POSTIN}%{RPMTAG_PREUN}%{RPMTAG_POSTUN}%{VERIFYSCRIPT}\" \"$f\"`" != "(none)(none)(none)(none)(none)"; then
-+	echo "dr-xr-xr-x   1 root     root     0 $DATE INFO/SCRIPTS"
-+	test "`$RPM -qp --qf \"%{RPMTAG_PREIN}\" \"$f\"`" = '(none)' ||
-+	   echo "$FILEPREF 0 $DATE INFO/SCRIPTS/PREIN"
-+	test "`$RPM -qp --qf \"%{RPMTAG_POSTIN}\" \"$f\"`" = '(none)' ||
-+	   echo "$FILEPREF 0 $DATE INFO/SCRIPTS/POSTIN"
-+	test "`$RPM -qp --qf \"%{RPMTAG_PREUN}\" \"$f\"`" = '(none)' ||
-+	   echo "$FILEPREF 0 $DATE INFO/SCRIPTS/PREUN"
-+	test "`$RPM -qp --qf \"%{RPMTAG_POSTUN}\" \"$f\"`" = '(none)' ||
-+	   echo "$FILEPREF 0 $DATE INFO/SCRIPTS/POSTUN"
-+	test "`$RPM -qp --qf \"%{VERIFYSCRIPT}\" \"$f\"`" = '(none)' ||
-+	   echo "$FILEPREF 0 $DATE INFO/SCRIPTS/VERIFYSCRIPT"
-+        echo "$FILEPREF 0 $DATE INFO/SCRIPTS/ALL"
-+     fi
-+    else
-+     echo "$FILEPREF 0 $DATE INFO/DISTRIBUTION"
-+     echo "$FILEPREF 0 $DATE INFO/VENDOR"
-+     echo "$FILEPREF 0 $DATE INFO/DESCRIPTION"
-+     echo "$FILEPREF 0 $DATE INFO/SUMMARY"
-+     echo "dr-xr-xr-x   1 root     root     0 $DATE INFO/SCRIPTS"
-+     echo "$FILEPREF 0 $DATE INFO/SCRIPTS/PREIN"
-+     echo "$FILEPREF 0 $DATE INFO/SCRIPTS/POSTIN"
-+     echo "$FILEPREF 0 $DATE INFO/SCRIPTS/PREUN"
-+     echo "$FILEPREF 0 $DATE INFO/SCRIPTS/POSTUN"
-+     echo "$FILEPREF 0 $DATE INFO/SCRIPTS/VERIFYSCRIPT"
-+     echo "$FILEPREF 0 $DATE INFO/SCRIPTS/ALL"
-+    fi
-+    if test "$MCFASTRPM" = 0 ; then
-+     test "`$RPM -qp --qf \"%{PACKAGER}\" \"$f\"`" = "(none)" ||
-+	 echo "$FILEPREF 0 $DATE INFO/PACKAGER"
-+     test "`$RPM -qp --qf \"%{URL}\" \"$f\"`" = "(none)" ||
-+	 echo "$FILEPREF 0 $DATE INFO/URL"
-+     test "`$RPM -qp --qf \"%{SERIAL}\" \"$f\"`" = "(none)" ||
-+	 echo "$FILEPREF 0 $DATE INFO/SERIAL"
-+     test "`$RPM -qp --qf \"%{COPYRIGHT}\" \"$f\"`" = "(none)" ||
-+	 echo "$FILEPREF 0 $DATE INFO/COPYRIGHT"
-+     test "`$RPM -qp --qf \"%{EPOCH}\" \"$f\"`" = "(none)" ||
-+	 echo "$FILEPREF 0 $DATE INFO/EPOCH"
-+     test "`$RPM -qp --qf \"%{LICENSE}\" \"$f\"`" = "(none)" ||
-+	 echo "$FILEPREF 0 $DATE INFO/LICENSE"
-+    else
-+	 echo "$FILEPREF 0 $DATE INFO/PACKAGER"
-+	 echo "$FILEPREF 0 $DATE INFO/URL"
-+	 echo "$FILEPREF 0 $DATE INFO/SERIAL"
-+	 echo "$FILEPREF 0 $DATE INFO/COPYRIGHT"
-+	 echo "$FILEPREF 0 $DATE INFO/EPOCH"
-+	 echo "$FILEPREF 0 $DATE INFO/LICENSE"
-+    fi
-+    echo "$FILEPREF 0 $DATE INFO/BUILDTIME"
-+    echo "$FILEPREF 0 $DATE INFO/RPMVERSION"
-+    echo "$FILEPREF 0 $DATE INFO/OS"
-+    echo "$FILEPREF 0 $DATE INFO/SIZE"
-+    if test "$MCFASTRPM" != 0 ; then
-+    $RPM -qp --qf "[%{REQUIRENAME}\n]" "$f" | grep "(none)" > /dev/null ||
-+	echo "$FILEPREF 0 $DATE INFO/REQUIRENAME"
-+    $RPM -qp --qf "[%{OBSOLETES}\n]" "$f" | grep "(none)" > /dev/null ||
-+	echo "$FILEPREF 0 $DATE INFO/OBSOLETES"
-+    $RPM -qp --qf "[%{PROVIDES}\n]" "$f" | grep "(none)" > /dev/null ||
-+	echo "$FILEPREF 0 $DATE INFO/PROVIDES"
-+    $RPM -qp --qf "[%{CONFLICTS}\n]" "$f" | grep "(none)" > /dev/null ||
-+	echo "$FILEPREF 0 $DATE INFO/CONFLICTS"
-+    test "`$RPM -qp --qf \"%{CHANGELOGTEXT}\" \"$f\"`" = "(none)" ||
-+       echo "$FILEPREF 0 $DATE INFO/CHANGELOG"
-+    else 
-+	echo "$FILEPREF 0 $DATE INFO/REQUIRENAME"
-+	echo "$FILEPREF 0 $DATE INFO/OBSOLETES"
-+	echo "$FILEPREF 0 $DATE INFO/PROVIDES"
-+	echo "$FILEPREF 0 $DATE INFO/CONFLICTS"
-+        echo "$FILEPREF 0 $DATE INFO/CHANGELOG"
-+    fi
-+
-+    echo "$FILEPREF 0 $DATE CONTENTS.cpio"
-+}
-+
-+mcrpmfs_copyout ()
-+{
-+    f="`echo "$1" | $SED "$SEDCMD"`"
-+    case "$2" in
-+	HEADER) $RPM -qip "$f" > "$3"; exit 0;;
-+	INSTALL) echo "# Run this to install this RPM package" > "$3"; exit 0;;
-+	REBUILD) echo "# Run this to rebuild this RPM package" > "$3"; exit 0;;
-+	ERROR) $RPM -qip "$f" > /dev/null 2> "$3"; exit 0;;
-+	INFO/NAME-VERSION-RELEASE)	$RPM -qp --qf "%{NAME}-%{VERSION}-%{RELEASE}\n" "$f" > "$3"; exit 0;;
-+	INFO/RELEASE)		$RPM -qp --qf "%{RELEASE}\n" "$f" > "$3"; exit 0;;
-+	INFO/GROUP)		$RPM -qp --qf "%{GROUP}\n" "$f" > "$3"; exit 0;;
-+	INFO/DISTRIBUTION) 	$RPM -qp --qf "%{DISTRIBUTION}\n" "$f" > "$3"; exit 0;;
-+	INFO/VENDOR)		$RPM -qp --qf "%{VENDOR}\n" "$f" > "$3"; exit 0;;
-+	INFO/BUILDHOST)		$RPM -qp --qf "%{BUILDHOST}\n" "$f" > "$3"; exit 0;;
-+	INFO/SOURCERPM)		$RPM -qp --qf "%{SOURCERPM}\n" "$f" > "$3"; exit 0;;
-+	INFO/DESCRIPTION)	$RPM -qp --qf "%{DESCRIPTION}\n" "$f" > "$3"; exit 0;;
-+	INFO/PACKAGER)		$RPM -qp --qf "%{PACKAGER}\n" "$f" > "$3"; exit 0;;
-+	INFO/URL)		$RPM -qp --qf "%{URL}\n" "$f" >"$3"; exit 0;;
-+	INFO/BUILDTIME)		$RPM -qp --qf "%{BUILDTIME:date}\n" "$f" >"$3"; exit 0;;
-+	INFO/SERIAL)		$RPM -qp --qf "%{SERIAL}\n" "$f" >"$3"; exit 0;;
-+	INFO/COPYRIGHT)		$RPM -qp --qf "%{COPYRIGHT}\n" "$f" >"$3"; exit 0;;
-+	INFO/EPOCH)		$RPM -qp --qf "%{EPOCH}\n" "$f" >"$3"; exit 0;;
-+	INFO/LICENSE)		$RPM -qp --qf "%{LICENSE}\n" "$f" >"$3"; exit 0;;
-+	INFO/RPMVERSION)	$RPM -qp --qf "%{RPMVERSION}\n" "$f" >"$3"; exit 0;;
-+	INFO/REQUIRENAME)	$RPM -qp --qf "[%{REQUIRENAME} %{REQUIREFLAGS:depflags} %{REQUIREVERSION}\n]" "$f" >"$3"; exit 0;;
-+	INFO/PROVIDES)		$RPM -qp --qf "[%{PROVIDES}\n]" "$f" >"$3"; exit 0;;
-+	INFO/SCRIPTS/PREIN)	$RPM -qp --qf "%{RPMTAG_PREIN}\n" "$f" >"$3"; exit 0;;
-+	INFO/SCRIPTS/POSTIN)	$RPM -qp --qf "%{RPMTAG_POSTIN}\n" "$f" >"$3"; exit 0;;
-+	INFO/SCRIPTS/PREUN)	$RPM -qp --qf "%{RPMTAG_PREUN}\n" "$f" >"$3"; exit 0;;
-+	INFO/SCRIPTS/POSTUN)	$RPM -qp --qf "%{RPMTAG_POSTUN}\n" "$f" >"$3"; exit 0;;
-+	INFO/SCRIPTS/VERIFYSCRIPT)	$RPM -qp --qf "%{VERIFYSCRIPT}\n" "$f" >"$3"; exit 0;;
-+	INFO/SCRIPTS/ALL)		$RPM -qp --scripts "$f" > "$3"; exit 0;;
-+	INFO/SUMMARY)		$RPM -qp --qf "%{SUMMARY}\n" "$f" > "$3"; exit 0;;
-+	INFO/OS)		$RPM -qp --qf "%{OS}\n" "$f" > "$3"; exit 0;;
-+	INFO/CHANGELOG)		$RPM -qp --qf "[* %{CHANGELOGTIME:date} %{CHANGELOGNAME}\n%{CHANGELOGTEXT}\n\n]\n" "$f" > "$3"; exit 0;;
-+	INFO/SIZE)		$RPM -qp --qf "%{SIZE} bytes\n" "$f" > "$3"; exit 0;;
-+	INFO/OBSOLETES)		$RPM -qp --qf "[%{OBSOLETENAME} %|OBSOLETEFLAGS?{%{OBSOLETEFLAGS:depflags} %{OBSOLETEVERSION}}:{}|\n]" "$f" > "$3"; exit 0;;
-+	INFO/CONFLICTS)		$RPM -qp --qf "[%{CONFLICTNAME} %{CONFLICTFLAGS:depflags} %{CONFLICTVERSION}\n]" "$f" >"$3"; exit 0;;
-+	CONTENTS.cpio)		$RPM2CPIO "$1" > "$3"; exit 0;;
-+	*)
-+	    ;;
-+    esac
-+}
-+
-+mcrpmfs_run ()
-+{
-+    f="`echo "$1" | $SED "$SEDCMD"`"
-+    case "$2" in
-+	INSTALL) echo "Installing \"\"$f\"\""; $RPM -ivh "$f"; exit 0;;
-+	REBUILD) echo "Rebuilding \"$1\""; $RPMBUILD --rebuild "$1"; exit 0;;
-+    esac
-+}
-+
-+umask 077
-+case "$1" in
-+  list) mcrpmfs_list "$2"; exit 0;;
-+  copyout) mcrpmfs_copyout "$2" "$3" "$4"; exit 0;;
-+  run) mcrpmfs_run "$2" "$3"; exit 1;;
-+esac
-+exit 1
+ # AbiWord
+ shell/.abw