Release version 1.11.

6 files changed, 75 insertions, 14 deletions

diff --git a/NEWS b/NEWS
index 1b8e3c3..ab280fb 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,26 @@
 NEWS for seivot, a backup benchmarking program
 ==============================================
 
+Version 1.11, released 2011-08-03
+--------------------------------
+
+* Bug fix: dropping kernel caches now works with modern kernel versions as
+  well. Previously, seivot would write 3, and then 0 to the relevant file
+  in `/proc`, and the 0 would fail. Now it no longer does that.
+* Bug fix: seivot now works even if `PYTHONPATH` is not set in the
+  environment.
+* Bug fix: the obnam log file is now removed after it is no longer needed.
+* Seivot now has a manual page.
+* The `--use-sftp` option has been renamed to `--use-sftp-repository`,
+  and a new option `--use-sftp-root` has been added.
+* When seivots-summary finds a bad .seivot file, it now tells the user which
+  file it is. None of the "?" error message nonsense for us.
+* Improvements to how seivots-summary presents results from many .seivot
+  files: they are grouped in a more sensible way now (initial and incremental
+  data sizes, plus profile name and whether encryption is used, instead of
+  just initial size). Also, the description is shown, if it is in the
+  .seivot file. Also, some columns are left-aligned.
+
 Version 1.10, released 2011-07-20
 --------------------------------
 
diff --git a/README b/README
index ba3e1e5..961d072 100644
--- a/README
+++ b/README
@@ -11,11 +11,11 @@ Example:
         --initial-data=1m --incremental-data=1m --generations=2 \
         --output=foo.seivot
 
-Use the --use-sftp option to simulate backups over a network. This happens
-over localhost, so it's hardly a realistic simulation, but it at least
-measures the overhead of using SFTP over direct file access. You need
-to have ssh configured for localhost access, either via a passwordless
-key or ssh-agent.
+Use the --use-sftp-root and --use-sftp-repository options to simulate 
+backups over a network. This happens over localhost, so it's hardly a 
+realistic simulation, but it at least measures the overhead of using 
+SFTP over direct file access. You need to have ssh configured for 
+localhost access, either via a passwordless key or ssh-agent.
 
 Legalese
 --------
diff --git a/debian/changelog b/debian/changelog
index d2402f9..ae94d34 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+seivot (1.11-1) unstable; urgency=low
+
+  * New upstream release.
+  * Updated packaging for dh_python2.
+  * Updated package description.
+  * Added Homepage: field.
+  * Add python-cliapp to Build-Depends and Depends.
+
+ -- Lars Wirzenius <liw@liw.fi>  Wed, 03 Aug 2011 14:42:41 +0100
+
 seivot (1.10-1) unstable; urgency=low
 
   * New upstream release. This is the first release to be uploaded to
diff --git a/debian/control b/debian/control
index 0446f44..d0b7504 100644
--- a/debian/control
+++ b/debian/control
@@ -3,17 +3,22 @@ Maintainer: Lars Wirzenius <liw@liw.fi>
 Section: devel
 Priority: optional
 Standards-Version: 3.9.2
-Build-Depends: debhelper (>= 7.3.8), python-support (>= 1.0.3), python (>= 2.5)
+Build-Depends: debhelper (>= 7.3.8), python (>= 2.6.6-3~), 
+    python-cliapp (>= 0.15)
+X-Python-Version: >= 2.6
+Homepage: http://liw.fi/seivot/
 
 Package: seivot
 Architecture: all
-Depends: ${shlibs:Depends}, ${python:Depends}, ${misc:Depends}, gnuplot
+Depends: ${shlibs:Depends}, ${python:Depends}, ${misc:Depends}, gnuplot,
+    python-cliapp (>= 0.15)
 Description: benchmark program for backup software
  seivot generates synthetic test data and backs it up using the
  desired backup tool. It then modifies the test data, and makes
  further backups. It also does restores, verifications, and
  forgets backup generations. It measures the runtime and memory
- usage of each run of the backu program.
+ usage of each run of the backup program.
  .
- Originally written for Obnam, seivot aims to be useful for
- benchmarking many backup programs.
+ seivot currently works only for obnam, but welcomes patches for
+ other backup programs.
+
diff --git a/debian/rules b/debian/rules
index 759aca4..7bc1204 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,7 @@
 #!/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/seivot/usr
+	python setup.py install --prefix=debian/seivot/usr --install-layout=deb
diff --git a/setup.py b/setup.py
index 0cd8507..2ec9d37 100644
--- a/setup.py
+++ b/setup.py
@@ -1,6 +1,6 @@
 #!/usr/bin/python
 # setup.py - Python distutils module for Seivot
-# Copyright (C) 2008  Lars Wirzenius, Richard Braakman
+# Copyright (C) 2008, 2011  Lars Wirzenius, Richard Braakman
 # 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -16,11 +16,37 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 from distutils.core import setup
+import glob
 
 setup(name='seivot',
-      version='1.10',
+      version='1.11',
       description='Backup software benchmark software',
+      long_description='''\
+seivot generates synthetic test data and backs it up using the
+desired backup tool. It then modifies the test data, and makes
+further backups. It also does restores, verifications, and
+forgets backup generations. It measures the runtime and memory
+usage of each run of the backup program.
+
+seivot currently works only for obnam, but welcomes patches for
+other backup programs.
+''',
+      classifiers=[
+        'Development Status :: 4 - Beta',
+        'Environment :: Console',
+        'Intended Audience :: Developers',
+        'Intended Audience :: System Administrators',
+        'License :: OSI Approved :: GNU General Public License (GPL)',
+        'Operating System :: Unix',
+        'Programming Language :: Python :: 2',
+        'Topic :: Software Development :: Testing',
+        'Topic :: System :: Archiving :: Backup',
+        'Topic :: System :: Benchmark',
+      ],
       author='Lars Wirzenius',
       author_email='liw@liw.fi',
+      url='http://liw.fi/seivot/',
       scripts=['seivot', 'seivots-summary'],
+      data_files=[('share/man/man1', glob.glob('*.1'))],
      )
+