Release version 0.18.obnam-0.18

8 files changed, 70 insertions, 18 deletions

diff --git a/NEWS b/NEWS
index 5472bbf6..27d7c63f 100644
--- a/NEWS
+++ b/NEWS
@@ -5,6 +5,50 @@ Obnam NEWS
 This file summarizes changes between releases of Obnam.
 
 
+Version 0.18, released 2011-07-20; a BETA release
+-------------------------------------------------
+
+* The repository format has again changed in an incompatible manner,
+  so you will need to re-backup everything again. (If this is a problem,
+  tell me, and I'll consider adding backwards compatibility before 1.0
+  is released.)
+* New option `--exclude-caches` allows automatic exclusion of cache
+  directories that are marked as such.
+* Obnam now makes files in the repository be read-only, so that they're
+  that much harder to delete by mistake.
+* Error message about files that can't be backed up now mentions the
+  correct file.
+* Bugfix: unreadable files and directories no longer cause the backup
+  to fail. The problems are reported, but the backup continues.
+  Thanks to Jeff Epler for reporting the bug.
+* Speed improvement from Jeff Epler for excluding files from backups.
+* Various other speed improvements.
+* Bugfix: restoring symlinks now works even if the symlink is restored
+  before its target. Also, the permissions of the symlink (rather than its
+  target) are now restored correctly. Thanks to Jeff Epler for an 
+  exemplary bug report.
+* New option `--one-file-system`, from Jeff Epler.
+* New benchmarking tool `obnam-benchmark`, which is more flexible than
+  the old `run-benchmark`.
+* When encrypting/decrypting data with GnuPG, temporary files are no
+  longer used.
+* When verifying, `.../foo` and `.../foo/` now work the same way.
+* New option `--symmetric-key-bits`.
+* The chunk directory uses more hierarchy levels, and the way chunks
+  are stored there is now user-configurable (but you'll get into trouble
+  if you don't always use the same configuration). This should speed
+  things up a bit once the number of chunks grows very large.
+* New `--chunkids-per-group` option, for yet more knobs to tweak when
+  searching for optimal performance.
+* Local files are now opened using `O_NOATIME` so they can be backed
+  up without affecting timestamps.
+* Now uses the `cliapp` framework for writing command line applications.
+  The primary user-visible effect is that the manpage now has an
+  accurate list of options.
+* Bugfix: Obnam now again reports VFS I/O statistics.
+* Bugfix: Obnam can again back up live data that is accessed using sftp.
+  Thanks to Tapani Tarvainen for reporting the problem.
+
 Version 0.17, released 2011-05-21; a BETA release
 -------------------------------------------------
 
diff --git a/debian/changelog b/debian/changelog
index 65132cee..e4176865 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+obnam (0.18) squeeze; urgency=low
+
+  * New upstream release. Third BETA release.
+  * debian/pycompat: useless, removed.
+  * Converted to use dh_python2.
+  * Bump Standards-Version. No other changes necessary.
+
+ -- Lars Wirzenius <liw@liw.fi>  Wed, 20 Jul 2011 23:20:44 +0100
+
 obnam (0.17) squeeze; urgency=low
 
   * New upstream release. Second BETA release.
diff --git a/debian/control b/debian/control
index 6066a3d5..5a421279 100644
--- a/debian/control
+++ b/debian/control
@@ -2,20 +2,19 @@ Source: obnam
 Maintainer: Lars Wirzenius <liw@liw.fi>
 Section: python
 Priority: optional
-Standards-Version: 3.9.0
-Build-Depends: debhelper (>= 7.3.8), python-support (>= 1.0.3), 
-    python (>= 2.5), extrautils, python-coverage-test-runner, 
-    python-larch (>= 0.13), python-all-dev, python-ttystatus (>= 0.8),
-    python-paramiko, python-tracing (>= 0.2), fakeroot
+Standards-Version: 3.9.2
+Build-Depends: debhelper (>= 7.3.8), python-all-dev (>= 2.6.3~3), 
+    extrautils, python-coverage-test-runner, 
+    python-larch (>= 0.13), python-ttystatus (>= 0.8),
+    python-paramiko, python-tracing (>= 0.2), fakeroot, python-cliapp (>= 0.14)
 Homepage: http://braawi.org/obnam/
-XS-Python-Version: >= 2.5
+X-Python-Version: >= 2.6
 
 Package: obnam
 Architecture: any
 Depends: ${shlibs:Depends}, ${python:Depends}, ${misc:Depends}, 
-    python (>= 2.5), python-larch (>= 0.13), python-ttystatus (>= 0.8),
-    python-paramiko, python-tracing (>= 0.2)
-XB-Python-Version: ${python:Versions}
+    python-larch (>= 0.13), python-ttystatus (>= 0.8),
+    python-paramiko, python-tracing (>= 0.2), python-cliapp (>= 0.14)
 Description: online backup application
  Obnam makes backups.
  .
diff --git a/debian/rules b/debian/rules
index bba95f9f..ae14fd4c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,11 +1,11 @@
 #!/usr/bin/make -f
 %:
-	dh $@ --with-buildsystem=python_distutils
+	dh $@ --with=python2 --with-buildsystem=python_distutils
 
-override_dh_auto_install:
-	python setup.py install --prefix=debian/obnam/usr
-	
 override_dh_auto_build:
-	dh_auto_build $@ --with-buildsystem=python_distutils
+	$(MAKE) all
 	setuppy-debian-versions-match
 
+override_dh_auto_install:
+	python setup.py install --prefix=debian/obnam/usr
+
diff --git a/obnam b/obnam
index af5920f0..56083b7e 100755
--- a/obnam
+++ b/obnam
@@ -18,5 +18,5 @@
 import obnamlib
 
 
-obnamlib.App(progname='obnam', version=obnamlib.version).run()
+obnamlib.App(progname='obnam', version=obnamlib.__version__).run()
 
diff --git a/obnamlib/__init__.py b/obnamlib/__init__.py
index 0d227cce..9d917bc9 100644
--- a/obnamlib/__init__.py
+++ b/obnamlib/__init__.py
@@ -17,7 +17,7 @@
 import cliapp
 
 
-version = '0.17'
+__version__ = '0.18'
 
 
 import _obnam
diff --git a/obnamlib/app.py b/obnamlib/app.py
index c1a79095..e2e17c51 100644
--- a/obnamlib/app.py
+++ b/obnamlib/app.py
@@ -119,7 +119,7 @@ class App(cliapp.Application):
 
     def process_args(self, args):
         self.hooks.call('config-loaded')
-        logging.info('Obnam %s starts' % obnamlib.version)
+        logging.info('Obnam %s starts' % obnamlib.__version__)
         cliapp.Application.process_args(self, args)
         self.hooks.call('shutdown')
         logging.info('Obnam ends')
diff --git a/setup.py b/setup.py
index a2a197d6..efb9c3fb 100644
--- a/setup.py
+++ b/setup.py
@@ -19,7 +19,7 @@ from distutils.core import setup, Extension
 import glob
 
 setup(name='obnam',
-      version='0.17',
+      version='0.18',
       description='Backup software',
       author='Lars Wirzenius',
       author_email='liw@liw.fi',