Author: andar
Revision: 6039
Log:
Prep for release
Diff:
Modified: branches/1.2_RC/ChangeLog
===================================================================
--- branches/1.2_RC/ChangeLog 2009-12-17 23:08:55 UTC (rev 6038)
+++ branches/1.2_RC/ChangeLog 2009-12-17 23:49:25 UTC (rev 6039)
@@ -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
Modified: branches/1.2_RC/setup.py
===================================================================
--- branches/1.2_RC/setup.py 2009-12-17 23:08:55 UTC (rev 6038)
+++ branches/1.2_RC/setup.py 2009-12-17 23:49:25 UTC (rev 6039)
@@ -397,7 +397,7 @@
# 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",
Modified: branches/1.2_RC/win32/deluge-win32-installer.nsi
===================================================================
--- branches/1.2_RC/win32/deluge-win32-installer.nsi 2009-12-17 23:08:55 UTC
(rev 6038)
+++ branches/1.2_RC/win32/deluge-win32-installer.nsi 2009-12-17 23:49:25 UTC
(rev 6039)
@@ -37,7 +37,7 @@
# 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 @@
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 @@
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 @@
DELUGE_skip_delete:
# This key is only used by Deluge, so we should always delete it
DeleteRegKey HKCR "Deluge"
-SectionEnd
+SectionEnd
--
You received this message because you are subscribed to the Google Groups
"deluge-commit" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/deluge-commit?hl=en.
