installer updates

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

diff --git a/development/Win32/packaging/installer/LyXWinInstaller/InstallerStructure.odg b/development/Win32/packaging/installer/LyXWinInstaller/InstallerStructure.odg
index 46afc8e050441853976b7672375f4839fce89969..8965a1fd7145a2941e071c98ef345f5af60e8684 100644 (file)
Binary files a/development/Win32/packaging/installer/LyXWinInstaller/InstallerStructure.odg and b/development/Win32/packaging/installer/LyXWinInstaller/InstallerStructure.odg differ

diff --git a/development/Win32/packaging/installer/LyXWinInstaller/InstallerStructure.pdf b/development/Win32/packaging/installer/LyXWinInstaller/InstallerStructure.pdf
index 1bc60af6520c42e53a736110fd94292d880eca71..0b5e4466e41979a8410500a09f0fa13d94bc8f48 100644 (file)
Binary files a/development/Win32/packaging/installer/LyXWinInstaller/InstallerStructure.pdf and b/development/Win32/packaging/installer/LyXWinInstaller/InstallerStructure.pdf differ

diff --git a/development/Win32/packaging/installer/LyXWinInstaller/LyXInstaller-update.nsi b/development/Win32/packaging/installer/LyXWinInstaller/LyXInstaller-update.nsi
index a028e8a715d9f96bc87915a526ef512464afcba2..66274c193b93d46f84ba1e0903a48a8823052e36 100644 (file)
--- a/development/Win32/packaging/installer/LyXWinInstaller/LyXInstaller-update.nsi
+++ b/development/Win32/packaging/installer/LyXWinInstaller/LyXInstaller-update.nsi
@@ -32,7 +32,7 @@ SetCompressor lzma
 !include "Settings.nsh"
 
 !define PRODUCT_UNINST_KEY_OLD "Software\Microsoft\Windows\CurrentVersion\Uninstall\LyX150svn"
-!define PRODUCT_VERSION_OLD "LyX 1.5svn-15-04-2007"
+!define PRODUCT_VERSION_OLD "LyX 1.5beta2-21-04-2007"
 !define PRODUCT_UNINSTALL_EXE_OLD "$INSTDIR\LyXWinUninstall.exe"
 
 ;--------------------------------

diff --git a/development/Win32/packaging/installer/LyXWinInstaller/ReadmePackage1.5.txt b/development/Win32/packaging/installer/LyXWinInstaller/ReadmePackage1.5.txt
index 7ce91c8b28f116b289ab8df72cabfd3d8eae8f0a..74670923f864781ccbd9175348847b8a10e05369 100644 (file)
--- a/development/Win32/packaging/installer/LyXWinInstaller/ReadmePackage1.5.txt
+++ b/development/Win32/packaging/installer/LyXWinInstaller/ReadmePackage1.5.txt
@@ -9,7 +9,9 @@ http://developer.berlios.de/projects/lyxwininstall/
 ---
 General
 To compile the installer scripts you need at least NSIS version 2.25.
-The installer scripts need the plugins "FindProc" and "InetLoad". To use it copy the files "FindProcDLL.dll" and "InetLoad.dll" from the "LyXPackage" folder to NSIS'"Plugins" directory.
+The installer scripts needs the plugins "FindProc" and "InetLoad".
+To use them copy the files "FindProcDLL.dll" and "InetLoad.dll" from the
+"LyXPackage" folder to NSIS'"Plugins" directory.
 
 ---
 Internationalization

diff --git a/development/Win32/packaging/installer/LyXWinInstaller/ReadmeScripts1.5.txt b/development/Win32/packaging/installer/LyXWinInstaller/ReadmeScripts1.5.txt
index 07985ffec980c9944640c68a0f93fd7a42e21625..f7227368394ef05ffbeb78fc90936d44c586fcfa 100644 (file)
--- a/development/Win32/packaging/installer/LyXWinInstaller/ReadmeScripts1.5.txt
+++ b/development/Win32/packaging/installer/LyXWinInstaller/ReadmeScripts1.5.txt
@@ -9,7 +9,9 @@ http://developer.berlios.de/projects/lyxwininstall/
 ---
 General
 To compile the installer scripts you need at least NSIS version 2.25.
-The installer scripts need the plugins "FindProc" and "InetLoad". To use it copy the files "FindProcDLL.dll" and "InetLoad.dll" from the "LyXPackage" folder to NSIS'"Plugins" directory.
+The installer scripts needs the plugins "FindProc" and "InetLoad".
+To use them copy the files "FindProcDLL.dll" and "InetLoad.dll" from the
+"LyXPackage" folder to NSIS'"Plugins" directory.
 
 ---
 Internationalization

diff --git a/development/Win32/packaging/installer/LyXWinInstaller/Settings.nsh b/development/Win32/packaging/installer/LyXWinInstaller/Settings.nsh
index 508c7ff836a425c61718e5e7384a42fef0df682f..590a758fe16c0977cbc2089b05317c235c1b6116 100644 (file)
--- a/development/Win32/packaging/installer/LyXWinInstaller/Settings.nsh
+++ b/development/Win32/packaging/installer/LyXWinInstaller/Settings.nsh
@@ -3,7 +3,7 @@
 
 !define PRODUCT_DIR "D:\LyXPackage1.5"
 !define PRODUCT_NAME "LyX"
-!define PRODUCT_VERSION "1.5svn-xx-04-2007"
+!define PRODUCT_VERSION "1.5svn-30-04-2007"
 !define PRODUCT_VERSION_SHORT "150svn"
 !define PRODUCT_SUBFOLDER "lyx15"
 !define PRODUCT_LICENSE_FILE "${PRODUCT_DIR}\License.txt"

diff --git a/development/Win32/packaging/installer/LyXWinInstaller/Updated.nsh b/development/Win32/packaging/installer/LyXWinInstaller/Updated.nsh
index a1ac60a1e5922c088f5a00726c973157b67555c7..f3a754b937f2e73d5d137405a5ac92d57ff908a4 100644 (file)
--- a/development/Win32/packaging/installer/LyXWinInstaller/Updated.nsh
+++ b/development/Win32/packaging/installer/LyXWinInstaller/Updated.nsh
@@ -1,6 +1,6 @@
 Function UpdateModifiedFiles
 
- ; list with modified files for LyX 1.5svn xx-04-2007
+ ; list with modified files for LyX 1.5svn 30-04-2007
  SetOutPath "$INSTDIR\bin"
  File "${PRODUCT_SOURCEDIR}\bin\lyx.exe" ; always here
  File "${PRODUCT_SOURCEDIR}\bin\tex2lyx.exe" ; always here
@@ -13,9 +13,11 @@ Function UpdateModifiedFiles
  File "${PRODUCT_SOURCEDIR}\Resources\doc\EmbeddedObjects.lyx"
  File "${PRODUCT_SOURCEDIR}\Resources\doc\TOC.lyx" ; must be here when another \doc file has been changed
  SetOutPath "$INSTDIR\Resources\doc\de"
+ File "${PRODUCT_SOURCEDIR}\Resources\doc\de\Customization.lyx"
  File "${PRODUCT_SOURCEDIR}\Resources\doc\de\Extended.lyx"
- File "${PRODUCT_SOURCEDIR}\Resources\doc\de\UserGuide.lyx"
+ File "${PRODUCT_SOURCEDIR}\Resources\doc\de\Tutorial.lyx"
  File "${PRODUCT_SOURCEDIR}\Resources\doc\de\TOC.lyx" ; must be here when another \doc file has been changed
+ File "${PRODUCT_SOURCEDIR}\Resources\doc\de\UserGuide.lyx"
  SetOutPath "$INSTDIR\Resources\doc\es"
  File "${PRODUCT_SOURCEDIR}\Resources\doc\es\EmbeddedObjects.lyx"
  File "${PRODUCT_SOURCEDIR}\Resources\doc\es\TOC.lyx" ; must be here when another \doc file has been changed
@@ -26,7 +28,9 @@ Function UpdateModifiedFiles
  Delete "$INSTDIR\Resources\examples\de\Dezimal.lyx"
  File "${PRODUCT_SOURCEDIR}\Resources\examples\simplecv.lyx"
  SetOutPath "$INSTDIR\Resources\images"
- File /r "${PRODUCT_SOURCEDIR}\Resources\images\math"
+ File "${PRODUCT_SOURCEDIR}\Resources\images\math-superscript.xpm" 
+ SetOutPath "$INSTDIR\Resources\images\math"
+ File "${PRODUCT_SOURCEDIR}\Resources\images\math\super.xpm"
  SetOutPath "$INSTDIR\Resources\layouts"
  File "${PRODUCT_SOURCEDIR}\Resources\layouts\simplecv.layout"
  SetOutPath "$INSTDIR\Resources\lyx2lyx"