X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/catacomb-python/blobdiff_plain/2286c78891bca3d23a645363277b6725afb2ab47..ecef1cafb862e99b5cb3c3ba958a903bbf70cc44:/setup.py

diff --git a/setup.py b/setup.py
old mode 100644
new mode 100755
index 927d1d2..bb6d2e1
--- a/setup.py
+++ b/setup.py
@@ -1,15 +1,10 @@
 #! /usr/bin/python
 
-import os as OS
-import subprocess as SUB
-
 import distutils.core as DC
 import mdwsetup as MS
 
-MS.pkg_config('catacomb', '2.1.1')
-MS.pkg_config('mLib', '2.0.4')
-
-MS.generate('algorithms.h')
+MS.pkg_config('catacomb', '2.4.2-70')
+MS.pkg_config('mLib', '2.2.2.1')
 
 cat = DC.Extension('catacomb._base',
                    ['catacomb.c', 'bytestring.c', 'buffer.c',
@@ -21,13 +16,14 @@ cat = DC.Extension('catacomb._base',
                    library_dirs = MS.uniquify(MS.LIBDIRS),
                    libraries = MS.uniquify(MS.LIBS))
 
-DC.setup(name = 'catacomb-python',
-         version = MS.auto_version(),
+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'],
+         scripts = ['pock', 'pwsafe'],
+         data_files = [('share/man/man1', ['pock.1', 'pwsafe.1'])],
+         genfiles = [MS.Generate('algorithms.h')],
          ext_modules = [cat])