Merge branch '1.2.x' into 1.3.x

[catacomb-python] / setup.py

diff --git a/setup.py b/setup.py
index 80a154772a0504041c2e2793d3588c25d69e03d0..d7781775a5d3e8f63594f13bf38f8a6183040421 100755 (executable)
--- a/setup.py
+++ b/setup.py
@@ -3,8 +3,8 @@
 import distutils.core as DC
 import mdwsetup as MS
 
 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.2.2.1')

 
 cat = DC.Extension('catacomb._base',
                    ['catacomb.c', 'bytestring.c', 'buffer.c',
 
 cat = DC.Extension('catacomb._base',
                    ['catacomb.c', 'bytestring.c', 'buffer.c',


@@ -23,7 +23,8 @@ MS.setup(name = 'catacomb-python',
          author_email = 'mdw@distorted.org.uk',
          license = 'GNU General Public License',
          packages = ['catacomb'],
          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')],
          unittest_dir = "t",
          unittests = ["t-misc", "t-algorithms", "t-bytes", "t-buffer",
          genfiles = [MS.Generate('algorithms.h')],
          unittest_dir = "t",
          unittests = ["t-misc", "t-algorithms", "t-bytes", "t-buffer",