From 9b53508a829b4cb8e9f20e95b45a3185af803fb7 Mon Sep 17 00:00:00 2001
From: Adam Blackburn <compwiz18@gmail.com>
Date: Tue, 1 Dec 2009 20:59:27 -0600
Subject: [PATCH] updated version number, CHANGES, and NEWS for release

---
 CHANGES  | 70 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 NEWS     |  2 +-
 setup.py |  2 +-
 3 files changed, 72 insertions(+), 2 deletions(-)

diff --git a/CHANGES b/CHANGES
index c6fb248..382ad4b 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,74 @@
 ------------------------------------------------------------
+revno: 481
+committer: Andrew Psaltis <ampsaltis@gmail.com>
+branch nick: 1.6
+timestamp: Mon 2009-11-30 12:14:45 -0500
+message:
+  Some wicd-curses cleanup.
+------------------------------------------------------------
+revno: 480 [merge]
+committer: Adam Blackburn <compwiz18@gmail.com>
+branch nick: 1.7
+timestamp: Thu 2009-11-26 21:43:15 -0600
+message:
+  merged optional-dhcp-hostnames to make optional hostnames work in the daemon
+------------------------------------------------------------
+revno: 479
+committer: Adam Blackburn <compwiz18@gmail.com>
+branch nick: 1.7
+timestamp: Thu 2009-11-26 21:42:39 -0600
+message:
+  add checkbox to GTK UI to make using the DHCP Hostname optional
+------------------------------------------------------------
+revno: 478 [merge]
+committer: Andrew Psaltis <ampsaltis@gmail.com>
+branch nick: 1.6
+timestamp: Thu 2009-11-26 00:05:03 -0500
+message:
+  Merge in Adam's dhclient-hostname stuff, and fix up the dhcphostname KeyError.
+------------------------------------------------------------
+revno: 477 [merge]
+committer: Adam Blackburn <compwiz18@gmail.com>
+branch nick: wicd
+timestamp: Wed 2009-11-25 21:27:29 -0600
+message:
+  merged Erik de Castro Lopo's branch to allow multiple configuration files
+------------------------------------------------------------
+revno: 476
+committer: Dan O'Reilly <oreilldf@gmail.com>
+branch nick: trunk
+timestamp: Tue 2009-11-24 00:27:41 -0500
+message:
+  Make pinging wireless access points when using static gateways optional.
+------------------------------------------------------------
+revno: 475
+committer: Adam Blackburn <compwiz18@gmail.com>
+branch nick: wicd
+timestamp: Mon 2009-11-23 12:22:43 -0600
+message:
+  make sure that disconnect scripts are run when the connection is dropped
+------------------------------------------------------------
+revno: 474
+committer: Adam Blackburn <compwiz18@gmail.com>
+branch nick: wicd
+timestamp: Mon 2009-11-23 11:43:50 -0600
+message:
+  make setting the essid work even if the essid is a reserved word
+------------------------------------------------------------
+revno: 473
+committer: Adam Blackburn <compwiz18@gmail.com>
+branch nick: wicd
+timestamp: Mon 2009-11-23 11:01:32 -0600
+message:
+  fixed incorrect translation when using a wired network
+------------------------------------------------------------
+revno: 472
+committer: Adam Blackburn <compwiz18@gmail.com>
+branch nick: wicd
+timestamp: Sat 2009-11-21 22:08:33 -0600
+message:
+  updated setup.py, NEWS, and CHANGES
+------------------------------------------------------------
 revno: 471
 committer: Andrew Psaltis <ampsaltis@gmail.com>
 branch nick: 1.6
diff --git a/NEWS b/NEWS
index 0747e24..96913d5 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,5 @@
 Wicd 1.6.0 Branch
-1.7.0a1:
+1.7.0a2:
 	Major Changes:
 	- Connection information is available by right clicking the tray icon
 	- Can set the hostname per network for all DHCP clients except dhclient
diff --git a/setup.py b/setup.py
index 6b9d0fc..ebe6184 100644
--- a/setup.py
+++ b/setup.py
@@ -26,7 +26,7 @@ import subprocess
 
 # Be sure to keep this updated!
 # VERSIONNUMBER
-VERSION_NUM = '1.7.0a1'
+VERSION_NUM = '1.7.0a2'
 # REVISION_NUM is automatically updated
 REVISION_NUM = 'unknown'
 CURSES_REVNO = 'uimod'