debian: Just the one Python version now.

Debian doesn't provide Pyrex for all the Python versions available any
more, so we can't build for them either.

diff --git a/debian/control b/debian/control
index d0a0e61d7e2104974a103e1e2d50ba51eaa70d4e..397b6ff9d361de59b2057891f6dd902f051cfbea 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -1,33 +1,11 @@
 Source: python-mlib
 Section: python
 Priority: extra
-Build-Depends: mlib-dev, 
-  python, python2.3, python2.3-pyrex, python2.4, python2.4-pyrex
+Build-Depends: mlib-dev, python, python-pyrex
 Maintainer: Mark Wooding <mdw@distorted.org.uk>
 Standards-Version: 3.1.1
 
 Package: python-mlib
-Architecture: all
-Depends: ${python:Depends}
-Description: A library of miscellaneous stuff
- The mLib library provides various handy utilities, including
-   * yet another options parser, like GNU getopt but more so;
-   * a simple but efficient universal hashing family;
-   * a suite for writing event-driven select-based servers;
-   * a simple exception-handling system, based on longjmp;
-   * dynamically resizing strings and arrays;
-   * a resizing hashtable;
-   * base64 and hex encoding and decoding; and
-   * a simple background DNS resolver.
- .
- This is a dummy package to pull in the right bindings for the default Debian
- version of Python.
- .
- Not all of the features of mLib are available (or, indeed, very useful) in
- Python.  For example, Python has its own exception system, and different
- ideas about how strings work.
-
-Package: python2.3-mlib
 Architecture: any
 Depends: ${shlibs:Depends}, ${python:Depends}
 Description: A library of miscellaneous stuff
@@ -41,28 +19,6 @@ Description: A library of miscellaneous stuff
    * base64 and hex encoding and decoding; and
    * a simple background DNS resolver.
  .
- This package provides Python bindings for mLib, for Python version 2.3.
- .
- Not all of the features of mLib are available (or, indeed, very useful) in
- Python.  For example, Python has its own exception system, and different
- ideas about how strings work.
-
-Package: python2.4-mlib
-Architecture: any
-Depends: ${shlibs:Depends}, ${python:Depends}
-Description: A library of miscellaneous stuff
- The mLib library provides various handy utilities, including
-   * yet another options parser, like GNU getopt but more so;
-   * a simple but efficient universal hashing family;
-   * a suite for writing event-driven select-based servers;
-   * a simple exception-handling system, based on longjmp;
-   * dynamically resizing strings and arrays;
-   * a resizing hashtable;
-   * base64 and hex encoding and decoding; and
-   * a simple background DNS resolver.
- .
- This package provides Python bindings for mLib, for Python version 2.4.
- .
  Not all of the features of mLib are available (or, indeed, very useful) in
  Python.  For example, Python has its own exception system, and different
  ideas about how strings work.

diff --git a/debian/rules b/debian/rules
index 71ecddac2165d448ba875c0be16dac164e97d17a..d6450e1ba2f1d2c05e096e293e979486e728e129 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -2,13 +2,10 @@
 
 export DH_COMPAT = 4
 
-DEFVERSION = 2.3
-VERSIONS = $(DEFVERSION) 2.4
-
 build: build-stamp
 
 build-stamp:
-       for v in $(VERSIONS); do python$$v setup.py build; done
+       python setup.py build
        touch build-stamp
 
 clean:
@@ -18,23 +15,8 @@ clean:
 
 install: build
        dh_clean
-       for v in $(VERSIONS); do \
-         python$$v setup.py build; \
-         python$$v setup.py install --root=debian/python$$v-mlib; \
-       done
-       mkdir -p debian/python-mlib
-
-binary-indep: install
-       dh_testdir -i
-       dh_testroot -i
-       dh_compress -i
-       dh_installdocs -i
-       dh_python -i
-       dh_gencontrol -i
-       dh_fixperms -i
-       dh_installdeb -i
-       dh_md5sums -i
-       dh_builddeb -i
+       python setup.py build
+       python setup.py install --root=debian/python-mlib
 
 binary-arch: install
        dh_testdir -a
@@ -50,7 +32,7 @@ binary-arch: install
        dh_md5sums -a
        dh_builddeb -a
 
-binary: binary-indep binary-arch
+binary: binary-arch
 
 source:
        rm -rf dist/*.tar.gz dist/=deb=