debian: Switch to CDBS and support Python 2.6.

diff --git a/.gitignore b/.gitignore
index 6fec8e191a57b73d578188e8ede406b8021e5247..a982f4458dee762d894f9323daa26b24df7cdaf9 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -17,5 +17,5 @@ build
 MANIFEST
 dist
 mLib.c
-
 COPYING
+python-build-stamp-*

diff --git a/debian/.gitignore b/debian/.gitignore
index 8cc7db2b7046381be238b25bd260255cdedf6858..7905076b08f7077f6f757b50352f80b927678dea 100644 (file)
--- a/debian/.gitignore
+++ b/debian/.gitignore
@@ -3,7 +3,7 @@ tmp
 substvars
 *.substvars
 *.debhelper
+*.log
+compat
+pycompat
 python-mlib
-python2.3-mlib
-python2.4-mlib
-

diff --git a/debian/changelog b/debian/changelog
index 9865ad9f29c00d0e7db38eb80eedcef95f6f796c..13635419773868301e43b656ef0efa6a5f438b8e 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,12 @@
-python-mlib (1.0.0) experimental; urgency=low
+mlib-python (1.0.1) experimental; urgency=low
+
+  * Switch to CDBS and support Python 2.6
+  * Support (glorious!) mdup function.
+
+ -- Mark Wooding <mdw@distorted.org.uk>  Sun, 04 Oct 2009 00:32:29 +0100
+
+mlib-python (1.0.0) experimental; urgency=low
 
   * Debianization!
 
- -- Mark Wooding <mdw@distorted.org.uk>  Mon, 23 Jul 2007 16:02:27 +0100
+ -- Mark Wooding <mdw@distorted.org.uk>  Sun, 04 Oct 2009 00:31:21 +0100

diff --git a/debian/control b/debian/control
index 397b6ff9d361de59b2057891f6dd902f051cfbea..92313f0f99ef2a68d8d1401b87c805e2210b040e 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -1,13 +1,15 @@
-Source: python-mlib
+Source: mlib-python
 Section: python
 Priority: extra
+XS-Python-Version: >= 2.4, << 2.7
 Build-Depends: mlib-dev, python, python-pyrex
 Maintainer: Mark Wooding <mdw@distorted.org.uk>
-Standards-Version: 3.1.1
+Standards-Version: 3.8.0
 
 Package: python-mlib
 Architecture: any
 Depends: ${shlibs:Depends}, ${python:Depends}
+XB-Python-Version: ${python:Versions}
 Description: A library of miscellaneous stuff
  The mLib library provides various handy utilities, including
    * yet another options parser, like GNU getopt but more so;

diff --git a/debian/rules b/debian/rules
index d6450e1ba2f1d2c05e096e293e979486e728e129..6ebce3c90c180e385161cabc01ad6741350360b4 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -1,45 +1,9 @@
 #! /usr/bin/make -f
 
-export DH_COMPAT = 4
+CDBS = /usr/share/cdbs/1
 
-build: build-stamp
+DEB_PYTHON_SYSTEM = pycentral
+include $(CDBS)/rules/debhelper.mk
+include $(CDBS)/class/python-distutils.mk
 
-build-stamp:
-       python setup.py build
-       touch build-stamp
-
-clean:
-       dh_clean
-       make clean
-       rm -rf build build-stamp
-
-install: build
-       dh_clean
-       python setup.py build
-       python setup.py install --root=debian/python-mlib
-
-binary-arch: install
-       dh_testdir -a
-       dh_testroot -a
-       dh_compress -a
-       dh_installdocs -a
-       dh_strip -a
-       dh_shlibdeps -a
-       dh_python -a
-       dh_gencontrol -a
-       dh_fixperms -a
-       dh_installdeb -a
-       dh_md5sums -a
-       dh_builddeb -a
-
-binary: binary-arch
-
-source:
-       rm -rf dist/*.tar.gz dist/=deb=
-       python setup.py sdist
-       mkdir dist/=deb=
-       cd dist/=deb=; tar xvfz ../*.tar.gz
-       d=`pwd`; cd ..; dpkg-source -i -i'/\.svn/' -b $$d/dist/=deb=/*
-       rm -rf dist/=deb=
-
-.PHONY: binary binary-arch binary-indep clean install source build
+###----- That's all, folks --------------------------------------------------