Release version 0.20.obnam-0.20

5 files changed, 12 insertions, 4 deletions

diff --git a/NEWS b/NEWS
index 3f597224..6349ad66 100644
--- a/NEWS
+++ b/NEWS
@@ -5,13 +5,15 @@ Obnam NEWS
 This file summarizes changes between releases of Obnam.
 
 
-Version 0.20, released UNRELEASED; a BETA release
+Version 0.20, released 2011-08-09; a BETA release
 -------------------------------------------------
 
 BUG FIXES:
 
 * Non-ASCII filenames over SFTP root now work. (Thanks, Tapani Tarvainen,
   for the reproducible bug report.)
+* The count of files while making a backup now counts all files found,
+  not just those backed up. The old behavior was confusing people.
 
 USER VISIBLE CHANGES:
 
diff --git a/debian/changelog b/debian/changelog
index bd40e587..e99f97f7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+obnam (0.20-1) squeeze; urgency=low
+
+  * New upstream version.
+
+ -- Lars Wirzenius <liw@liw.fi>  Tue, 09 Aug 2011 11:34:12 +0100
+
 obnam (0.19-1) squeeze; urgency=low
 
   * New upstream release.
diff --git a/obnamlib/__init__.py b/obnamlib/__init__.py
index 25ccdd1f..5d1b6eca 100644
--- a/obnamlib/__init__.py
+++ b/obnamlib/__init__.py
@@ -17,7 +17,7 @@
 import cliapp
 
 
-__version__ = '0.19'
+__version__ = '0.20'
 
 
 import _obnam
diff --git a/obnamlib/vfs.py b/obnamlib/vfs.py
index 48ed46a5..2c68e1b9 100644
--- a/obnamlib/vfs.py
+++ b/obnamlib/vfs.py
@@ -374,7 +374,7 @@ class VfsTests(object): # pragma: no cover
         self.assert_(self.fs.isdir('foo'))
 
     def test_listdir_returns_plain_strings_only(self):
-        self.fs.write_file(u'M\u00E4kel\u00E4', 'data')
+        self.fs.write_file(u'M\u00E4kel\u00E4'.encode('utf-8'), 'data')
         names = self.fs.listdir('.')
         types = [type(x) for x in names]
         self.assertEqual(types, [str])
diff --git a/setup.py b/setup.py
index e24c351d..afbfc14e 100644
--- a/setup.py
+++ b/setup.py
@@ -19,7 +19,7 @@ from distutils.core import setup, Extension
 import glob
 
 setup(name='obnam',
-      version='0.19',
+      version='0.20',
       description='Backup software',
       author='Lars Wirzenius',
       author_email='liw@liw.fi',