move and update preference file in LyX.app bundle; do not append version suffix to...

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

diff --git a/config/ChangeLog b/config/ChangeLog
index 82bde36552c432ccb77d93c3b91817abacb9771d..51606ca5b3620fdba296cd8516e1a28a0ad1becf 100644 (file)
--- a/config/ChangeLog
+++ b/config/ChangeLog
@@ -1,3 +1,8 @@
+2006-02-13  Jean-Marc Lasgouttes  <lasgouttes@lyx.org>
+
+       * lyxinclude.m4 (LYX_USE_PACKAGING): do not set program_suffix for
+       macosx packaging.
+
 2006-02-07  Jean-Marc Lasgouttes  <lasgouttes@lyx.org>
 
        * lyxinclude.m4 (LYX_VERSION_SUFFIX): do not alter PACKAGE here.

diff --git a/config/lyxinclude.m4 b/config/lyxinclude.m4
index ca5211ea4794f56adeed6fe431eef0db53b55554..63e54ee23612f055b2244cc11770411c9551bc12 100644 (file)
--- a/config/lyxinclude.m4
+++ b/config/lyxinclude.m4
@@ -586,7 +586,6 @@ AC_MSG_RESULT($lyx_use_packaging)
 case $lyx_use_packaging in
    macosx) AC_DEFINE(USE_MACOSX_PACKAGING, 1, [Define to 1 if LyX should use a MacOS X application bundle file layout])
           PACKAGE=LyX${version_suffix}
-          program_suffix=$version_suffix
           default_prefix="/Applications/${PACKAGE}.app"
           bindir='${prefix}/Contents/MacOS'
           libdir='${prefix}/Contents/Resources'

diff --git a/development/ChangeLog b/development/ChangeLog
index 94edcd8be8220cb41cb0bcaf7a66ad658d295d91..5e8846c1fbbccf5fd2ab9fec6bdade60447fe134 100644 (file)
--- a/development/ChangeLog
+++ b/development/ChangeLog
@@ -1,15 +1,20 @@
+2006-02-13  Jean-Marc Lasgouttes  <lasgouttes@lyx.org>
+
+       * MacOSX/LyX.app/Contents/Resources/preferences: move here. the
+       LyX subdirectory has not been updated; update the prefs for 1.4.0.
+
 2006-02-02  Georg Baum  <Georg.Baum@post.rwth-aachen.de>
 
        * FORMAT: document branches
 
 2006-02-01  Bennett Helm  <bennett.helm@fandm.edu>
 
-       * MacOSX/LyX.app/Contents/Resources/preferences: update again.
+       * MacOSX/LyX.app/Contents/Resources/LyX/preferences: update again.
        Something went wrong.
 
 2006-1-12  Bennett Helm  <bennett.helm@fandm.edu>
 
-       * MacOSX/LyX.app/Contents/Resources/preferences: update formats
+       * MacOSX/LyX.app/Contents/Resources/LyX/preferences: update formats
        section to conform to lyx-1.4 conventions
 
 2005-10-13  Jürgen Spitzmüller  <j.spitzmueller@gmx.de>

diff --git a/development/MacOSX/LyX.app/Contents/Resources/LyX/preferences b/development/MacOSX/LyX.app/Contents/Resources/LyX/preferences
deleted file mode 100644 (file)
index 6b417da..0000000
--- a/development/MacOSX/LyX.app/Contents/Resources/LyX/preferences
+++ /dev/null
@@ -1,96 +0,0 @@
-### This file is part of
-### ========================================================
-###          LyX, The Document Processor
-###
-###          Copyright 1995 Matthias Ettrich
-###          Copyright 1995-2001 The LyX Team.
-###
-### ========================================================
-
-# This file is written by LyX, if you want to make your own
-# modifications you should do them from inside LyX and save
-
-\bind_file mac
-
-#
-# 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"
-\serverpipe "~/Library/Application Support/LyX/.lyxpipe"
-\preview on
-
-#
-# SCREEN & FONTS SECTION ############################
-#
-
-\screen_font_roman "Times"
-\screen_font_sans "Helvetica"
-\screen_font_typewriter "Courier"
-
-#
-# COLOR SECTION ###################################
-#
-
-
-#
-# PRINTER SECTION ###################################
-#
-
-
-#
-# EXPORT SECTION ####################################
-#
-
-
-#
-# TEX SECTION #######################################
-#
-
-
-#
-# FILE SECTION ######################################
-#
-
-
-#
-# ASCII EXPORT SECTION ##############################
-#
-
-
-#
-# SPELLCHECKER SECTION ##############################
-#
-
-\spell_command "aspell"
-
-#
-# LANGUAGE SUPPORT SECTION ##########################
-#
-
-
-#
-# 2nd MISC SUPPORT SECTION ##########################
-#
-
-
-#
-# FORMATS SECTION ##########################
-#
-
-\format "dvi" "dvi" "DVI" "D" "open" ""
-\format "html" "html" "HTML" "H" "open" ""
-\format "latex" "tex" "LaTeX" "L" "open" ""
-\format "pdf" "pdf" "PDF (ps2pdf)" "P" "open" ""
-\format "ps" "ps" "Postscript" "t" "open" ""
-\format "sxw" "sxw" "OpenOffice.Org Writer" "O" "open" ""
-\format "text" "txt" "ASCII" "A" "open" ""
-\format "textparagraph" "txt" "ASCII (paragraphs)" "" "open" ""
-\format "word" "doc" "Word" "W" "open" ""
-\format "rtf" "rtf" "RTF" "" "open" ""
-
-
-#
-# CONVERTERS SECTION ##########################
-#
-

diff --git a/development/MacOSX/LyX.app/Contents/Resources/preferences b/development/MacOSX/LyX.app/Contents/Resources/preferences
new file mode 100644 (file)
index 0000000..d3de003
--- /dev/null
+++ b/development/MacOSX/LyX.app/Contents/Resources/preferences
@@ -0,0 +1,102 @@
+### This file is part of
+### ========================================================
+###          LyX, The Document Processor
+###
+###          Copyright 1995 Matthias Ettrich
+###          Copyright 1995-2001 The LyX Team.
+###
+### ========================================================
+
+# This file is written by LyX, if you want to make your own
+# modifications you should do them from inside LyX and save
+
+\bind_file "mac"
+
+#
+# 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"
+\serverpipe "~/Library/Application Support/LyX-1.4/.lyxpipe"
+\preview on
+
+#
+# SCREEN & FONTS SECTION ############################
+#
+
+\screen_font_roman "Times"
+\screen_font_sans "Helvetica"
+\screen_font_typewriter "Courier"
+
+#
+# COLOR SECTION ###################################
+#
+
+
+#
+# PRINTER SECTION ###################################
+#
+
+
+#
+# EXPORT SECTION ####################################
+#
+
+
+#
+# TEX SECTION #######################################
+#
+
+
+#
+# FILE SECTION ######################################
+#
+
+\template_path "~/Library/Application Support/LyX-1.4/templates"
+
+#
+# ASCII EXPORT SECTION ##############################
+#
+
+
+#
+# SPELLCHECKER SECTION ##############################
+#
+
+\spell_command "aspell"
+
+#
+# LANGUAGE SUPPORT SECTION ##########################
+#
+
+
+#
+# 2nd MISC SUPPORT SECTION ##########################
+#
+
+
+#
+# FORMATS SECTION ##########################
+#
+
+\format "dvi" "dvi" "DVI" "D" "open" ""
+\format "html" "html" "HTML" "H" "open" ""
+\format "latex" "tex" "LaTeX" "L" "open" ""
+\format "pdf" "pdf" "PDF (ps2pdf)" "P" "open" ""
+\format "ps" "ps" "Postscript" "t" "open" ""
+\format "sxw" "sxw" "OpenOffice.Org Writer" "O" "open" ""
+\format "text" "txt" "ASCII" "A" "open" ""
+\format "textparagraph" "txt" "ASCII (paragraphs)" "" "open" ""
+\format "word" "doc" "Word" "W" "open" ""
+\format "rtf" "rtf" "RTF" "" "open" ""
+
+#
+# CONVERTERS SECTION ##########################
+#
+
+\converter "latex" "lyx" "$$s/../MacOS/tex2lyx -f $$i $$o" ""
+
+#
+# COPIERS SECTION ##########################
+#
+