summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Wirzenius <liw@liw.fi>2011-03-21 08:29:45 +0000
committerLars Wirzenius <liw@liw.fi>2011-03-21 08:29:45 +0000
commit17c0d9062ce45848571d91bc73b68adb9c1b13bc (patch)
tree2b79a1753d35673bc07b468cf222249bdc85ab9a
parentf4aed629863a7b7838a2c032a8aa8024565daaea (diff)
downloadobnam-17c0d9062ce45848571d91bc73b68adb9c1b13bc.tar.gz
Fix setup.py so it works under pbuilder, by not importing obnamlib.version_0_15_1
-rw-r--r--NEWS6
-rw-r--r--debian/changelog6
-rw-r--r--obnamlib/__init__.py2
-rw-r--r--setup.py4
4 files changed, 14 insertions, 4 deletions
diff --git a/NEWS b/NEWS
index fdc2b7db..30a888f6 100644
--- a/NEWS
+++ b/NEWS
@@ -5,6 +5,12 @@ Obnam NEWS
This file summarizes changes between releases of Obnam.
+Version 0.15.1, released 2011-03-21; an ALPHA release
+----------------------------------------------------
+
+* Fix `setup.py` to not import `obnamlib`, so it works when building under
+ pbuilder on Debian. Meh.
+
Version 0.15, released 2011-03-21; an ALPHA release
----------------------------------------------------
diff --git a/debian/changelog b/debian/changelog
index a7e2ddcc..fe8038ee 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+obnam (0.15.1) squeeze; urgency=low
+
+ * New upstream version.
+
+ -- Lars Wirzenius <liw@liw.fi> Mon, 21 Mar 2011 08:29:05 +0000
+
obnam (0.15) squeeze; urgency=low
* New upstream release.
diff --git a/obnamlib/__init__.py b/obnamlib/__init__.py
index a08a664a..6aa5cb86 100644
--- a/obnamlib/__init__.py
+++ b/obnamlib/__init__.py
@@ -14,7 +14,7 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-version = '0.15'
+version = '0.15.1'
import _obnam
diff --git a/setup.py b/setup.py
index 9436aaaa..7fa72dd4 100644
--- a/setup.py
+++ b/setup.py
@@ -18,10 +18,8 @@
from distutils.core import setup, Extension
import glob
-import obnamlib
-
setup(name='obnam',
- version=obnamlib.version,
+ version='0.15.1',
description='Backup software',
author='Lars Wirzenius',
author_email='liw@liw.fi',