From 89c9228cec701ad5b50531a9dd02da8b593e0e19 Mon Sep 17 00:00:00 2001
From: Andrew Resch <andrewresch@gmail.com>
Date: Sat, 9 Jan 2010 21:16:08 +0000
Subject: [PATCH] Prep for release

---
 ChangeLog                        | 2 +-
 setup.py                         | 2 +-
 win32/deluge-bbfreeze.py         | 2 +-
 win32/deluge-win32-installer.nsi | 8 ++++----
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 6ebff21cb..7d99c5b3a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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)
diff --git a/setup.py b/setup.py
index 74c8dd817..a68c5840a 100644
--- a/setup.py
+++ b/setup.py
@@ -397,7 +397,7 @@ _data_files = [
 # 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",
diff --git a/win32/deluge-bbfreeze.py b/win32/deluge-bbfreeze.py
index adfadd783..f533ac982 100644
--- a/win32/deluge-bbfreeze.py
+++ b/win32/deluge-bbfreeze.py
@@ -1,4 +1,4 @@
-build_version = "1.2.0_rc5"
+build_version = "1.2.0"
 python_path = "C:\\Python26\\"
 
 import shutil
diff --git a/win32/deluge-win32-installer.nsi b/win32/deluge-win32-installer.nsi
index 2a5999500..7674e0473 100644
--- a/win32/deluge-win32-installer.nsi
+++ b/win32/deluge-win32-installer.nsi
@@ -37,14 +37,14 @@ SetCompressor lzma
 
 # 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 @@ 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
 
@@ -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