Release version 0.26

6 files changed, 14 insertions, 6 deletions

diff --git a/NEWS b/NEWS
index 140a8b30..f4cfc00d 100644
--- a/NEWS
+++ b/NEWS
@@ -10,6 +10,9 @@ Version 0.26, released UNRELEASED; a BETA release
 * Clients now lock the parts of the backup repository they're using,
   while making any changes, so that multiple clients can work at the
   same time without corrupting the repository.
+* Now depends on a larch 0.28, which uses journalling to avoid on-disk
+  inconsistencies and corruption during crashes.
+* Compression and encryption can now be used together.
 
 Version 0.25, released 2012-02-18; a BETA release
 -------------------------------------------------
diff --git a/debian/changelog b/debian/changelog
index 776f8a32..59ec90f7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+obnam (0.26-1) unstable; urgency=low
+
+  * New upstream version.
+  * debian/control: Bump python-larch dependencies to 0.28.
+
+ -- Lars Wirzenius <liw@liw.fi>  Sun, 25 Mar 2012 17:15:59 +0100
+
 obnam (0.25-1) unstable; urgency=low
 
   * New upstream version.
diff --git a/debian/control b/debian/control
index 53ca0ffe..f1806be1 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Standards-Version: 3.9.2
 Build-Depends: debhelper (>= 7.3.8), 
     python-all-dev (>= 2.6.3~3), 
     python-coverage-test-runner, 
-    python-larch (>= 0.27~), 
+    python-larch (>= 0.28~), 
     python-ttystatus (>= 0.15),
     python-paramiko, 
     python-tracing (>= 0.2), 
@@ -23,7 +23,7 @@ Package: obnam
 Provides: python-obnam
 Architecture: any
 Depends: ${shlibs:Depends}, ${python:Depends}, ${misc:Depends}, 
-    python-larch (>= 0.27~), python-ttystatus (>= 0.15),
+    python-larch (>= 0.28~), python-ttystatus (>= 0.15),
     python-paramiko, python-tracing (>= 0.2), python-cliapp (>= 0.18)
 Description: online and disk-based backup application
  Obnam makes backups. Backups can be stored on local hard disks, or online 
diff --git a/obnamlib/__init__.py b/obnamlib/__init__.py
index 07b68e54..33ba6be1 100644
--- a/obnamlib/__init__.py
+++ b/obnamlib/__init__.py
@@ -17,7 +17,7 @@
 import cliapp
 
 
-__version__ = '0.25'
+__version__ = '0.26'
 
 
 
diff --git a/project.meta b/project.meta
deleted file mode 100644
index 25610b2c..00000000
--- a/project.meta
+++ /dev/null
@@ -1,2 +0,0 @@
-[config]
-basetgz = /home/pbuilder-tgz/sid-amd64-pristine.tgz, squeeze:/home/pbuilder-tgz/squeeze-amd64-custom.tgz, squeeze:i386:/home/pbuilder-tgz/squeeze-i386-custom.tgz
diff --git a/setup.py b/setup.py
index b69164d5..f7c75f68 100644
--- a/setup.py
+++ b/setup.py
@@ -114,7 +114,7 @@ class Check(Command):
 
 
 setup(name='obnam',
-      version='0.25',
+      version='0.26',
       description='Backup software',
       author='Lars Wirzenius',
       author_email='liw@liw.fi',