From 74b25de03c5ca78e1449ef59432675a0371412e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Bonhomme?= <cedric@cedricbonhomme.org>
Date: Mon, 5 Oct 2015 08:37:14 +0200
Subject: [PATCH] Added MANIFEST for pypi.

---
 MANIFEST.in | 12 ++++++++++++
 setup.cfg   |  2 ++
 setup.py    | 48 ++++++++++++++++++++++++++++++------------------
 3 files changed, 44 insertions(+), 18 deletions(-)
 create mode 100644 MANIFEST.in
 create mode 100644 setup.cfg

diff --git a/MANIFEST.in b/MANIFEST.in
new file mode 100644
index 0000000..8f02690
--- /dev/null
+++ b/MANIFEST.in
@@ -0,0 +1,12 @@
+#documentation
+recursive-include docs/ *
+
+#example files
+recursive-include examples/ *
+
+# binary files
+recursive-include bin/*
+
+#Misc
+include COPYING
+include requirements.txt
diff --git a/setup.cfg b/setup.cfg
new file mode 100644
index 0000000..b88034e
--- /dev/null
+++ b/setup.cfg
@@ -0,0 +1,2 @@
+[metadata]
+description-file = README.md
diff --git a/setup.py b/setup.py
index 8e62c44..74ea07b 100644
--- a/setup.py
+++ b/setup.py
@@ -1,47 +1,59 @@
 #!/usr/bin/python
 # -*- coding: utf-8 -*-
 
-import setuptools
 import os
+import sys
 import shutil
 
-from distutils.core import setup, Extension
+try:
+    from setuptools import setup
+except ImportError:
+    from distutils.core import setup
+
+packages = [
+    'stegano',
+    'stegano.exif',
+    'bin'
+]
 
 requires = ['pillow']
 
-kw = {'install_requires': requires}
-
-def read(fname):
-    return open(os.path.join(os.path.dirname(__file__), fname)).read()
+with open('README.md', 'r') as f:
+    readme = f.read()
 
 setup(
     name='Stegano',
     version='0.4',
     author='Cédric Bonhomme',
     author_email='cedric@cedricbonhomme.org',
-    packages=['stegano'],
+    packages=packages,
+    include_package_data=True,
     #scripts=[''],
     url='https://bitbucket.org/cedricbonhomme/stegano',
-    long_description=read('README.md'),
+    description='A Python Steganography module.',
+    long_description=readme,
     platforms = ['Linux'],
     license='GPLv3',
-    description='A Python Steganography module.',
+    install_requires=requires,
+    zip_safe=False,
     classifiers=[
         "Development Status :: 4 - Beta",
         "Environment :: Console",
         "Topic :: Utilities",
         "Operating System :: OS Independent",
+        "Programming Language :: Python :: 2.7",
+        "Programming Language :: Python :: 3.4",
         "License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)"
-    ],
-    **kw
+    ]
 )
 
-print("Installing binaries")
-shutil.copy2("./bin/slsb-set", "/bin/slsb-set")
-shutil.copymode("./bin/slsb-set", "/bin/slsb-set")
+if sys.argv[-1] == "install":
+    print("Installing binaries")
+    shutil.copy2("./bin/slsb-set", "/bin/slsb-set")
+    shutil.copymode("./bin/slsb-set", "/bin/slsb-set")
 
-shutil.copy2("./bin/slsb", "/bin/slsb")
-shutil.copymode("./bin/slsb", "/bin/slsb")
+    shutil.copy2("./bin/slsb", "/bin/slsb")
+    shutil.copymode("./bin/slsb", "/bin/slsb")
 
-shutil.copy2("./bin/steganalysis-parity", "/bin/steganalysis-parity")
-shutil.copymode("./bin/steganalysis-parity", "/bin/steganalysis-parity")
+    shutil.copy2("./bin/steganalysis-parity", "/bin/steganalysis-parity")
+    shutil.copymode("./bin/steganalysis-parity", "/bin/steganalysis-parity")