debian: Remove python-catacomb-bin package.

diff --git a/debian/control b/debian/control
index b3d3d58..05b7f46 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -1,16 +1,17 @@
 Source: catacomb-python
 Section: python
 Priority: extra
 Source: catacomb-python
 Section: python
 Priority: extra

-XS-Python-Version: >= 2.4, << 2.7
+XS-Python-Version: >= 2.5, << 2.7

 Maintainer: Mark Wooding <mdw@distorted.org.uk>
 Maintainer: Mark Wooding <mdw@distorted.org.uk>

-Build-Depends: catacomb-dev, python, python2.4-dev, python2.5-dev
+Build-Depends: catacomb-dev, python

 Standards-Version: 3.8.0
 
 Package: python-catacomb
 Architecture: any
 XB-Python-Version: ${python:Versions}
 Depends: ${shlibs:Depends}, ${python:Depends}
 Standards-Version: 3.8.0
 
 Package: python-catacomb
 Architecture: any
 XB-Python-Version: ${python:Versions}
 Depends: ${shlibs:Depends}, ${python:Depends}

-Provides: python2.4-catacomb, python2.5-catacomb, python2.6-catacomb
+Provides: ${python:Provides}, catacomb-python-bin
+Conflicts: catacomb-python-bin

 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
 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,21 +23,4 @@ Description: Python bindings for the Catacomb cryptographic library.
  relatively straightforward to audit for security.  Its focus is on
  clarity of source code and portability more than performance.
  .
  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 the Catacomb library.
-
-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
- 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 Catacomb-related utilities written in Python.
+ This package allows the Catacomb library to be used in Python programs.

diff --git a/debian/python-catacomb-bin.install b/debian/python-catacomb-bin.install
deleted file mode 100644 (file)
index 451ddc0..0000000
--- a/debian/python-catacomb-bin.install
+++ /dev/null
@@ -1 +0,0 @@
-debian/tmp/usr/bin

diff --git a/debian/python-catacomb.install b/debian/python-catacomb.install
deleted file mode 100644 (file)
index 80f0c2a..0000000
--- a/debian/python-catacomb.install
+++ /dev/null
@@ -1 +0,0 @@
-debian/tmp/usr/lib/python*