Prepare release version 1.7

5 files changed, 17 insertions, 11 deletions

diff --git a/NEWS b/NEWS
index 27cd8ec3..edbfa0e6 100644
--- a/NEWS
+++ b/NEWS
@@ -3,9 +3,14 @@ Obnam NEWS
 
 This file summarizes changes between releases of Obnam.
 
-Version 1.7, released UNRELEASED
+Version 1.7, released 2014-03-15
 --------------------------------
 
+WARNING: This release has had fairly large parts of the internals
+re-written. There shouldn't be any externally visible changes due to
+that, but there is a chance of bugs. Be careful. Make a copy of your
+backup repository before upgrading, if you can.
+
 * The `convert5to6` subcommand has been removed. If you need to
   convert from a pre-1.0 backup repository, and haven't done so yet,
   please use Obnam version 1.6.1 or earlier to do so.
@@ -53,6 +58,11 @@ Version 1.7, released UNRELEASED
 
 Bug fixes:
 
+* Obnam now doesn't remove chunks that are shared between clients.
+  Previously, this would sometimes happen, because only the first
+  client would correctly record itself as using a chunk. Now all
+  clients do that.
+
 * Obnam now creates a `trustdb.gpg` in the temporary GNUPGHOME it uses
   during encryption operations. From version 2.0.22 (or thereabouts),
   `gpg` insists on having a `trustdb.gpg` in the GNUPGHOME it uses.
@@ -62,11 +72,6 @@ Bug fixes:
   checkpoint was finished, instead of saying the name of the file.
   This is now fixed.
 
-* Obnam now doesn't remove chunks that are shared between clients.
-  Previously, this would sometimes happen, because only the first
-  client would correctly record itself as using a chunk. Now all
-  clients do that.
-
 Internal changes:
 
 * The `obnamlib.Error` exception class has been replaced by the
diff --git a/debian/changelog b/debian/changelog
index 94df9e90..9c14ca1f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-obnam (1.7.1-1) UNRELEASED; urgency=low
+obnam (1.7.1-1) unstable; urgency=low
 
   * Add python-yaml as a build and runtime dependency.
   * New upstream version. Fixes bugs in Debian:
@@ -7,8 +7,9 @@ obnam (1.7.1-1) UNRELEASED; urgency=low
     - "ship an example obnam.conf" (Closes: #678885)
   * debian/control: Updated build and runtime dependencies to versions
     in wheezy or my current package versions, as appropriate.
+  * debian/control: Bumped Standards-Version. No changes required.
 
- -- Lars Wirzenius <liw@liw.fi>  Tue, 11 Mar 2014 19:39:41 +0000
+ -- Lars Wirzenius <liw@liw.fi>  Sat, 15 Mar 2014 17:18:30 +0000
 
 obnam (1.6.1-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 76bada7b..bf4a3531 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Maintainer: Lars Wirzenius <liw@liw.fi>
 Uploader: Gaudenz Steinlin <gaudenz@debian.org>
 Section: python
 Priority: optional
-Standards-Version: 3.9.3
+Standards-Version: 3.9.5
 Build-Depends: debhelper (>= 7.3.8),
     python-all-dev (>= 2.6.3~3),
     python-coverage-test-runner (>= 1.10~),
diff --git a/obnamlib/__init__.py b/obnamlib/__init__.py
index fadb3bfe..d840b968 100644
--- a/obnamlib/__init__.py
+++ b/obnamlib/__init__.py
@@ -17,7 +17,7 @@
 import cliapp
 
 
-__version__ = '1.6.1'
+__version__ = '1.7'
 
 
 
diff --git a/setup.py b/setup.py
index a63f3e43..26d6cd0f 100644
--- a/setup.py
+++ b/setup.py
@@ -194,7 +194,7 @@ class Check(Command):
 
 
 setup(name='obnam',
-      version='1.6.1',
+      version='1.7',
       description='Backup software',
       author='Lars Wirzenius',
       author_email='liw@liw.fi',