Prepare release 1.6

5 files changed, 21 insertions, 15 deletions

diff --git a/NEWS b/NEWS
index a45b6a11..bfc05451 100644
--- a/NEWS
+++ b/NEWS
@@ -3,7 +3,7 @@ Obnam NEWS
 
 This file summarizes changes between releases of Obnam.
 
-Version 1.6, released UNRELEASED
+Version 1.6, released 2013-11-30
 --------------------------------
 
 * Stop logging paramiko exceptions that get converted into another
@@ -18,12 +18,9 @@ Version 1.6, released UNRELEASED
 * Backup progress reporting now reports scanned file data, not just
   backed up file data. This will hopefully be less confusing to people.
 
-* The nagios plugin to report errors in a way Nagios expects.
-  Patch by Martijn Grendelman.
-
-* The list-keys, client-keys, and list-toplevels commands now
-  obey a new option, `--key-details`, to show the usernames
-  attached to each public key. Patch by Lars Kruse.
+* The `list-keys`, `client-keys`, and `list-toplevels` commands now
+  obey a new option, `--key-details`, to show the usernames attached
+  to each public key. Patch by Lars Kruse.
 
 * New option `--ssh-command` to set the command Obnam runs
   when invoking ssh. patch by Lars Kruse.
@@ -36,7 +33,7 @@ Version 1.6, released UNRELEASED
 
 Bug fixes:
 
-* Fix "obnam list-toplevels" so it doesn't give an error when it's
+* Fix`"obnam list-toplevels` so it doesn't give an error when it's
   unable to read the per-client directory of another client, when
   encryption is used. Fix by Lars Kruse.
 
@@ -44,7 +41,7 @@ Bug fixes:
   looks for client directories but fails to find them. Fix by
   Lars Kruse.
 
-* "obnam list-toplevels" got confused when the repository contained
+* `obnam list-toplevels` got confused when the repository contained
   extra files, such as "lock" (left there by a previous, crashed Obnam
   run). It no longer does. Fix by Lars Kruse.
 
@@ -59,7 +56,10 @@ Bug fixes:
   sufficiently new versions of Paramiko (1.7.7.1 in Debian wheezy is
   OK). Reported by Lars Kruse.
 
-* The nagios plugin for Obnam now correctly handles the case
+* The Nagios plugin to report errors in a way Nagios expects.
+  Patch by Martijn Grendelman.
+
+* The Nagios plugin for Obnam now correctly handles the case
   where a backup repository for a client exists, but does not have
   a backup yet. Patch by Lars Kruse.
 
diff --git a/README b/README
index b9ca328a..1c2dfef4 100644
--- a/README
+++ b/README
@@ -74,7 +74,7 @@ to master when the changes are done and considered good.
 To build and run automatic tests:
 
     ./check
-    ./check --fast # unit tests only, no blackboxtests
+    ./check --fast # unit tests only, no black box tests
     ./check --network # requires ssh access to localhost
 
 `check` is a wrapper around `python setup.py`, but since using that
diff --git a/debian/changelog b/debian/changelog
index 44273546..16576cd7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,14 @@
-obnam (1.6-1) UNRELEASED; urgency=low
+obnam (1.6-1) unstable; urgency=low
 
+  * New upstream version.
+    - Adds a better example for "obnam mount" (Closes: #726808)
+    - Explain --log-max units in manpage (Closes:  #683868)
+    - Fix bug for sftp URL handling of /~/ for home dirs 
+      (Closes: #684349)
+    - Missing node problem fixes (Closes: #705554)
   * Add Depends and Build-Depends on python-fuse. (Closes: #722553)
 
- -- Lars Wirzenius <liw@liw.fi>  Sun, 15 Sep 2013 16:04:42 +0100
+ -- Lars Wirzenius <liw@liw.fi>  Sat, 30 Nov 2013 11:18:48 +0000
 
 obnam (1.5-1) unstable; urgency=low
 
diff --git a/obnamlib/__init__.py b/obnamlib/__init__.py
index fe751c3c..026cf779 100644
--- a/obnamlib/__init__.py
+++ b/obnamlib/__init__.py
@@ -17,7 +17,7 @@
 import cliapp
 
 
-__version__ = '1.5'
+__version__ = '1.6'
 
 
 
diff --git a/setup.py b/setup.py
index 92d10ade..265db745 100644
--- a/setup.py
+++ b/setup.py
@@ -158,7 +158,7 @@ class Check(Command):
 
 
 setup(name='obnam',
-      version='1.5',
+      version='1.6',
       description='Backup software',
       author='Lars Wirzenius',
       author_email='liw@liw.fi',