From e5163e8480cca4fcad35986f9999d921ce1ee568 Mon Sep 17 00:00:00 2001 From: Peter Breitenlohner Date: Sat, 17 Mar 2012 10:08:59 +0000 Subject: xdvik: Use /usr/local/etc/mime.types (not mimetypes) git-svn-id: svn://tug.org/texlive/trunk@25675 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/xdvik/ChangeLog.TL | 4 ++++ Build/source/texk/xdvik/mime.c | 2 +- Build/source/texk/xdvik/xdvi.1.in | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Build/source/texk/xdvik/ChangeLog.TL b/Build/source/texk/xdvik/ChangeLog.TL index 5c6f04aea6c..a8f9257122e 100644 --- a/Build/source/texk/xdvik/ChangeLog.TL +++ b/Build/source/texk/xdvik/ChangeLog.TL @@ -1,6 +1,10 @@ ChangeLog.TL: Changes for xdvik (TeX Live) ================================================== +2012-03-17 Peter Breitenlohner + + * mime.c, xdvi.1.in: Use /usr/local/etc/{mimetypes=>mime.types}. + 2012-03-15 Peter Breitenlohner * xdvi.1.in: Remove an unmatched #endif and formatting bugs. diff --git a/Build/source/texk/xdvik/mime.c b/Build/source/texk/xdvik/mime.c index fe16fa424d6..278a5fe10ad 100644 --- a/Build/source/texk/xdvik/mime.c +++ b/Build/source/texk/xdvik/mime.c @@ -54,7 +54,7 @@ /* default settings if $EXTENSIONMAPS and $MAILCAPS is not set */ static const char *const DEFAULT_EXTENSIONMAPS = -"$HOME/.mime.types:/etc/mime.types:/usr/etc/mime.types:/usr/local/etc/mimetypes"; +"$HOME/.mime.types:/etc/mime.types:/usr/etc/mime.types:/usr/local/etc/mime.types"; static const char *const DEFAULT_MAILCAPS = "$HOME/.mailcap:/etc/mailcap:/usr/etc/mailcap:/usr/local/etc/mailcap"; diff --git a/Build/source/texk/xdvik/xdvi.1.in b/Build/source/texk/xdvik/xdvi.1.in index 94b98a6889a..536ca9c4dc4 100644 --- a/Build/source/texk/xdvik/xdvi.1.in +++ b/Build/source/texk/xdvik/xdvi.1.in @@ -3971,7 +3971,7 @@ If this variable is not set, the following default path is used: .ft 3 .sp 1n $HOME/.mime.types:/etc/mime.types:\e - /usr/etc/mime.types:/usr/local/etc/mimetypes + /usr/etc/mime.types:/usr/local/etc/mime.types .sp 1n .ft .fi -- cgit v1.2.3