Prepare release 1.18obnam-1.18

4 files changed, 20 insertions, 15 deletions

diff --git a/NEWS b/NEWS
index 5c0868c2..0ebeebcc 100644
--- a/NEWS
+++ b/NEWS
@@ -8,14 +8,25 @@ development, called `green-albatross`. It is **NOT** meant for real
 use. It is likely to change in incompatible ways without warning. Do
 not use it unless you're willing to lose your backup.
 
-Version 1.18, released UNRELEASED
+Version 1.18, released 2015-11-04
 ---------------------------------
 
+Bug fixes:
+
 * William Boughton fixed parsing for sftp URLs with IPv6 addresses.
   Previously, `sftp://[::1]` would be interpreted by Obnam as an
   address `[` followed by the port `:1]`, but now it is correctly
   interpreted as the adddress `::1` and no explicit port.
 
+* Ian Campbell fixed a bug in the kdirstat plugin, improving the
+  handling of unknown file types.
+
+* Lars Wirzenius changed the `scan_tree` code to not be recursive, to
+  avoid problems with directory trees that are deeper than Python's
+  call stack limit allows.
+
+Minor changes:
+
 * Lars Wirzenius added support for a multiline progress message during
   backup. Version 0.24 or newer of `ttystatus` is needed for this, but
   Obnam will work with an older version by displaying the same
@@ -24,21 +35,9 @@ Version 1.18, released UNRELEASED
 * Ben Boeckel added the `--gnupghome` setting so that Obnam can be
   configured to use a separate GnuPG (gpg) configuration directory.
 
-* Ian Campbell fixed a bug in the kdirstat plugin, improving the
-  handling of unknown file types.
-
 * Henri Sivonen improved the compression code to not compress if the
   result would be larger.
 
-* Lars Wirzenius changed the `scan_tree` code to not be recursive, to
-  avoid problems with directory trees that are deeper than Python's
-  call stack limit allows.
-
-* Lars Wirzenius made the `RepositoryFS` class be explicit in what
-  filesystem operations it supports for repositories, rather than
-  supporting everything. This makes future changes and adding
-  non-filesystem (e.g., object store) support later easier to do.
-
 Version 1.17, released 2015-09-12
 ---------------------------------
 
diff --git a/debian/changelog b/debian/changelog
index 338adb3a..cc5b8fc6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+obnam (1.18-1) unstable; urgency=medium
+
+  * New upstream version.
+
+ -- Lars Wirzenius <liw@liw.fi>  Wed, 04 Nov 2015 21:52:25 +0200
+
 obnam (1.17-1) unstable; urgency=medium
 
   * New upstream version.
diff --git a/obnamlib/version.py b/obnamlib/version.py
index 9c788295..f30a9b10 100644
--- a/obnamlib/version.py
+++ b/obnamlib/version.py
@@ -15,4 +15,4 @@
 #
 # =*= License: GPL-3+ =*=
 
-__version__ = '1.17'
+__version__ = '1.18'
diff --git a/setup.py b/setup.py
index b488ecf8..a6af903a 100755
--- a/setup.py
+++ b/setup.py
@@ -325,7 +325,7 @@ class Check(Command):
 
 
 setup(name='obnam',
-      version='1.17',
+      version='1.18',
       description='Backup software',
       author='Lars Wirzenius',
       author_email='liw@liw.fi',