Author: andar

Revision: 6085

Log:
        Prep for release

Diff:
Modified: branches/1.2_RC/ChangeLog
===================================================================
--- branches/1.2_RC/ChangeLog   2010-01-09 20:41:51 UTC (rev 6084)
+++ branches/1.2_RC/ChangeLog   2010-01-09 21:16:08 UTC (rev 6085)
@@ -1,4 +1,4 @@
-=== Deluge 1.2.0_rc6 (In Development) ===
+=== Deluge 1.2.0 - "Bursting like an infected kidney" (09 January 2010) ===
 ==== Core ====
        * Fix file renaming
        * Fix tracker host filtering (Closes #1106)

Modified: branches/1.2_RC/setup.py
===================================================================
--- branches/1.2_RC/setup.py    2010-01-09 20:41:51 UTC (rev 6084)
+++ branches/1.2_RC/setup.py    2010-01-09 21:16:08 UTC (rev 6085)
@@ -397,7 +397,7 @@
 # Main setup
 setup(
     name = "deluge",
-    version = "1.2.0_rc5",
+    version = "1.2.0",
     fullname = "Deluge Bittorrent Client",
     description = "Bittorrent Client",
     author = "Andrew Resch, Damien Churchill",

Modified: branches/1.2_RC/win32/deluge-bbfreeze.py
===================================================================
--- branches/1.2_RC/win32/deluge-bbfreeze.py    2010-01-09 20:41:51 UTC (rev 
6084)
+++ branches/1.2_RC/win32/deluge-bbfreeze.py    2010-01-09 21:16:08 UTC (rev 
6085)
@@ -1,4 +1,4 @@
-build_version = "1.2.0_rc5"
+build_version = "1.2.0"
 python_path = "C:\\Python26\\"
 
 import shutil

Modified: branches/1.2_RC/win32/deluge-win32-installer.nsi
===================================================================
--- branches/1.2_RC/win32/deluge-win32-installer.nsi    2010-01-09 20:41:51 UTC 
(rev 6084)
+++ branches/1.2_RC/win32/deluge-win32-installer.nsi    2010-01-09 21:16:08 UTC 
(rev 6085)
@@ -37,14 +37,14 @@
 
 # Deluge program information
 !define PROGRAM_NAME "Deluge"
-!define PROGRAM_VERSION "1.2.0_rc5"
+!define PROGRAM_VERSION "1.2.0"
 !define PROGRAM_WEB_SITE "http://deluge-torrent.org";
 
 # Python files generated with bbfreeze (without DLLs from GTK+ runtime)
 !define DELUGE_PYTHON_BBFREEZE_OUTPUT_DIR 
"..\build-win32\deluge-bbfreeze-${PROGRAM_VERSION}"
 
 # Installer for GTK+ 2.12 runtime; will be downloaded from deluge-torrent.org
-!define DELUGE_GTK_DEPENDENCY "gtk2-runtime-2.16.6-2009-09-12-ash.exe"
+!define DELUGE_GTK_DEPENDENCY "gtk2-runtime-2.16.6-2009-12-01-ash.exe"
 
 
 # --- Interface settings ---
@@ -219,7 +219,7 @@
     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
 
@@ -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.


Reply via email to