Prepare release version 1.2obnam-1.2

4 files changed, 14 insertions, 4 deletions

diff --git a/NEWS b/NEWS
index 1c464943..8d09095b 100644
--- a/NEWS
+++ b/NEWS
@@ -4,7 +4,7 @@ Obnam NEWS
 
 This file summarizes changes between releases of Obnam.
 
-Version 1.UNRLEASED, released UNRELEASED
+Version 1.2, released 2012-10-06
 --------------------------------
 
 * Added a note to `--node-size` that it only affects new B-trees.
@@ -13,6 +13,12 @@ Version 1.UNRLEASED, released UNRELEASED
   files) between two generations, by Peter Valdemar Mørch.
 * `obnam backup` now logs the names of files that are getting backed up
   at the INFO level rather than DEBUG.
+* The command synopsises for backup, restore, and verify commands now
+  make it clearer that Obnam only accepts directories, not individual
+  files, as arguments. (For now.)
+* The output from the `show` plugin can now be redirected with the
+  `--output=FILE` option. Affected subcommands: `clients`, `generations`,
+  `genids`, `ls`, `diff`, `nagios-last-backup-age`.
 
 Bug fixes:
 
@@ -21,6 +27,10 @@ Bug fixes:
   with `/~/` which already exist without crashing.
 * Character and block device nodes are now restored correctly.
   Thanks to Martin Dummer for the bug report.
+* The symmteric key for a toplevel repository directory is re-encrypted
+  when a public key is added or removed to the toplevel using the
+  `add-key` or `remove-key` subcommands.
+* Manual page typo fix. Thanks, Steve Kemp.
 
 Version 1.1, released 2012-06-30
 --------------------------------
diff --git a/debian/changelog b/debian/changelog
index 0ba70580..4187a4d7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-obnam (1.2-1) UNRELEASED; urgency=low
+obnam (1.2-1) unstable; urgency=low
 
   * debian/control: Fix homepage URL
 
diff --git a/obnamlib/__init__.py b/obnamlib/__init__.py
index f22923e7..006f4b91 100644
--- a/obnamlib/__init__.py
+++ b/obnamlib/__init__.py
@@ -17,7 +17,7 @@
 import cliapp
 
 
-__version__ = '1.1'
+__version__ = '1.2'
 
 
 
diff --git a/setup.py b/setup.py
index b46f12e6..adc39668 100644
--- a/setup.py
+++ b/setup.py
@@ -135,7 +135,7 @@ class Check(Command):
 
 
 setup(name='obnam',
-      version='1.1',
+      version='1.2',
       description='Backup software',
       author='Lars Wirzenius',
       author_email='liw@liw.fi',