diff --git a/ChangeLog b/ChangeLog index c2d07ae84..4691f3f0b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,4 @@ -=== Deluge 1.2.0_rc5 (In Development) === +=== Deluge 1.2.0_rc5 (17 December 2009) === ==== Web ==== * Swap order of buttons in Remove window (Closes #1083) * Change the compressed js script to deluge-all.js to avoid naming diff --git a/setup.py b/setup.py index fe5df9e6f..74c8dd817 100644 --- a/setup.py +++ b/setup.py @@ -397,7 +397,7 @@ _data_files = [ # Main setup setup( name = "deluge", - version = "1.2.0_rc4", + version = "1.2.0_rc5", fullname = "Deluge Bittorrent Client", description = "Bittorrent Client", author = "Andrew Resch, Damien Churchill", diff --git a/win32/deluge-win32-installer.nsi b/win32/deluge-win32-installer.nsi index fb2194d3e..2a5999500 100644 --- a/win32/deluge-win32-installer.nsi +++ b/win32/deluge-win32-installer.nsi @@ -37,7 +37,7 @@ SetCompressor lzma # Deluge program information !define PROGRAM_NAME "Deluge" -!define PROGRAM_VERSION "1.2.0_rc4" +!define PROGRAM_VERSION "1.2.0_rc5" !define PROGRAM_WEB_SITE "http://deluge-torrent.org" # Python files generated with bbfreeze (without DLLs from GTK+ runtime) @@ -213,17 +213,17 @@ Section "Create .torrent file association for Deluge" Section2 WriteRegStr HKCR "Deluge\shell\open\command" "" '"$INSTDIR\deluge.cmd" "%1"' SectionEnd - -# Create magnet uri association -Section "Create magnet uri link association for Deluge" Section3 - DeleteRegKey HKCR "magnet" - WriteRegStr HKCR "magnet" "" "URL:magnet protocol" - WriteRegStr HKCR "magnet" "URL Protocol" "" - - WriteRegStr HKCR "magnet\shell\open\command" "" '"$INSTDIR\deluge.cmd" "%1"' -SectionEnd - -# Install GTK+ 2.16 + +# Create magnet uri association +Section "Create magnet uri link association for Deluge" Section3 + DeleteRegKey HKCR "magnet" + WriteRegStr HKCR "magnet" "" "URL:magnet protocol" + WriteRegStr HKCR "magnet" "URL Protocol" "" + + WriteRegStr HKCR "magnet\shell\open\command" "" '"$INSTDIR\deluge.cmd" "%1"' +SectionEnd + +# Install GTK+ 2.16 Section "GTK+ 2.16 runtime" Section4 # Check whether GTK+ 2.12 is installed on the system; if so skip this section # The criterion is whether the registry key HKLM\SOFTWARE\GTK\2.0\Version exists @@ -271,17 +271,17 @@ Section "GTK+ 2.16 runtime" Section4 GTK_install_exit: SectionEnd -LangString DESC_Section1 ${LANG_ENGLISH} "Install Deluge Bittorrent client." -LangString DESC_Section2 ${LANG_ENGLISH} "Select this option unless you have another torrent client which you want to use for opening .torrent files." -LangString DESC_Section3 ${LANG_ENGLISH} "Select this option to have Deluge handle magnet links." -LangString DESC_Section4 ${LANG_ENGLISH} "Download and install the GTK+ 2.16 runtime. \ - This is skipped automatically if GTK+ is already installed." - -!insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN - !insertmacro MUI_DESCRIPTION_TEXT ${Section1} $(DESC_Section1) - !insertmacro MUI_DESCRIPTION_TEXT ${Section2} $(DESC_Section2) - !insertmacro MUI_DESCRIPTION_TEXT ${Section3} $(DESC_Section3) - !insertmacro MUI_DESCRIPTION_TEXT ${Section4} $(DESC_Section4) +LangString DESC_Section1 ${LANG_ENGLISH} "Install Deluge Bittorrent client." +LangString DESC_Section2 ${LANG_ENGLISH} "Select this option unless you have another torrent client which you want to use for opening .torrent files." +LangString DESC_Section3 ${LANG_ENGLISH} "Select this option to have Deluge handle magnet links." +LangString DESC_Section4 ${LANG_ENGLISH} "Download and install the GTK+ 2.16 runtime. \ + This is skipped automatically if GTK+ is already installed." + +!insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN + !insertmacro MUI_DESCRIPTION_TEXT ${Section1} $(DESC_Section1) + !insertmacro MUI_DESCRIPTION_TEXT ${Section2} $(DESC_Section2) + !insertmacro MUI_DESCRIPTION_TEXT ${Section3} $(DESC_Section3) + !insertmacro MUI_DESCRIPTION_TEXT ${Section4} $(DESC_Section4) !insertmacro MUI_FUNCTION_DESCRIPTION_END @@ -321,4 +321,4 @@ Section Uninstall DELUGE_skip_delete: # This key is only used by Deluge, so we should always delete it DeleteRegKey HKCR "Deluge" -SectionEnd +SectionEnd