Support Python 2.6, and switch to CDBS.

We're going to resurrect a package.  Hold on tight.  Igor, throw the
switch...

It lives!

diff --git a/.gitignore b/.gitignore
new file mode 100644 (file)
index 0000000..2b483ce
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+python-build-stamp-*

diff --git a/debian/.gitignore b/debian/.gitignore
new file mode 100644 (file)
index 0000000..fc5a69d
--- /dev/null
+++ b/debian/.gitignore
@@ -0,0 +1,7 @@
+compat
+files
+pycompat
+*.debhelper
+*.log
+*.substvars
+python-cdb

diff --git a/debian/changelog b/debian/changelog
index 5e1e45c..86e998c 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+python-cdb (0.32-5.2) unstable; urgency=low
+
+  * Hack for python-2.6 support.
+
+ -- Mark Wooding <mdw@distorted.org.uk>  Sun, 04 Oct 2009 00:07:39 +0100
+
 python-cdb (0.32-5.1) unstable; urgency=low
 
   * NMU
@@ -35,6 +41,4 @@ python-cdb (0.32-1) unstable; urgency=low
 
  -- Adam D. McKenna <adam@debian.org>  Thu, 31 Jan 2002 14:12:03 -0800
 
-Local variables:
-mode: debian-changelog
-End:
+

diff --git a/debian/control b/debian/control
index e498b23..387c38f 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -1,18 +1,20 @@
 Source: python-cdb
-Section: contrib/python
-Priority: optional
-Maintainer: Adam D. McKenna <adam@debian.org>
-Build-Depends: debhelper (>> 3.0.0), python-dev (>= 2.3) | python2.3-dev
+Section: python
+Priority: extra
+XS-Python-Version: >= 2.4, << 2.7
+Maintainer: Mark Wooding <mdw@distorted.org.uk>
+Build-Depends: debhelper (>> 3.0.0)
 Standards-Version: 3.5.2
 
 Package: python-cdb
 Architecture: any
-Depends: ${python:Depends}
+XB-Python-Version: ${python:Versions}
+Depends: ${python:Depends}, ${shlibs:Depends}
 Description: Python CDB (constant database) library
  D. J. Bernstein's cdb library adapted as a python extension module. You 
  probably already know that cdb files are mappings of keys to values (c.f., 
  dbm and friends), designed for wickedly fast lookups and atomic updates.
  .
- This interface presents cdb files as (surprise!) mapping objects with a few 
- special features. In general, the module tries to mimic the functionality of 
+ This interface presents cdb files as (surprise!) mapping objects with a few
+ special features. In general, the module tries to mimic the functionality of
  the normal cdb utilities.

diff --git a/debian/rules b/debian/rules
index 2f88883..d340b2e 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -1,54 +1,9 @@
 #!/usr/bin/make -f
 
-export DH_COMPAT=3
+CDBS = /usr/share/cdbs/1
 
-configure: configure-stamp
-configure-stamp:
-       dh_testdir
-       touch configure-stamp
+DEB_PYTHON_SYSTEM = pycentral
+include $(CDBS)/rules/debhelper.mk
+include $(CDBS)/class/python-distutils.mk
 
-build: configure-stamp build-stamp
-build-stamp:
-       dh_testdir
-
-       python2.3 setup.py build
-
-       touch build-stamp
-
-clean:
-       dh_testdir
-       dh_testroot
-       rm -f build-stamp configure-stamp
-
-       rm -rf build dist
-
-       dh_clean
-
-install: build
-       dh_testdir
-       dh_testroot
-       dh_clean -k
-       dh_installdirs
-
-       python2.3 setup.py install --prefix=debian/python-cdb/usr
-
-binary-indep: build install
-
-binary-arch: build install
-       dh_testdir
-       dh_testroot
-       dh_installdocs
-       dh_installchangelogs ChangeLog
-       dh_link
-       dh_python
-       dh_strip
-       dh_compress
-       dh_fixperms
-       dh_installdeb
-       dh_shlibdeps
-       dh_gencontrol
-       dh_md5sums
-       dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure
+###----- That's all, folks --------------------------------------------------