Commit cdab2834 authored by Brian White's avatar Brian White

git-debimport mime-support_3.47-1.tar.gz

parent 05feea0f
mime-support (3.47-1) unstable; urgency=medium
* added new mime.types (closes: 550053, 545837, 540239)
* ignore interactive rules for "cat" action (closes: 533723)
* do perl tests before external ones (closes: 533722)
* remove playaudio/playdsp (closes: 545478)
-- Brian White <bcwhite@pobox.com> Thu, 18 Jun 2009 22:54:51 +0200
mime-support (3.46-1) unstable; urgency=medium
* added new mime.types
......
dh_md5sums
dh_md5sums
dh_md5sums
dh_md5sums
......@@ -43,8 +43,8 @@ binary-indep:
install -m 644 debian/changelog debian/tmp/usr/share/doc/$(package)/changelog.Debian
install -m 644 debian/README debian/tmp/usr/share/doc/$(package)/copyright
install -m 755 debian-view debian/tmp/usr/lib/mime/
install -m 755 playaudio debian/tmp/usr/lib/mime/
install -m 755 playdsp debian/tmp/usr/lib/mime/
# install -m 755 playaudio debian/tmp/usr/lib/mime/
# install -m 755 playdsp debian/tmp/usr/lib/mime/
install -m 644 mailcap.entries debian/tmp/usr/lib/mime/packages/mime-support
install -m 755 debian/postinst debian/tmp/DEBIAN/postinst
install -m 755 debian/prerm debian/tmp/DEBIAN/prerm
......
application/x-debian-package; /usr/lib/mime/debian-view %s; needsterminal; description=Debian GNU/Linux Package; nametemplate=%s.deb; priority=0
audio/basic; /usr/lib/mime/playaudio %s; description=Basic uLaw Audio; nametemplate=%s.au; priority=0
#audio/basic; /usr/lib/mime/playaudio %s; description=Basic uLaw Audio; nametemplate=%s.au; priority=0
......@@ -80,6 +80,7 @@ application/mathematica nb nbp
application/ms-tnef
application/msaccess mdb
application/msword doc dot
application/mxf mxf
application/news-message-id
application/news-transmission
application/ocsp-request
......@@ -99,7 +100,7 @@ application/pkcs7-signature
application/pkix-cert
application/pkix-crl
application/pkixcmp
application/postscript ps ai eps espi epsf eps2 eps3
application/postscript ps ai eps epsi epsf eps2 eps3
application/prs.alvestrand.titrax-sheet
application/prs.cww
application/prs.nprend
......@@ -413,6 +414,7 @@ application/x-httpd-php-source phps
application/x-httpd-php3 php3
application/x-httpd-php3-preprocessed php3p
application/x-httpd-php4 php4
application/x-httpd-php5 php5
application/x-ica ica
application/x-info info
application/x-internet-signup ins isp
......@@ -679,6 +681,7 @@ multipart/report
multipart/signed
multipart/voice-message
text/cache-manifest manifest
text/calendar ics icz
text/css css
text/csv csv
......
......@@ -12,6 +12,7 @@
$debug=0;
$norun=0;
$nopager=0;
$etcmimetyp="/etc/mime.types";
$shrmimetyp="/usr/share/etc/mime.types";
$locmimetyp="/usr/local/etc/mime.types";
......@@ -40,6 +41,7 @@ sub Usage {
print STDERR "Options:\n";
print STDERR " action specify what action to do on these files (default=view)\n";
print STDERR " debug be verbose about what's going on\n";
print STDERR " nopager ignore any \"copiousoutput\" directives and never use a \"pager\"\n";
print STDERR " norun just print but don't execute the command (useful with --debug)\n";
print STDERR "\n";
print STDERR "Mime-Type:\n";
......@@ -424,6 +426,11 @@ foreach (@files) {
}
@matches = grep(/\Q$action\E=/,@matches) unless ($action eq "view" || $action eq "cat");
if ($action eq 'cat' && $ENV{"DISPLAY"}) {
print STDERR " - clearing DISPLAY environment variable for \"cat\" action\n" if $debug;
undef $ENV{"DISPLAY"};
}
my $done=0;
my $fail=0;
foreach $match (@matches) {
......@@ -437,17 +444,11 @@ foreach (@files) {
next if (!$comm || $comm =~ m!(^|/)false$!i);
print STDERR " - program to execute: $comm\n" if $debug;
if ($match =~ m/;\s*test=(.*?)\s*($|;)/) {
my $test;
print STDERR " - running test: $1 " if $debug;
$test = system "$1 >/dev/null 2>&1";
$test >>= 8;
print STDERR " (result=$test=",($test!=0?"false":"true"),")\n" if $debug;
if ($test) {
$fail++;
next;
}
}
if ($action eq 'cat' && $match =~ m/;\s*needsterminal\s*($|;)/) {
print STDERR " - \"needsterminal\" is incompatible with \"cat\" action\n" if $debug;
$fail++;
next;
}
my($tmpfile,$tmplink);
if ($action ne 'print' && $match =~ m/;\s*needsterminal\s*($|;)/ && ! -t STDOUT) {
......@@ -458,10 +459,22 @@ foreach (@files) {
$fail++;
next;
}
} elsif ($action eq 'view' && $match =~ m/;\s*copiousoutput\s*($|;)/ && $type ne 'text/plain') {
} elsif ($action eq 'view' && !$nopager && $match =~ m/;\s*copiousoutput\s*($|;)/ && $type ne 'text/plain') {
$comm .= " | $0 --action=$action text/plain:-";
}
if ($match =~ m/;\s*test=(.*?)\s*($|;)/) {
my $test;
print STDERR " - running test: $1 " if $debug;
$test = system "$1 >/dev/null 2>&1";
$test >>= 8;
print STDERR " (result=$test=",($test!=0?"false":"true"),")\n" if $debug;
if ($test) {
$fail++;
next;
}
}
if ($file ne "-") {
if ($comm =~ m/[^%]%s/) {
if ($file =~ m![^ a-z0-9,.:/@%^+=_-]!i) {
......
......@@ -9,7 +9,7 @@ run-mailcap, view, see, edit, compose, print \- execute programs via entries in
file
.SH SYNOPSIS
.B run-mailcap
\-\-action=ACTION [\-\-debug]
\-\-action=ACTION [\-\-option[=value]]
[MIME-TYPE:[ENCODING:]]FILE [...]
The
......@@ -67,9 +67,14 @@ and
If no action is specified, the action will be determined by how the
program was called.
.TP
.BI \-\-debug=<value>
Turns on extra information to find out what is happening. Any value
other than zero (0) will turn on debugging output.
.BI \-\-debug
Turns on extra information to find out what is happening.
.TP
.BI \-\-nopager
Ignores any "copiousoutput" directive and sends output to STDOUT.
.TP
.BI \-\-norun
Displays the found command without actually executing it.
.SH "SEE ALSO"
.BR update-mime "(8)"
.SH AUTHOR
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment