From 17f11fcfab463db6627747266c0ee525fa10e840 Mon Sep 17 00:00:00 2001 Message-Id: <17f11fcfab463db6627747266c0ee525fa10e840.1717050112.git.mdw@distorted.org.uk> From: Mark Wooding Date: Sat, 3 Oct 2009 23:25:07 +0100 Subject: [PATCH] debian: Switch to CDBS and build for Python 2.6. Organization: Straylight/Edgeware From: Mark Wooding Still seems to work. Somewhat surprising, really. --- .gitignore | 1 + debian/.gitignore | 7 ++- debian/changelog | 9 +++- debian/control | 48 ++++---------------- debian/python-catacomb-bin.install | 1 + debian/python-catacomb.install | 1 + debian/rules | 71 +++--------------------------- 7 files changed, 28 insertions(+), 110 deletions(-) create mode 100644 debian/python-catacomb-bin.install create mode 100644 debian/python-catacomb.install diff --git a/.gitignore b/.gitignore index 44f799c..7770be2 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ deb-build build-stamp COPYING algorithms.h +python-build-stamp-* diff --git a/debian/.gitignore b/debian/.gitignore index 8abb9a0..1e98f7c 100644 --- a/debian/.gitignore +++ b/debian/.gitignore @@ -5,8 +5,7 @@ substvars *.debhelper python-catacomb-bin python-catacomb -python2.3-catacomb -python2.4-catacomb - -python2.5-catacomb +python2.?-catacomb +compat +pycompat *.log diff --git a/debian/changelog b/debian/changelog index c2b7bdd..a75775a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,11 @@ -python-catacomb (1.0.0) experimental; urgency=low +catacomb-python (1.0.1) experimental; urgency=low + + * Make it work with Python 2.6. Also switched over to the (increasingly + winning) CDBS. + + -- Mark Wooding Sat, 03 Oct 2009 23:06:29 +0100 + +catacomb-python (1.0.0) experimental; urgency=low * Debianization! diff --git a/debian/control b/debian/control index e1382d4..6930e6e 100644 --- a/debian/control +++ b/debian/control @@ -1,13 +1,16 @@ -Source: python-catacomb +Source: catacomb-python Section: python Priority: extra +XS-Python-Version: >= 2.4, << 2.7 Maintainer: Mark Wooding -Build-Depends: catacomb-dev, python, python2.3-dev, python2.4-dev, python2.5-dev -Standards-Version: 3.1.1 +Build-Depends: catacomb-dev, python, python2.4-dev, python2.5-dev +Standards-Version: 3.8.0 Package: python-catacomb -Architecture: all -Depends: ${python:Depends} +Architecture: any +XB-Python-Version: ${python:Versions} +Depends: ${shlibs:Depends}, ${python:Depends} +Provides: python2.4-catacomb, python2.5-catacomb, python2.6-catacomb Description: Python bindings for the Catacomb cryptographic library. Catacomb is a cryptographic library. It implements a large number of encryption algorithms, hash functions, message authentication codes @@ -22,42 +25,9 @@ Description: Python bindings for the Catacomb cryptographic library. This is a dummy package for making sure you have the right package for the default Debian Python installation. -Package: python2.4-catacomb -Architecture: any -Depends: ${shlibs:Depends} -Description: Python bindings for the Catacomb cryptographic library. - Catacomb is a cryptographic library. It implements a large number of - encryption algorithms, hash functions, message authentication codes - and random number generators. It has a multi-precision maths library, - for implementing public key schemes such as RSA, DSA and Diffie-Hellman. - It contains rudimentary key-management tools. - . - The objective of Catacomb is to make a crypto library which is - relatively straightforward to audit for security. Its focus is on - clarity of source code and portability more than performance. - . - This package contains the Python bindings for Catacomb, for version 2.4 of - Python. - -Package: python2.5-catacomb -Architecture: any -Depends: ${shlibs:Depends} -Description: Python bindings for the Catacomb cryptographic library. - Catacomb is a cryptographic library. It implements a large number of - encryption algorithms, hash functions, message authentication codes - and random number generators. It has a multi-precision maths library, - for implementing public key schemes such as RSA, DSA and Diffie-Hellman. - It contains rudimentary key-management tools. - . - The objective of Catacomb is to make a crypto library which is - relatively straightforward to audit for security. Its focus is on - clarity of source code and portability more than performance. - . - This package contains the Python bindings for Catacomb, for version 2.5 of - Python. - Package: python-catacomb-bin Architecture: all +XB-Python-Version: ${python:Versions} Depends: python, python-catacomb Description: Catacomb utilities in Python Catacomb is a cryptographic library. It implements a large number of diff --git a/debian/python-catacomb-bin.install b/debian/python-catacomb-bin.install new file mode 100644 index 0000000..451ddc0 --- /dev/null +++ b/debian/python-catacomb-bin.install @@ -0,0 +1 @@ +debian/tmp/usr/bin diff --git a/debian/python-catacomb.install b/debian/python-catacomb.install new file mode 100644 index 0000000..80f0c2a --- /dev/null +++ b/debian/python-catacomb.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/python* diff --git a/debian/rules b/debian/rules index 8661a81..6ebce3c 100755 --- a/debian/rules +++ b/debian/rules @@ -1,70 +1,9 @@ #! /usr/bin/make -f -export DH_COMPAT = 4 +CDBS = /usr/share/cdbs/1 -DEFVERSION = 2.4 -VERSIONS = $(DEFVERSION) 2.5 - -build: build-stamp - -build-stamp: - for v in $(VERSIONS); do python$$v setup.py build; done - touch build-stamp - -clean: - dh_clean - make clean - rm -rf build build-stamp - -install: build - dh_clean - for v in $(VERSIONS); do \ - python$$v setup.py build; \ - python$$v setup.py install --root=debian/python$$v-catacomb; \ - done - mkdir -p debian/python-catacomb - mkdir -p debian/python-catacomb-bin/usr/bin - mv debian/python$(DEFVERSION)-catacomb/usr/bin/* \ - debian/python-catacomb-bin/usr/bin - for v in $(VERSIONS); do \ - rm -rf debian/python$$v-catacomb/usr/bin; \ - done - -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 - -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-indep binary-arch - -source: - rm -rf dist/*.tar.gz dist/=deb= - python$(DEFVERSION) 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 +DEB_PYTHON_SYSTEM = pycentral +include $(CDBS)/rules/debhelper.mk +include $(CDBS)/class/python-distutils.mk +###----- That's all, folks -------------------------------------------------- -- [mdw]