[Pkg-mc-commits] r353 - branch/mailcap/debian/patches/debian
Denis Briand
narcan-guest at alioth.debian.org
Mon Jan 18 15:14:27 UTC 2010
Author: narcan-guest
Date: 2010-01-18 15:14:26 +0000 (Mon, 18 Jan 2010)
New Revision: 353
Modified:
branch/mailcap/debian/patches/debian/11_use_mailcap_for_mc.ext.patch
Log:
fix a big mistake in the mailcap patch (vfs)
Modified: branch/mailcap/debian/patches/debian/11_use_mailcap_for_mc.ext.patch
===================================================================
--- branch/mailcap/debian/patches/debian/11_use_mailcap_for_mc.ext.patch 2010-01-18 11:43:30 UTC (rev 352)
+++ branch/mailcap/debian/patches/debian/11_use_mailcap_for_mc.ext.patch 2010-01-18 15:14:26 UTC (rev 353)
@@ -1,191 +1,9 @@
-Description: Use mailcap
-Author: Denis Briand <denis at narcan.fr>
-Index: mc-4.7.0/misc/mc.ext.in
+Index: mc-4.7.0.1/misc/mc.ext.in
===================================================================
---- mc-4.7.0.orig/misc/mc.ext.in 2009-12-26 12:18:26.000000000 +0100
-+++ mc-4.7.0/misc/mc.ext.in 2009-12-26 12:43:25.000000000 +0100
-@@ -108,244 +108,246 @@
+--- mc-4.7.0.1.orig/misc/mc.ext.in 2010-01-18 15:51:10.000000000 +0100
++++ mc-4.7.0.1/misc/mc.ext.in 2010-01-18 16:09:07.000000000 +0100
+@@ -257,15 +257,15 @@
- # .tgz, .tpz, .tar.gz, .tar.z, .tar.Z, .ipk
- regex/\.t([gp]?z|ar\.g?[zZ])$|\.ipk|\.gem$
-- Open=%cd %p#utar
-+ Open=run-mailcap %f > /dev/null 2>&1
- View=%view{ascii} gzip -dc %f 2>/dev/null | tar tvvf -
-
- regex/\.tar\.bz$
-- # Open=%cd %p#utar
-+ Open=run-mailcap %f > /dev/null 2>&1
- View=%view{ascii} bzip -dc %f 2>/dev/null | tar tvvf -
-
- regex/\.t(ar\.bz2|bz2?|b2)$
-- Open=%cd %p#utar
-+ Open=run-mailcap %f > /dev/null 2>&1
- View=%view{ascii} bzip2 -dc %f 2>/dev/null | tar tvvf -
-
- # .tar.lzma, .tlz
- regex/\.t(ar\.lzma|lz)$
-- Open=%cd %p#utar
-+ Open=run-mailcap %f > /dev/null 2>&1
- View=%view{ascii} lzma -dc %f 2>/dev/null | tar tvvf -
-
- # .tar.xz, .txz
- regex/\.t(ar\.xz|xz)$
-- Open=%cd %p#utar
-+ Open=run-mailcap %f > /dev/null 2>&1
- View=%view{ascii} xz -dc %f 2>/dev/null | tar tvvf -
-
- # .tar.F - used in QNX
- regex/\.tar\.F$
-- # Open=%cd %p#utar
-+ Open=run-mailcap %f > /dev/null 2>&1
- 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
-+ Open=run-mailcap %f > /dev/null 2>&1
- View=%view{ascii} gzip -dc %f 2>/dev/null | tar tvvf -
-
- # tar
- regex/\.(tar|TAR)$
-- Open=%cd %p#utar
-+ Open=run-mailcap %f > /dev/null 2>&1
- View=%view{ascii} tar tvvf - < %f
-
- # lha
- type/^LHa\ .*archive
-- Open=%cd %p#ulha
-+ Open=run-mailcap %f > /dev/null 2>&1
- View=%view{ascii} lha l %f
-
- # arj
- regex/\.a(rj|[0-9][0-9])$
-- Open=%cd %p#uarj
-+ Open=run-mailcap %f > /dev/null 2>&1
- View=%view{ascii} unarj l %f
-
- # cab
- regex/\.([cC][aA][bB])$
-- Open=%cd %p#ucab
-+ Open=run-mailcap %f > /dev/null 2>&1
- View=%view{ascii} cabextract -l %f
-
- # ha
- regex/\.([Hh][Aa])$
-- Open=%cd %p#uha
-+ Open=run-mailcap %f > /dev/null 2>&1
- View=%view{ascii} ha lf %f
-
- # rar
- regex/\.[rR]([aA][rR]|[0-9][0-9])$
-- Open=%cd %p#urar
-+ Open=run-mailcap %f > /dev/null 2>&1
- View=%view{ascii} rar v -c- %f
-
- # ALZip
- regex/\.(alz|ALZ)$
-- Open=%cd %p#ualz
-+ Open=run-mailcap %f > /dev/null 2>&1
- View=%view{ascii} unalz -l %f
-
- # cpio
- shell/.cpio.Z
-- Open=%cd %p#ucpio
-+ Open=run-mailcap %f > /dev/null 2>&1
- View=%view{ascii} gzip -dc %f | cpio -itv 2>/dev/null
-
- shell/.cpio.gz
-- Open=%cd %p#ucpio
-+ Open=run-mailcap %f > /dev/null 2>&1
- View=%view{ascii} gzip -dc %f | cpio -itv 2>/dev/null
-
- shell/.cpio
-- Open=%cd %p#ucpio
-+ Open=run-mailcap %f > /dev/null 2>&1
- View=%view{ascii} cpio -itv < %f 2>/dev/null
-
- # ls-lR
- regex/(^|\.)ls-?lR(\.gz|Z|bz2)$
-- Open=%cd %p#lslR
-+ Open=run-mailcap %f > /dev/null 2>&1
-
- # patch
- regex/\.(diff|patch)(\.bz2)$
-- Open=%cd %p#patchfs
-+ Open=run-mailcap %f > /dev/null 2>&1
- View=%view{ascii} bzip2 -dc %f 2>/dev/null
-
- regex/\.(diff|patch)(\.(gz|Z))$
-- Open=%cd %p#patchfs
-+ Open=run-mailcap %f > /dev/null 2>&1
- View=%view{ascii} gzip -dc %f 2>/dev/null
-
- regex/\.(diff|patch)$
-- Open=%cd %p#patchfs
-+ Open=run-mailcap %f > /dev/null 2>&1
- View=%view{ascii} /bin/cat %f 2>/dev/null
-
- # ar library
- regex/\.s?a$
-- Open=%cd %p#uar
-+ Open=run-mailcap %f > /dev/null 2>&1
- #Open=%view{ascii} ar tv %f
- View=%view{ascii} file %f && nm %f
-
- # trpm
- regex/\.trpm$
-- Open=%cd %p#trpm
-+ Open=run-mailcap %f > /dev/null 2>&1
- View=%view{ascii} rpm -qivl --scripts `basename %p .trpm`
-
- # RPM packages (SuSE uses *.spm for source packages)
- regex/\.(src\.rpm|spm)$
-- Open=%cd %p#rpm
-+ Open=run-mailcap %f > /dev/null 2>&1
- View=%view{ascii} if rpm --nosignature --version >/dev/null 2>&1; then RPM="rpm --nosignature" ; else RPM="rpm" ; fi ; $RPM -qivlp --scripts %f
-
- regex/\.rpm$
-- Open=%cd %p#rpm
-+ Open=run-mailcap %f > /dev/null 2>&1
- 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
-+ Open=run-mailcap %f > /dev/null 2>&1
- View=%view{ascii} dpkg-deb -I %f && echo && dpkg-deb -c %f
-
- # dpkg
- shell/.debd
-- Open=%cd %p#debd
-+ Open=run-mailcap %f > /dev/null 2>&1
- View=%view{ascii} dpkg -s `echo %p | sed 's/\([0-9a-z.-]*\).*/\1/'`
- # apt
- shell/.deba
-- Open=%cd %p#deba
-+ Open=run-mailcap %f > /dev/null 2>&1
- View=%view{ascii} apt-cache show `echo %p | sed 's/\([0-9a-z.-]*\).*/\1/'`
-
- # ISO9660
- regex/\.iso$
-- Open=%cd %p#iso9660
-+ Open=run-mailcap %f > /dev/null 2>&1
- View=%view{ascii} isoinfo -l -i %f
-
- # 7zip archives (they are not man pages)
- regex/\.(7z|7Z)$
-- Open=%cd %p#u7z
-+ Open=run-mailcap %f > /dev/null 2>&1
- View=%view{ascii} 7za l %f 2>/dev/null
-
- # Mailboxes
- type/^ASCII\ mail\ text
-- Open=%cd %p#mailfs
-+ Open=run-mailcap %f > /dev/null 2>&1
-
-
- ### Sources ###
-
# C
shell/.c
- Open=%var{EDITOR:vi} %f
@@ -203,9 +21,7 @@
# Object
type/^ELF
-- #Open=%var{PAGER:more} %f
-+ Open=run-mailcap %f > /dev/null 2>&1
- View=%view{ascii} file %f && nm %f
+@@ -274,24 +274,25 @@
# Asm
shell/.s
@@ -235,8 +51,7 @@
# Manual page
# Exception - .so libraries are not manual pages
- regex/\.(so|so\.[0-9\.]*)$
-+ Open=run-mailcap %f > /dev/null 2>&1
+@@ -299,27 +300,27 @@
View=%view{ascii} file %f && nm %f
regex/(([^0-9]|^[^\.]*)\.([1-9][A-Za-z]*|[ln])|\.man)$
@@ -269,31 +84,8 @@
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}
-+ Open=run-mailcap %f > /dev/null 2>&1
- View=%view{ascii,nroff} case %d/%f in */log/*|*/logs/*) gzip -dc %f ;; *) gzip -dc %f | nroff @MAN_FLAGS@ @MANDOC@ ;; esac
+@@ -345,7 +346,7 @@
- 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}
-+ Open=run-mailcap %f > /dev/null 2>&1
- 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}
-+ Open=run-mailcap %f > /dev/null 2>&1
- 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}
-+ Open=run-mailcap %f > /dev/null 2>&1
- View=%view{ascii,nroff} case %d/%f in */log/*|*/logs/*) lzma -dc %f ;; *) lzma -dc %f | nroff @MAN_FLAGS@ @MANDOC@ ;; esac
-
- regex/([^0-9]|^[^\.]*)\.([1-9][A-Za-z]*|[ln])\.xz$
-- Open=case %d/%f in */log/*|*/logs/*) xz -dc %f ;; *) xz -dc %f | nroff @MAN_FLAGS@ @MANDOC@ ;; esac | %var{PAGER:more}
-+ Open=run-mailcap %f > /dev/null 2>&1
- View=%view{ascii,nroff} case %d/%f in */log/*|*/logs/*) xz -dc %f ;; *) xz -dc %f | nroff @MAN_FLAGS@ @MANDOC@ ;; esac
-
# CHM
regex/\.(chm|CHM)$
- Open=which kchmviewer > /dev/null 2>&1 && (kchmviewer %f &) || (xchm %f &)
@@ -301,7 +93,7 @@
### Images ###
-@@ -378,10 +380,10 @@
+@@ -378,10 +379,10 @@
Include=image
shell/.xcf
@@ -314,7 +106,7 @@
shell/.xpm
Include=image
-@@ -391,7 +393,7 @@
+@@ -391,7 +392,7 @@
Include=image
include/image
@@ -323,21 +115,21 @@
View=%view{ascii} identify %f
#View=%view{ascii} asciiview %f
-@@ -399,38 +401,38 @@
+@@ -399,38 +400,38 @@
### 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
-+ Open=run-mailcap %f > /dev/null 2>&1
++ Open=run-mailcap %f > /dev/null 2>&1
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 %f > /dev/null 2>&1
++ Open=run-mailcap %f > /dev/null 2>&1
#Open=tracker %f
regex/\.([wW][aA][wW]22)$
- Open=vplay -s 22 %f
-+ Open=run-mailcap %f > /dev/null 2>&1
++ Open=run-mailcap %f > /dev/null 2>&1
regex/\.([mM][pP]3)$
- Open=if [ "$DISPLAY" = "" ]; then mpg123 %f; else (xmms %f >/dev/null 2>&1 &); fi
@@ -371,7 +163,7 @@
### Video ###
-@@ -466,10 +468,10 @@
+@@ -466,10 +467,10 @@
Include=video
regex/\.([rR][aA]?[mM])$
@@ -384,7 +176,7 @@
#Open=(gtv %f >/dev/null 2>&1 &)
#Open=(xanim %f >/dev/null 2>&1 &)
-@@ -478,12 +480,12 @@
+@@ -478,12 +479,12 @@
# Postscript
type/^PostScript
@@ -399,7 +191,7 @@
#Open=(acroread %f &)
#Open=(ghostview %f &)
View=%view{ascii} pdftotext %f -
-@@ -493,49 +495,49 @@
+@@ -493,85 +494,85 @@
# html
regex/\.([hH][tT][mM][lL]?)$
@@ -460,7 +252,9 @@
# DVI
regex/\.([dD][vV][iI])$
-@@ -544,108 +546,111 @@
+- Open=run-mailcap %f 2>&1 &
++ Open=run-mailcap %f > /dev/null 2>&1
+ View=%view{ascii} catdvi %f
# TeX
regex/\.([Tt][Ee][Xx])$
@@ -492,20 +286,17 @@
# dbf
regex/\.([dD][bB][fF])$
- Open=%view{ascii} dbview %f
-+ Open=run-mailcap %f > /dev/null 2>&1
++ Open=run-mailcap %f > /dev/null 2>&1
View=%view{ascii} dbview -b %f
# REXX script
regex/\.(rexx?|cmd)$
- Open=rexx %f %{Enter parameters};echo "Press ENTER";read y
-+ Open=run-mailcap %f > /dev/null 2>&1
++ Open=run-mailcap %f > /dev/null 2>&1
# Disk images for Commodore computers (VIC20, C64, C128)
regex/\.(d64|D64)$
-- Open=%cd %p#uc1541
-+ Open=run-mailcap %f > /dev/null 2>&1
- View=%view{ascii} c1541 %f -list
- Extract=c1541 %f -extract
+@@ -581,7 +582,7 @@
# Glade, a user interface designer for GTK+ and GNOME
regex/\.([Gg][Ll][Aa][Dd][Ee])$
@@ -514,38 +305,8 @@
# Gettext Catalogs
shell/.mo
-+ Open=run-mailcap %f > /dev/null 2>&1
- View=%view{ascii} msgunfmt %f || cat %f
+@@ -614,7 +615,7 @@
- ### Plain compressed files ###
-
- # ace
- regex/\.(ace|ACE)$
-- Open=%cd %p#uace
-+ Open=run-mailcap %f > /dev/null 2>&1
- View=%view{ascii} unace l %f
- Extract=unace x %f
-
- # arc
- regex/\.(arc|ARC)$
-- Open=%cd %p#uarc
-+ Open=run-mailcap %f > /dev/null 2>&1
- View=%view{ascii} arc l %f
- Extract=arc x %f '*'
- Extract (with flags)=I=%{Enter any Arc flags:}; if test -n "$I"; then arc x $I %f; fi
-
- # zip
- type/^([Zz][Ii][Pp])\ archive
-- Open=%cd %p#uzip
-+ Open=run-mailcap %f > /dev/null 2>&1
- View=%view{ascii} unzip -v %f
-
- # zoo
- regex/\.([Zz][Oo][Oo])$
-- Open=%cd %p#uzoo
-+ Open=run-mailcap %f > /dev/null 2>&1
- View=%view{ascii} zoo l %f
-
# gzip
type/^gzip
- Open=gzip -dc %f | %var{PAGER:more}
@@ -553,8 +314,7 @@
View=%view{ascii} gzip -dc %f 2>/dev/null
regex/\.(gz|Z)?$
-+ Open=run-mailcap %f > /dev/null 2>&1
- View=%view{ascii} gzip -dc %f 2>/dev/null
+@@ -622,7 +623,7 @@
# bzip2
type/^bzip2
@@ -563,8 +323,7 @@
View=%view{ascii} bzip2 -dc %f 2>/dev/null
regex/\.bz2?$
-+ Open=run-mailcap %f > /dev/null 2>&1
- View=%view{ascii} bzip2 -dc %f 2>/dev/null
+@@ -630,22 +631,22 @@
# bzip
type/^bzip
@@ -591,7 +350,7 @@
View=%view{ascii} xz -dc %f 2>/dev/null
-@@ -653,7 +658,7 @@
+@@ -653,7 +654,7 @@
# Default target for anything not described above
default/*
More information about the Pkg-mc-commits
mailing list