Michael's installer patch

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

diff --git a/development/ChangeLog b/development/ChangeLog
index 42e7d7fcd3ee6839b2868ad99acc86e7806839c0..a6fd58aecc3dbf2ec355633dee89900b84ab7e0b 100644 (file)
--- a/development/ChangeLog
+++ b/development/ChangeLog
@@ -1,4 +1,9 @@
-2006-2-24  Bennett Helm <bennett.helm@fandm.edu>
+2006-03-10  Michael Gerz  <michael.gerz@teststep.org>
+
+       * Win32/packaging/installer/lyx_languages/*.nsh:
+       Win32/packaging/README: adjust to new package structure
+
+2006-02-24  Bennett Helm <bennett.helm@fandm.edu>
 
     * Minor tweak to Info.plist in Mac application bundle.
 

diff --git a/development/Win32/packaging/README b/development/Win32/packaging/README
index 12f4aaeef81dfe43cad82f5bff4464ef78bbffae..f4c4a41b99f73c12273916fe786dd3782850956c 100644 (file)
--- a/development/Win32/packaging/README
+++ b/development/Win32/packaging/README
@@ -1,7 +1,7 @@
-Packaging LyX 1.3.6 for Windows
+Packaging LyX for Windows
+===============================
+Angus Leeming, 07 March 2006
 ===============================
-Angus Leeming, 14 July 2005
-===========================
 
 Preparing the way
 =================
@@ -25,10 +25,10 @@ the process:
 * Strip the binaries in $PREFIX/bin/ of all debugging info.
 
 * Copy dt2dv.exe and dv2dt.exe to $PREFIX/bin/ and clean_dvi.py to
-  $PREFIX/Resources/lyx/scripts/ These are needed to enable dvips, yap
+  $PREFIX/Resources/scripts/ These are needed to enable dvips, yap
   et al. to cope with "file names with spaces".
 
-* Add formats and converters to the $PREFIX/Resources/lyx/configure
+* Add formats and converters to the $PREFIX/Resources/configure
   script so that users can use the clean_dvi script transparently.
 
 * Remove all stuff generated by running configure. It makes sense on

diff --git a/development/Win32/packaging/installer/lyx_languages/dutch.nsh b/development/Win32/packaging/installer/lyx_languages/dutch.nsh
index d099274157e6cad98b95828b28c22270ad0b8ad2..2406e2a71d32bc43b22b969765880b7181c506c9 100644 (file)
--- a/development/Win32/packaging/installer/lyx_languages/dutch.nsh
+++ b/development/Win32/packaging/installer/lyx_languages/dutch.nsh
@@ -21,7 +21,7 @@ LangString ModifyingConfigureFailed "${LYX_LANG}" "'path_prefix' kon niet worden
 LangString CreateCmdFilesFailed "${LYX_LANG}" "lyx.cmd en reLyX.cmd konden niet worden aangemaakt"
 LangString RunConfigureFailed "${LYX_LANG}" "Mislukte configuratie poging"
 
-LangString FinishPageMessage "${LYX_LANG}" "LyX is nu geinstalleerd. Sommige gebruikers hebben echter gemeld dat het configuratie script niet is uitgevoerd waardoor LyX afbreekt met de melding dat het bestand textclass.lst ontbreekt. Ga, om dit te herstellen, in de commando prompt naar het LyX/Resources/lyx pad en voer het commando 'sh configure' uit."
+LangString FinishPageMessage "${LYX_LANG}" "LyX is nu geinstalleerd. Sommige gebruikers hebben echter gemeld dat het configuratie script niet is uitgevoerd waardoor LyX afbreekt met de melding dat het bestand textclass.lst ontbreekt. Ga, om dit te herstellen, in de commando prompt naar het LyX/Resources pad en voer het commando 'sh configure' uit."
 LangString FinishPageRun "${LYX_LANG}" "Start LyX"
 
 LangString DownloadPageField2 "${LYX_LANG}" "&Niet installeren"

diff --git a/development/Win32/packaging/installer/lyx_languages/english.nsh b/development/Win32/packaging/installer/lyx_languages/english.nsh
index 2f2f4392deee027079d78439bf347c5fb46b5612..3e8c79ca5c2f50b9e55251f672b45d68f647dd33 100644 (file)
--- a/development/Win32/packaging/installer/lyx_languages/english.nsh
+++ b/development/Win32/packaging/installer/lyx_languages/english.nsh
@@ -21,7 +21,7 @@ LangString ModifyingConfigureFailed "${LYX_LANG}" "Failed attempting to set 'pat
 LangString CreateCmdFilesFailed "${LYX_LANG}" "Failed attempting to create lyx.cmd and reLyX.cmd"
 LangString RunConfigureFailed "${LYX_LANG}" "Failed attempting to execute the configure script"
 
-LangString FinishPageMessage "${LYX_LANG}" "LyX should now be installed. However, some of our users report that the configure script fails to run and, as a result, LyX fails to start, reporting a missing textclass.lst file. To fix, run the command: 'sh configure' from the LyX/Resources/lyx directory."
+LangString FinishPageMessage "${LYX_LANG}" "LyX should now be installed. However, some of our users report that the configure script fails to run and, as a result, LyX fails to start, reporting a missing textclass.lst file. To fix, run the command: 'sh configure' from the LyX/Resources directory."
 LangString FinishPageRun "${LYX_LANG}" "Launch LyX"
 
 LangString DownloadPageField2 "${LYX_LANG}" "&Do not install"

diff --git a/development/Win32/packaging/installer/lyx_languages/french.nsh b/development/Win32/packaging/installer/lyx_languages/french.nsh
index d3317be132f0c20c46a85d575f90cd37b8d23084..d24159d5bd59ea897e3b5c9d377c59ba0b9d961b 100644 (file)
--- a/development/Win32/packaging/installer/lyx_languages/french.nsh
+++ b/development/Win32/packaging/installer/lyx_languages/french.nsh
@@ -22,7 +22,7 @@ LangString ModifyingConfigureFailed "${LYX_LANG}" "
 LangString CreateCmdFilesFailed "${LYX_LANG}" "Échec de la création des fichiers lyx.cmd et reLyX.cmd"
 LangString RunConfigureFailed "${LYX_LANG}" "Échec de la tentative de configuration initiale de LyX."
 
-LangString FinishPageMessage "${LYX_LANG}" "LyX devrait être installé. Cependant, quelques utilisateurs ont signalé que le script de configuration échouait; en conséquence, LyX refuse de démarrer avec un message indiquant l'absence du fichier textclass.lst. Pour rectifier l'installation, exécuter 'sh configure' depuis le répertoire LyX/Resources/lyx."
+LangString FinishPageMessage "${LYX_LANG}" "LyX devrait être installé. Cependant, quelques utilisateurs ont signalé que le script de configuration échouait; en conséquence, LyX refuse de démarrer avec un message indiquant l'absence du fichier textclass.lst. Pour rectifier l'installation, exécuter 'sh configure' depuis le répertoire LyX/Resources."
 LangString FinishPageRun "${LYX_LANG}" "Démarrer LyX"
 
 LangString DownloadPageField2 "${LYX_LANG}" "&Ne pas installer"

diff --git a/development/Win32/packaging/installer/lyx_languages/italian.nsh b/development/Win32/packaging/installer/lyx_languages/italian.nsh
index 15140015f77cc386edda349fc8d3db48138772bf..ef74dfadbb3b53f190835cf21309888885c5a0de 100644 (file)
--- a/development/Win32/packaging/installer/lyx_languages/italian.nsh
+++ b/development/Win32/packaging/installer/lyx_languages/italian.nsh
@@ -21,7 +21,7 @@ LangString ModifyingConfigureFailed "${LYX_LANG}" "Fallito tentativo di aggiorna
 LangString CreateCmdFilesFailed "${LYX_LANG}" "Fallito tentativo di creare lyx.cmd e reLyX.cmd"
 LangString RunConfigureFailed "${LYX_LANG}" "Fallito tentativo di eseguire lo script di configurazione"
 
-LangString FinishPageMessage "${LYX_LANG}" "LyX è stato installato. Però, se l$\'installer non è riuscito a lanciare lo script di configurazione, non sarete in grado di usare LyX a causa della mancata generazione del file textclass.lst. In tal caso, il rimedio consiste nell'eseguire il comando 'sh configure' nella directory $\'<LyX>/Resources/lyx$\'."
+LangString FinishPageMessage "${LYX_LANG}" "LyX è stato installato. Però, se l$\'installer non è riuscito a lanciare lo script di configurazione, non sarete in grado di usare LyX a causa della mancata generazione del file textclass.lst. In tal caso, il rimedio consiste nell'eseguire il comando 'sh configure' nella directory $\'<LyX>/Resources$\'."
 
 LangString FinishPageRun "${LYX_LANG}" "Lancia LyX"
 

diff --git a/development/Win32/packaging/installer/lyx_languages/spanish.nsh b/development/Win32/packaging/installer/lyx_languages/spanish.nsh
index 300478df0f7fdd8ec248b1930123073e9bda3af3..285183b22cfdb396d89d8563fd4d1c1f58ce7ebc 100644 (file)
--- a/development/Win32/packaging/installer/lyx_languages/spanish.nsh
+++ b/development/Win32/packaging/installer/lyx_languages/spanish.nsh
@@ -21,7 +21,7 @@ LangString ModifyingConfigureFailed "${LYX_LANG}" "Error al intentar a
 LangString CreateCmdFilesFailed "${LYX_LANG}" "Error al intentar crear lyx.cmd y reLyX.cmd"
 LangString RunConfigureFailed "${LYX_LANG}" "Error al intentar ejecutar la rutina de configuración"
 
-LangString FinishPageMessage "${LYX_LANG}" "Si todo fue bien, LyX debería haber sido instalado correctamente. Sin embargo, algunos de nuestros usuarios han informado de que la rutina de configuración falla al ejecutarse y, como resultado, LyX también falla al ejecutarse (puesto que no encuentra el fichero textclass.lst). Para solucionar este problema abra una ventana de MS-DOS y ejecute el comando 'sh configure' desde el directorio LyX/Resources/lyx ."
+LangString FinishPageMessage "${LYX_LANG}" "Si todo fue bien, LyX debería haber sido instalado correctamente. Sin embargo, algunos de nuestros usuarios han informado de que la rutina de configuración falla al ejecutarse y, como resultado, LyX también falla al ejecutarse (puesto que no encuentra el fichero textclass.lst). Para solucionar este problema abra una ventana de MS-DOS y ejecute el comando 'sh configure' desde el directorio LyX/Resources."
 LangString FinishPageRun "${LYX_LANG}" "Ejecutar LyX ahora"
 
 LangString DownloadPageField2 "${LYX_LANG}" "&No instalar"

diff --git a/development/Win32/packaging/installer/lyx_languages/swedish.nsh b/development/Win32/packaging/installer/lyx_languages/swedish.nsh
index 205ba6ed3c90d4ef125de89fd9feedf0bdd28736..1ca0aa4ca8cc60bf140cc88adb359f0e55c3b441 100644 (file)
--- a/development/Win32/packaging/installer/lyx_languages/swedish.nsh
+++ b/development/Win32/packaging/installer/lyx_languages/swedish.nsh
@@ -26,7 +26,7 @@ LangString ModifyingConfigureFailed "${LYX_LANG}" "Misslyckades med att s
 LangString CreateCmdFilesFailed "${LYX_LANG}" "Misslyckades med att skapa filerna lyx.cmd och reLyX.cmd"
 LangString RunConfigureFailed "${LYX_LANG}" "Misslyckades med att köra konfigurationsprogrammet"
 
-LangString FinishPageMessage "${LYX_LANG}" "LyX borde nu ha installerats. Dessvärre har en del användare rapporterat att konfigurationsskriptet ibland misslyckats. Om detta händer är inte LyX ordentligt konfigurerat och vägrar starta med ett felmeddelande om att filen 'textclass.lst' saknas. För att åtgärda detta problem, öppna ett kommandofönster (kör programmet 'cmd'), och gå till katalogen 'LyX/Resources/lyx directory'. I den katalogen kör du sedan kommandot 'sh configure' vilket kommer att konfigurar LyX."
+LangString FinishPageMessage "${LYX_LANG}" "LyX borde nu ha installerats. Dessvärre har en del användare rapporterat att konfigurationsskriptet ibland misslyckats. Om detta händer är inte LyX ordentligt konfigurerat och vägrar starta med ett felmeddelande om att filen 'textclass.lst' saknas. För att åtgärda detta problem, öppna ett kommandofönster (kör programmet 'cmd'), och gå till katalogen 'LyX/Resources directory'. I den katalogen kör du sedan kommandot 'sh configure' vilket kommer att konfigurar LyX."
 LangString FinishPageRun "${LYX_LANG}" "Starta LyX"
 
 LangString DownloadPageField2 "${LYX_LANG}" "Installera &ej"