From: Jean-Marc Lasgouttes <lasgouttes@lyx.org>
Date: Tue, 8 Aug 2006 10:03:09 +0000 (+0000)
Subject: 2006-08-08  Bennett Helm <bennett.helm@fandm.edu>
X-Git-Tag: 1.6.10~12880
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=88a45ab222f80f964a42707573dd7c14d2a01f46;p=features.git

2006-08-08  Bennett Helm <bennett.helm@fandm.edu>

	* MacOSX/LyX.app/Contents/Resources/lyxrc.dist: improve viewers
	that require X11; tweak the path_prefix search order.

	* MacOSX/LyX.app/Contents/Info.plist: update version.



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14562 a592a061-630c-0410-9148-cb99ea01b6c8
---

diff --git a/development/MacOSX/LyX.app/Contents/Info.plist b/development/MacOSX/LyX.app/Contents/Info.plist
index 150c593e2b..55b5332d8d 100644
--- a/development/MacOSX/LyX.app/Contents/Info.plist
+++ b/development/MacOSX/LyX.app/Contents/Info.plist
@@ -24,7 +24,7 @@
 		</dict>
 	</array>
 	<key>CFBundleGetInfoString</key>
-	<string>LyX/Mac-1.4.0</string>
+	<string>LyX/Mac-1.5.0</string>
 	<key>CFBundleIconFile</key>
 	<string>LyXapp.icns</string>
 	<key>CFBundleIdentifier</key>
@@ -34,7 +34,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.4.0</string>
+	<string>1.5.0</string>
 	<key>CFBundleSignature</key>
 	<string>OLYX</string>
 </dict>
diff --git a/development/MacOSX/LyX.app/Contents/Resources/lyxrc.dist b/development/MacOSX/LyX.app/Contents/Resources/lyxrc.dist
index 0ed47829c3..7527187aad 100644
--- a/development/MacOSX/LyX.app/Contents/Resources/lyxrc.dist
+++ b/development/MacOSX/LyX.app/Contents/Resources/lyxrc.dist
@@ -16,7 +16,7 @@
 # MISC SECTION ######################################
 #
 
-\path_prefix "/usr/bin:/usr/local/bin:/usr/local/teTeX/bin/powerpc-apple-darwin-current:/usr/X11R6/bin:/sw/bin:/opt/local/teTeX/bin:/opt/local/bin"
+\path_prefix "/usr/local/teTeX/bin/powerpc-apple-darwin-current:/usr/local/teTeX/bin/i386-apple-darwin-current:/sw/bin:/sw/sbin:/opt/local/teTeX/bin:/opt/local/bin:/usr/local/bin:/usr/bin:/usr/X11R6/bin:/usr/sbin:/sbin"
 \serverpipe "~/Library/Application Support/LyX-1.4/.lyxpipe"
 \preview on
 
@@ -79,8 +79,8 @@
 # FORMATS SECTION ##########################
 #
 
-\format "fig" "fig" "FIG" "" "open /Applications/Utilities/X11.app && export DISPLAY=:0.0 && xfig" "open /Applications/Utilities/X11.app && export DISPLAY=:0.0 && xfig"
-\format "rtf" "rtf" "Rich Text Format" "" "auto" "auto"
+\format "fig" "fig" "FIG" "" "open-x11 && export DISPLAY=:0.0 && xfig" "open-x11 && export DISPLAY=:0.0 && xfig"
+\format "rtf" "rtf" "Rich Text Format" "" "open" "open"
 
 #
 # CONVERTERS SECTION ##########################