[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[vidalia-svn] r1945: Remove the openssl static libs from the bundle, too. (in trunk: . pkg/win32)
Author: edmanm
Date: 2007-09-22 21:24:08 -0400 (Sat, 22 Sep 2007)
New Revision: 1945
Modified:
trunk/
trunk/pkg/win32/vidalia-bundle.nsi
trunk/pkg/win32/vidalia_cs.nsh
trunk/pkg/win32/vidalia_de.nsh
trunk/pkg/win32/vidalia_en.nsh
trunk/pkg/win32/vidalia_es.nsh
trunk/pkg/win32/vidalia_fa.nsh
trunk/pkg/win32/vidalia_fi.nsh
trunk/pkg/win32/vidalia_fr.nsh
trunk/pkg/win32/vidalia_it.nsh
trunk/pkg/win32/vidalia_nl.nsh
trunk/pkg/win32/vidalia_pl.nsh
trunk/pkg/win32/vidalia_pt-br.nsh
trunk/pkg/win32/vidalia_ru.nsh
trunk/pkg/win32/vidalia_sv.nsh
trunk/pkg/win32/vidalia_zh-cn.nsh
trunk/pkg/win32/vidalia_zh-tw.nsh
Log:
r1961@lysithea: edmanm | 2007-09-22 21:17:15 -0400
Remove the openssl static libs from the bundle, too.
Property changes on: trunk
___________________________________________________________________
svk:merge ticket from /local/vidalia/trunk [r1961] on dc66be73-d13e-47ba-a267-8dc7cda68c65
Modified: trunk/pkg/win32/vidalia-bundle.nsi
===================================================================
--- trunk/pkg/win32/vidalia-bundle.nsi 2007-09-22 09:00:21 UTC (rev 1944)
+++ trunk/pkg/win32/vidalia-bundle.nsi 2007-09-23 01:24:08 UTC (rev 1945)
@@ -49,10 +49,6 @@
!define TORBUTTON_APPVERSION "1.0.4.01-fx+tb"
!define TORBUTTON_DESC "${TORBUTTON_NAME} ${TORBUTTON_APPVERSION}"
-!define OPENSSL_NAME "OpenSSL"
-!define OPENSSL_APPVERSION "0.9.8e"
-!define OPENSSL_DESC "${OPENSSL_NAME} ${OPENSSL_APPVERSION}"
-
!define BUNDLE_NAME "Vidalia Bundle"
!define BUNDLE_APPVERSION "${TOR_APPVERSION}-${VIDALIA_APPVERSION}"
!define BUNDLE_REVISION "1"
@@ -283,15 +279,6 @@
SectionEnd
;--------------------------------
- ; OpenSSL binaries
- Section "$(TorOpenSSL)" TorOpenSSL
- SectionIn 1 2
- SetOutPath "$INSTDIR\Tor"
- File "tor\${TOR_APPVERSION}\libcrypto.a"
- File "tor\${TOR_APPVERSION}\libssl.a"
- SectionEnd
-
- ;--------------------------------
; Tor documentation
Section "$(TorDocumentation)" TorDocs
SectionIn 1
@@ -575,7 +562,6 @@
!insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
!insertmacro MUI_DESCRIPTION_TEXT ${Tor} "$(TorAppDesc)"
!insertmacro MUI_DESCRIPTION_TEXT ${TorGroup} "$(TorGroupDesc)"
- !insertmacro MUI_DESCRIPTION_TEXT ${TorOpenSSL} "$(TorOpenSSLDesc)"
!insertmacro MUI_DESCRIPTION_TEXT ${TorDocs} "$(TorDocumentationDesc)"
!insertmacro MUI_DESCRIPTION_TEXT ${TorShortcuts} "$(TorShortcutsDesc)"
Modified: trunk/pkg/win32/vidalia_cs.nsh
===================================================================
--- trunk/pkg/win32/vidalia_cs.nsh 2007-09-22 09:00:21 UTC (rev 1944)
+++ trunk/pkg/win32/vidalia_cs.nsh 2007-09-23 01:24:08 UTC (rev 1945)
@@ -31,8 +31,6 @@
LangString TorUninstDesc ${LANG_CZECH} "Odstranit ${TOR_DESC}."
LangString TorAppDesc ${LANG_CZECH} "Instalovat ${TOR_DESC}."
LangString TorAskOverwriteTorrc ${LANG_CZECH} "Byl nalezen puvodni konfiguracni soubor Tor.$\r$\nChcete jej prepsat vychozim konfiguracnim souborem?"
-LangString TorOpenSSL ${LANG_CZECH} "OpenSSL ${OPENSSL_APPVERSION}"
-LangString TorOpenSSLDesc ${LANG_CZECH} "Instalovat ${OPENSSL_DESC}."
LangString TorDocumentation ${LANG_CZECH} "Dokumentace"
LangString TorDocumentationDesc ${LANG_CZECH} "Instalovat ${TOR_NAME} dokumentaci."
LangString TorShortcuts ${LANG_CZECH} "Vlozit do menu Start"
Modified: trunk/pkg/win32/vidalia_de.nsh
===================================================================
--- trunk/pkg/win32/vidalia_de.nsh 2007-09-22 09:00:21 UTC (rev 1944)
+++ trunk/pkg/win32/vidalia_de.nsh 2007-09-23 01:24:08 UTC (rev 1945)
@@ -32,8 +32,6 @@
LangString TorUninstDesc ${LANG_GERMAN} "Entferne ${TOR_DESC}."
LangString TorAppDesc ${LANG_GERMAN} "Installiere ${TOR_DESC}."
LangString TorAskOverwriteTorrc ${LANG_GERMAN} "Sie haben bereits eine Tor Konfigurationsdatei.$\r$\nSoll diese mit der allgemeinen Beispiel-Konfigurationsdatei �hrieben werden?"
-LangString TorOpenSSL ${LANG_GERMAN} "OpenSSL ${OPENSSL_APPVERSION}"
-LangString TorOpenSSLDesc ${LANG_GERMAN} "Installiere ${OPENSSL_DESC}."
LangString TorDocumentation ${LANG_GERMAN} "Dokumentation"
LangString TorDocumentationDesc ${LANG_GERMAN} "Installiere ${TOR_NAME} Dokumentation."
LangString TorShortcuts ${LANG_GERMAN} "Zum Startmen�uf�
Modified: trunk/pkg/win32/vidalia_en.nsh
===================================================================
--- trunk/pkg/win32/vidalia_en.nsh 2007-09-22 09:00:21 UTC (rev 1944)
+++ trunk/pkg/win32/vidalia_en.nsh 2007-09-23 01:24:08 UTC (rev 1945)
@@ -51,8 +51,6 @@
LangString TorUninstDesc ${LANG_ENGLISH} "Remove ${TOR_DESC}."
LangString TorAppDesc ${LANG_ENGLISH} "Install ${TOR_DESC}."
LangString TorAskOverwriteTorrc ${LANG_ENGLISH} "You already have a Tor configuration file.$\r$\nDo you want to overwrite it with the default sample configuration file?"
-LangString TorOpenSSL ${LANG_ENGLISH} "OpenSSL ${OPENSSL_APPVERSION}"
-LangString TorOpenSSLDesc ${LANG_ENGLISH} "Install ${OPENSSL_DESC}."
LangString TorDocumentation ${LANG_ENGLISH} "Documentation"
LangString TorDocumentationDesc ${LANG_ENGLISH} "Install ${TOR_NAME} documentation."
LangString TorShortcuts ${LANG_ENGLISH} "Add to Start Menu"
Modified: trunk/pkg/win32/vidalia_es.nsh
===================================================================
--- trunk/pkg/win32/vidalia_es.nsh 2007-09-22 09:00:21 UTC (rev 1944)
+++ trunk/pkg/win32/vidalia_es.nsh 2007-09-23 01:24:08 UTC (rev 1945)
@@ -31,8 +31,6 @@
LangString TorUninstDesc ${LANG_SPANISH} "Remove ${TOR_DESC}."
LangString TorAppDesc ${LANG_SPANISH} "Instalar ${TOR_DESC}."
LangString TorAskOverwriteTorrc ${LANG_SPANISH} "Ya tiene un archivo de configuraci�e Tor.$\r$\n�Desea sobreescribirlo con el archivo de configuraci�e muestra predeterminado?"
-LangString TorOpenSSL ${LANG_SPANISH} "OpenSSL ${OPENSSL_APPVERSION}"
-LangString TorOpenSSLDesc ${LANG_SPANISH} "Instalar ${OPENSSL_DESC}."
LangString TorDocumentation ${LANG_SPANISH} "Documentaci� LangString TorDocumentationDesc ${LANG_SPANISH} "Instalar la documentaci�e ${TOR_NAME}."
LangString TorShortcuts ${LANG_SPANISH} "Agregar al Menu Inicio"
Modified: trunk/pkg/win32/vidalia_fa.nsh
===================================================================
--- trunk/pkg/win32/vidalia_fa.nsh 2007-09-22 09:00:21 UTC (rev 1944)
+++ trunk/pkg/win32/vidalia_fa.nsh 2007-09-23 01:24:08 UTC (rev 1945)
@@ -31,8 +31,6 @@
LangString TorUninstDesc ${LANG_FARSI} "Remove ${TOR_DESC}."
LangString TorAppDesc ${LANG_FARSI} "?�?�� ${TOR_DESC}."
LangString TorAskOverwriteTorrc ${LANG_FARSI} "��??����? ?? ?�� ???�� ������$\r$\n�����?�� � � ?�� ???�� ��??�?�� �? ��?��"
-LangString TorOpenSSL ${LANG_FARSI} "OpenSSL ${OPENSSL_APPVERSION}"
-LangString TorOpenSSLDesc ${LANG_FARSI} "?�?�� ${OPENSSL_DESC}."
LangString TorDocumentation ${LANG_FARSI} "���
LangString TorDocumentationDesc ${LANG_FARSI} "?�?�� ���${TOR_NAME}."
LangString TorShortcuts ${LANG_FARSI} "��� � �� ��"
Modified: trunk/pkg/win32/vidalia_fi.nsh
===================================================================
--- trunk/pkg/win32/vidalia_fi.nsh 2007-09-22 09:00:21 UTC (rev 1944)
+++ trunk/pkg/win32/vidalia_fi.nsh 2007-09-23 01:24:08 UTC (rev 1945)
@@ -34,8 +34,6 @@
LangString TorUninstDesc ${LANG_FINNISH} "Poista ${TOR_DESC}."
LangString TorAppDesc ${LANG_FINNISH} "Asenna ${TOR_DESC}."
LangString TorAskOverwriteTorrc ${LANG_FINNISH} "Sinulla on jo ennest� Tor-asetustiedosto.$\r$\nHaluatko, ett�e korvataan oletusesimerkill�
-LangString TorOpenSSL ${LANG_FINNISH} "OpenSSL ${OPENSSL_APPVERSION}"
-LangString TorOpenSSLDesc ${LANG_FINNISH} "Asenna ${OPENSSL_DESC}."
LangString TorDocumentation ${LANG_FINNISH} "Ohje"
LangString TorDocumentationDesc ${LANG_FINNISH} "Asenna ${TOR_NAME}-ohje."
LangString TorShortcuts ${LANG_FINNISH} "Lis�K�nist�alikkoon"
Modified: trunk/pkg/win32/vidalia_fr.nsh
===================================================================
--- trunk/pkg/win32/vidalia_fr.nsh 2007-09-22 09:00:21 UTC (rev 1944)
+++ trunk/pkg/win32/vidalia_fr.nsh 2007-09-23 01:24:08 UTC (rev 1945)
@@ -31,8 +31,6 @@
LangString TorUninstDesc ${LANG_FRENCH} "Remove ${TOR_DESC}."
LangString TorAppDesc ${LANG_FRENCH} "Installer ${TOR_DESC}."
LangString TorAskOverwriteTorrc ${LANG_FRENCH} "Vous avez d� un fichier de configuration de Tor.$\r$\nVoulez-vous le remplacer par le fichier de configuration par d�ut ?"
-LangString TorOpenSSL ${LANG_FRENCH} "OpenSSL ${OPENSSL_APPVERSION}"
-LangString TorOpenSSLDesc ${LANG_FRENCH} "Installer ${OPENSSL_DESC}."
LangString TorDocumentation ${LANG_FRENCH} "Documentation"
LangString TorDocumentationDesc ${LANG_FRENCH} "Installer la documentation de ${TOR_NAME}."
LangString TorShortcuts ${LANG_FRENCH} "Ajouter au Menu D�rrer"
Modified: trunk/pkg/win32/vidalia_it.nsh
===================================================================
--- trunk/pkg/win32/vidalia_it.nsh 2007-09-22 09:00:21 UTC (rev 1944)
+++ trunk/pkg/win32/vidalia_it.nsh 2007-09-23 01:24:08 UTC (rev 1945)
@@ -34,8 +34,6 @@
LangString TorUninstDesc ${LANG_ITALIAN} "Disinstalla ${TOR_DESC}."
LangString TorAppDesc ${LANG_ITALIAN} "Installa ${TOR_DESC}."
LangString TorAskOverwriteTorrc ${LANG_ITALIAN} "Un file di configurazione Tor �i�resente nel sistema.$\r$\nSovrascriverlo con il file di configurazione standard?"
-LangString TorOpenSSL ${LANG_ITALIAN} "OpenSSL ${OPENSSL_APPVERSION}"
-LangString TorOpenSSLDesc ${LANG_ITALIAN} "Installa ${OPENSSL_DESC}."
LangString TorDocumentation ${LANG_ITALIAN} "Documentazione"
LangString TorDocumentationDesc ${LANG_ITALIAN} "Installa la documentazione di ${TOR_NAME}."
LangString TorShortcuts ${LANG_ITALIAN} "Aggiungi al menu Start"
Modified: trunk/pkg/win32/vidalia_nl.nsh
===================================================================
--- trunk/pkg/win32/vidalia_nl.nsh 2007-09-22 09:00:21 UTC (rev 1944)
+++ trunk/pkg/win32/vidalia_nl.nsh 2007-09-23 01:24:08 UTC (rev 1945)
@@ -30,8 +30,6 @@
LangString TorUninstDesc ${LANG_DUTCH} "Verwijder ${TOR_DESC}."
LangString TorAppDesc ${LANG_DUTCH} "Installeer ${TOR_DESC}."
LangString TorAskOverwriteTorrc ${LANG_DUTCH} "U heeft reeds een Tor configuratie bestand.$\r$\nWilt u het overschrijven met het standaard voorbeeld configuratie bestand?"
-LangString TorOpenSSL ${LANG_DUTCH} "OpenSSL ${OPENSSL_APPVERSION}"
-LangString TorOpenSSLDesc ${LANG_DUTCH} "Installeer ${OPENSSL_DESC}."
LangString TorDocumentation ${LANG_DUTCH} "Documentatie"
LangString TorDocumentationDesc ${LANG_DUTCH} "Installeer ${TOR_NAME} documentatie."
LangString TorShortcuts ${LANG_DUTCH} "Voeg toe aan Start Menu"
Modified: trunk/pkg/win32/vidalia_pl.nsh
===================================================================
--- trunk/pkg/win32/vidalia_pl.nsh 2007-09-22 09:00:21 UTC (rev 1944)
+++ trunk/pkg/win32/vidalia_pl.nsh 2007-09-23 01:24:08 UTC (rev 1945)
@@ -31,8 +31,6 @@
LangString TorUninstDesc ${LANG_POLISH} "Usuni�e ${TOR_DESC}."
LangString TorAppDesc ${LANG_POLISH} "Instalacja ${TOR_DESC}."
LangString TorAskOverwriteTorrc ${LANG_POLISH} "Plik konfiguracji Tora ju� istnieje.$\r$\nCzy chcesz go nadpisa�onfiguracj� domy�ln� ?"
-LangString TorOpenSSL ${LANG_POLISH} "OpenSSL ${OPENSSL_APPVERSION}"
-LangString TorOpenSSLDesc ${LANG_POLISH} "Instalacja ${OPENSSL_DESC}."
LangString TorDocumentation ${LANG_POLISH} "Dokumentacja"
LangString TorDocumentationDesc ${LANG_POLISH} "Instalacja dokumentacji ${TOR_NAME}."
LangString TorShortcuts ${LANG_POLISH} "Dodaj do Menu Start"
Modified: trunk/pkg/win32/vidalia_pt-br.nsh
===================================================================
--- trunk/pkg/win32/vidalia_pt-br.nsh 2007-09-22 09:00:21 UTC (rev 1944)
+++ trunk/pkg/win32/vidalia_pt-br.nsh 2007-09-23 01:24:08 UTC (rev 1945)
@@ -31,8 +31,6 @@
LangString TorUninstDesc ${LANG_PORTUGUESEBR} "Remove ${TOR_DESC}."
LangString TorAppDesc ${LANG_PORTUGUESEBR} "Instalar ${TOR_DESC}."
LangString TorAskOverwriteTorrc ${LANG_PORTUGUESEBR} "Voc��em um arquivo de configura� do Tor.$\r$\nVoc�eseja substitu�o com o arquivo de exemplo de configura� padr�"
-LangString TorOpenSSL ${LANG_PORTUGUESEBR} "OpenSSL ${OPENSSL_APPVERSION}"
-LangString TorOpenSSLDesc ${LANG_PORTUGUESEBR} "Instalar ${OPENSSL_DESC}."
LangString TorDocumentation ${LANG_PORTUGUESEBR} "Documenta�"
LangString TorDocumentationDesc ${LANG_PORTUGUESEBR} "Instalar a documenta� do ${TOR_NAME}."
LangString TorShortcuts ${LANG_PORTUGUESEBR} "Adicionar ao Menu Iniciar"
Modified: trunk/pkg/win32/vidalia_ru.nsh
===================================================================
--- trunk/pkg/win32/vidalia_ru.nsh 2007-09-22 09:00:21 UTC (rev 1944)
+++ trunk/pkg/win32/vidalia_ru.nsh 2007-09-23 01:24:08 UTC (rev 1945)
@@ -34,8 +34,6 @@
LangString TorUninstDesc ${LANG_RUSSIAN} "���{TOR_DESC}."
LangString TorAppDesc ${LANG_RUSSIAN} "����R_DESC}."
LangString TorAskOverwriteTorrc ${LANG_RUSSIAN} "�� ��� ���or.$\r$\n�� ������ � �������
-LangString TorOpenSSL ${LANG_RUSSIAN} "OpenSSL ${OPENSSL_APPVERSION}"
-LangString TorOpenSSLDesc ${LANG_RUSSIAN} "����ENSSL_DESC}."
LangString TorDocumentation ${LANG_RUSSIAN} "�����"
LangString TorDocumentationDesc ${LANG_RUSSIAN} "������� ${TOR_NAME}."
LangString TorShortcuts ${LANG_RUSSIAN} "��� �����
Modified: trunk/pkg/win32/vidalia_sv.nsh
===================================================================
--- trunk/pkg/win32/vidalia_sv.nsh 2007-09-22 09:00:21 UTC (rev 1944)
+++ trunk/pkg/win32/vidalia_sv.nsh 2007-09-23 01:24:08 UTC (rev 1945)
@@ -31,8 +31,6 @@
LangString TorUninstDesc ${LANG_SWEDISH} "Ta bort ${TOR_DESC}."
LangString TorAppDesc ${LANG_SWEDISH} "Installera ${TOR_DESC}."
LangString TorAskOverwriteTorrc ${LANG_SWEDISH} "Du har redan en konfigurationsfil f�or.$\r$\nVill du skriva � den med standardkonfigurationsfilen?"
-LangString TorOpenSSL ${LANG_SWEDISH} "OpenSSL ${OPENSSL_APPVERSION}"
-LangString TorOpenSSLDesc ${LANG_SWEDISH} "Installera ${OPENSSL_DESC}."
LangString TorDocumentation ${LANG_SWEDISH} "Dokumentation"
LangString TorDocumentationDesc ${LANG_SWEDISH} "Installera dokumentationen f�{TOR_NAME}."
LangString TorShortcuts ${LANG_SWEDISH} "L� till i startmenyn"
Modified: trunk/pkg/win32/vidalia_zh-cn.nsh
===================================================================
--- trunk/pkg/win32/vidalia_zh-cn.nsh 2007-09-22 09:00:21 UTC (rev 1944)
+++ trunk/pkg/win32/vidalia_zh-cn.nsh 2007-09-23 01:24:08 UTC (rev 1945)
@@ -31,8 +31,6 @@
LangString TorUninstDesc ${LANG_SIMPCHINESE} "Remove ${TOR_DESC}."
LangString TorAppDesc ${LANG_SIMPCHINESE} "��װ ${TOR_DESC}."
LangString TorAskOverwriteTorrc ${LANG_SIMPCHINESE} "��װ��������Tor �����.$\r$\n�����Ĭ������������angString TorOpenSSL ${LANG_SIMPCHINESE} "OpenSSL ${OPENSSL_APPVERSION}"
-LangString TorOpenSSLDesc ${LANG_SIMPCHINESE} "��װ ${OPENSSL_DESC}."
LangString TorDocumentation ${LANG_SIMPCHINESE} "���"
LangString TorDocumentationDesc ${LANG_SIMPCHINESE} "��װ ${TOR_NAME} ���."
LangString TorShortcuts ${LANG_SIMPCHINESE} "�����ʼ�˵����
Modified: trunk/pkg/win32/vidalia_zh-tw.nsh
===================================================================
--- trunk/pkg/win32/vidalia_zh-tw.nsh 2007-09-22 09:00:21 UTC (rev 1944)
+++ trunk/pkg/win32/vidalia_zh-tw.nsh 2007-09-23 01:24:08 UTC (rev 1945)
@@ -31,8 +31,6 @@
LangString TorUninstDesc ${LANG_TRADCHINESE} "Remove ${TOR_DESC}."
LangString TorAppDesc ${LANG_TRADCHINESE} "�w��${TOR_DESC}."
LangString TorAskOverwriteTorrc ${LANG_TRADCHINESE} "�w�˵{������s�b�� Tor �t�m���$\r$\n�O�_�n�ϥ�q�{���t�m���л\��?"
-LangString TorOpenSSL ${LANG_TRADCHINESE} "OpenSSL ${OPENSSL_APPVERSION}"
-LangString TorOpenSSLDesc ${LANG_TRADCHINESE} "�w��${OPENSSL_DESC}."
LangString TorDocumentation ${LANG_TRADCHINESE} "��"
LangString TorDocumentationDesc ${LANG_TRADCHINESE} "�w��${TOR_NAME} ��."
LangString TorShortcuts ${LANG_TRADCHINESE} "�K�[�ܶ}�l���{����"