Merge branch '1.3.x' into HEAD

[catacomb-python] / setup.py

diff --git a/setup.py b/setup.py
index 89a56b8..8ac72ab 100755 (executable)
--- a/setup.py
+++ b/setup.py
@@ -3,8 +3,8 @@
 import distutils.core as DC
 import mdwsetup as MS
 
-MS.pkg_config('catacomb', '2.3.0.1+4')
-MS.pkg_config('mLib', '2.0.4')
+MS.pkg_config('catacomb', '2.5.0')
+MS.pkg_config('mLib', '2.4.99~')
 
 cat = DC.Extension('catacomb._base',
                    ['catacomb.c', 'bytestring.c', 'buffer.c',
@@ -18,12 +18,17 @@ cat = DC.Extension('catacomb._base',
 
 MS.setup(name = 'catacomb-python',
          description = 'Interface to Catacomb cryptographic library',
-         url = 'http://www.distorted.org.uk/~mdw/Catacomb-2.1.0',
+         url = 'https://git.distorted.org.uk/~mdw/catacomb-python/',
          author = 'Straylight/Edgeware',
          author_email = 'mdw@distorted.org.uk',
          license = 'GNU General Public License',
          packages = ['catacomb'],
-         scripts = ['pwsafe'],
-         data_files = [('share/man/man1', ['pwsafe.1'])],
+         scripts = ['pock', 'pwsafe'],
+         data_files = [('share/man/man1', ['pock.1', 'pwsafe.1'])],
          genfiles = [MS.Generate('algorithms.h')],
+         unittest_dir = "t",
+         unittests = ["t-misc", "t-algorithms", "t-bytes", "t-buffer",
+                      "t-convert", "t-ec", "t-field", "t-group", "t-key",
+                      "t-mp", "t-passphrase", "t-pgen", "t-pubkey",
+                      "t-rand", "t-rat", "t-share"],
          ext_modules = [cat])