[FIX] Package: Debian, Windows: more odooification; Debian: correct Packages.gz

1 files changed, 25 insertions, 25 deletions

diff --git a/setup/win32/setup.nsi b/setup/win32/setup.nsi
index 3a02e4f6785..6afe1e75fd5 100755
--- a/setup/win32/setup.nsi
+++ b/setup/win32/setup.nsi
@@ -65,7 +65,7 @@
 !define PUBLISHER 'OpenERP S.A.'

 

 !ifndef MAJOR_VERSION

-    !define MAJOR_VERSION '7'

+    !define MAJOR_VERSION '8'

 !endif

 

 !ifndef MINOR_VERSION

@@ -81,14 +81,14 @@
 #!define VERSION "${MAJOR_VERSION}.${MINOR_VERSION}-r${REVISION_VERSION}"

 !endif

 

-!define PRODUCT_NAME "OpenERP"

+!define PRODUCT_NAME "Odoo"

 !define DISPLAY_NAME "${PRODUCT_NAME} ${MAJOR_VERSION}.${MINOR_VERSION}"

 

 !define REGISTRY_ROOT HKLM

 !define UNINSTALL_BASE_REGISTRY_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall"

 !define UNINSTALL_REGISTRY_KEY "${UNINSTALL_BASE_REGISTRY_KEY}\${DISPLAY_NAME}"

 

-!define UNINSTALL_REGISTRY_KEY_SERVER "${UNINSTALL_BASE_REGISTRY_KEY}\OpenERP Server ${VERSION}"

+!define UNINSTALL_REGISTRY_KEY_SERVER "${UNINSTALL_BASE_REGISTRY_KEY}\Odoo Server ${VERSION}"

 

 !define REGISTRY_KEY "Software\${DISPLAY_NAME}"

 

@@ -106,7 +106,7 @@ ShowInstDetails show
 

 XPStyle on

 

-InstallDir "$PROGRAMFILES\OpenERP ${VERSION}"

+InstallDir "$PROGRAMFILES\Odoo ${VERSION}"

 InstallDirRegKey HKCU "${REGISTRY_KEY}" ""

 

 BrandingText '${PRODUCT_NAME} ${VERSION}'

@@ -168,7 +168,7 @@ Page Custom ShowPostgreSQL LeavePostgreSQL
 !define MUI_FINISHPAGE_RUN_TEXT "$(DESC_FinishPageText)"

 !define MUI_FINISHPAGE_RUN_FUNCTION "LaunchLink"

 !define MUI_FINISHPAGE_LINK $(DESC_FinishPage_Link) 

-!define MUI_FINISHPAGE_LINK_LOCATION "http://www.openerp.com/contact"

+!define MUI_FINISHPAGE_LINK_LOCATION "https://www.odoo.com/page/contactus"

 !insertmacro MUI_PAGE_FINISH

 

 !insertmacro MUI_UNPAGE_WELCOME

@@ -181,11 +181,11 @@ Page Custom ShowPostgreSQL LeavePostgreSQL
 !insertmacro MUI_RESERVEFILE_LANGDLL

 

 ; English

-LangString DESC_OpenERP_Server ${LANG_ENGLISH} "Install the OpenERP Server with all the OpenERP standard modules."

-LangString DESC_PostgreSQL ${LANG_ENGLISH} "Install the PostgreSQL RDBMS used by OpenERP."

-LangString DESC_FinishPage_Link ${LANG_ENGLISH} "Contact OpenERP for Partnership and/or Support"

+LangString DESC_OpenERP_Server ${LANG_ENGLISH} "Install the Odoo Server with all the Odoo standard modules."

+LangString DESC_PostgreSQL ${LANG_ENGLISH} "Install the PostgreSQL RDBMS used by Odoo."

+LangString DESC_FinishPage_Link ${LANG_ENGLISH} "Contact Odoo for Partnership and/or Support"

 LangString DESC_AtLeastOneComponent ${LANG_ENGLISH} "You have to choose at least one component"

-LangString DESC_CanNotInstallPostgreSQL ${LANG_ENGLISH} "You can not install the PostgreSQL database without the OpenERP Server"

+LangString DESC_CanNotInstallPostgreSQL ${LANG_ENGLISH} "You can not install the PostgreSQL database without the Odoo Server"

 LangString WARNING_HostNameIsEmpty ${LANG_ENGLISH} "The hostname for the connection to the PostgreSQL Server is empty"

 LangString WARNING_UserNameIsEmpty ${LANG_ENGLISH} "The username for the connection to the PostgreSQL Server is empty"

 LangString WARNING_PasswordIsEmpty ${LANG_ENGLISH} "The password for the connection to the PostgreSQL Server is empty"

@@ -197,16 +197,16 @@ LangString DESC_PostgreSQL_Username ${LANG_ENGLISH} "Username"
 LangString DESC_PostgreSQL_Password ${LANG_ENGLISH} "Password"

 LangString Profile_AllInOne ${LANG_ENGLISH} "All In One"

 LangString Profile_Server ${LANG_ENGLISH} "Server only"

-LangString TITLE_OpenERP_Server ${LANG_ENGLISH} "OpenERP Server"

+LangString TITLE_OpenERP_Server ${LANG_ENGLISH} "Odoo Server"

 LangString TITLE_PostgreSQL ${LANG_ENGLISH} "PostgreSQL Database"

-LangString DESC_FinishPageText ${LANG_ENGLISH} "Start OpenERP"

+LangString DESC_FinishPageText ${LANG_ENGLISH} "Start Odoo"

 

 ; French

-LangString DESC_OpenERP_Server ${LANG_FRENCH} "Installation du Serveur OpenERP avec tous les modules OpenERP standards."

-LangString DESC_PostgreSQL ${LANG_FRENCH} "Installation de la base de donn?es PostgreSQL utilis?e par OpenERP."

-LangString DESC_FinishPage_Link ${LANG_FRENCH} "Contactez OpenERP pour un Partenariat et/ou du Support"

+LangString DESC_OpenERP_Server ${LANG_FRENCH} "Installation du Serveur Odoo avec tous les modules Odoo standards."

+LangString DESC_PostgreSQL ${LANG_FRENCH} "Installation de la base de donn?es PostgreSQL utilis?e par Odoo."

+LangString DESC_FinishPage_Link ${LANG_FRENCH} "Contactez Odoo pour un Partenariat et/ou du Support"

 LangString DESC_AtLeastOneComponent ${LANG_FRENCH} "Vous devez choisir au moins un composant"

-LangString DESC_CanNotInstallPostgreSQL ${LANG_FRENCH} "Vous ne pouvez pas installer la base de donn?es PostgreSQL sans le serveur OpenERP"

+LangString DESC_CanNotInstallPostgreSQL ${LANG_FRENCH} "Vous ne pouvez pas installer la base de donn?es PostgreSQL sans le serveur Odoo"

 LangString WARNING_HostNameIsEmpty ${LANG_FRENCH} "L'adresse pour la connection au serveur PostgreSQL est vide"

 LangString WARNING_UserNameIsEmpty ${LANG_FRENCH} "Le nom d'utilisateur pour la connection au serveur PostgreSQL est vide"

 LangString WARNING_PasswordIsEmpty ${LANG_FRENCH} "Le mot de passe pour la connection au serveur PostgreSQL est vide"

@@ -218,9 +218,9 @@ LangString DESC_PostgreSQL_Username ${LANG_FRENCH} "Utilisateur"
 LangString DESC_PostgreSQL_Password ${LANG_FRENCH} "Mot de passe"

 LangString Profile_AllInOne ${LANG_FRENCH} "All In One"

 LangString Profile_Server ${LANG_FRENCH} "Seulement le serveur"

-LangString TITLE_OpenERP_Server ${LANG_FRENCH} "Serveur OpenERP"

+LangString TITLE_OpenERP_Server ${LANG_FRENCH} "Serveur Odoo"

 LangString TITLE_PostgreSQL ${LANG_FRENCH} "Installation du serveur de base de donn?es PostgreSQL"

-LangString DESC_FinishPageText ${LANG_FRENCH} "Démarrer OpenERP"

+LangString DESC_FinishPageText ${LANG_FRENCH} "Démarrer Odoo"

 

 InstType $(Profile_AllInOne)

 InstType $(Profile_Server)

@@ -256,10 +256,10 @@ Section $(TITLE_OpenERP_Server) SectionOpenERP_Server
     nsExec::Exec '"$INSTDIR\service\win32_service.exe" -auto -install'

 

     # TODO: don't hardcode the service name

-    nsExec::Exec "net stop openerp-server-8.0"

+    nsExec::Exec "net stop odoo-server-8.0"

     sleep 2

 

-    nsExec::Exec "net start openerp-server-8.0"

+    nsExec::Exec "net start odoo-server-8.0"

     sleep 2

 

 SectionEnd

@@ -282,7 +282,7 @@ Section $(TITLE_PostgreSQL) SectionPostgreSQL
         --mode unattended \

         --prefix "$INSTDIR\PostgreSQL" \

         --datadir "$INSTDIR\PostgreSQL\data" \

-        --servicename "PostgreSQL_For_OpenERP" \

+        --servicename "PostgreSQL_For_Odoo" \

         --serviceaccount "openpgsvc" --servicepassword "0p3npgsvcPWD" \

         --superaccount "$TextPostgreSQLUsername" --superpassword "$TextPostgreSQLPassword" \

         --serverport $TextPostgreSQLPort'

@@ -297,10 +297,10 @@ Section -Post
 ;    WriteRegDWORD HKLM     "${UNINSTALL_REGISTRY_KEY}" "Version" "${VERSION}"

 ;    WriteRegDWORD HKLM     "${UNINSTALL_REGISTRY_KEY}" "VersionMajor" "${MAJOR_VERSION}.${MINOR_VERSION}"

 ;    WriteRegDWORD HKLM     "${UNINSTALL_REGISTRY_KEY}" "VersionMinor" "${REVISION_VERSION}"

-    WriteRegStr HKLM       "${UNINSTALL_REGISTRY_KEY}" "HelpLink" "support@openerp.com"

+    WriteRegStr HKLM       "${UNINSTALL_REGISTRY_KEY}" "HelpLink" "support@odoo.com"

     WriteRegStr HKLM       "${UNINSTALL_REGISTRY_KEY}" "HelpTelephone" "+32.81.81.37.00"

-    WriteRegStr HKLM       "${UNINSTALL_REGISTRY_KEY}" "URLInfoAbout" "http://www.openerp.com"

-    WriteRegStr HKLM       "${UNINSTALL_REGISTRY_KEY}" "Contact" "sales@openerp.com"

+    WriteRegStr HKLM       "${UNINSTALL_REGISTRY_KEY}" "URLInfoAbout" "https://www.odoo.com"

+    WriteRegStr HKLM       "${UNINSTALL_REGISTRY_KEY}" "Contact" "sales@odoo.com"

     WriteRegDWORD HKLM     "${UNINSTALL_REGISTRY_KEY}" "NoModify" "1"

     WriteRegDWORD HKLM     "${UNINSTALL_REGISTRY_KEY}" "NoRepair" "1"

     WriteUninstaller "$INSTDIR\Uninstall.exe"

@@ -318,8 +318,8 @@ Section "Uninstall"
     ReadRegStr $0 HKLM "${UNINSTALL_REGISTRY_KEY_SERVER}" "UninstallString"

     ExecWait '"$0" /S'

 

-    nsExec::Exec "net stop openerp-server-8.0"

-    nsExec::Exec "sc delete openerp-server-8.0"

+    nsExec::Exec "net stop odoo-server-8.0"

+    nsExec::Exec "sc delete odoo-server-8.0"

     sleep 2

 

     Rmdir /r "$INSTDIR\server"