Merge remote-tracking branch 'origin/develop' into debian

Conflicts:
	client/src/leap/__init__.py
	client/src/leap/soledad/client/__init__.py
	client/src/leap/soledad/client/auth.py
	client/src/leap/soledad/client/crypto.py
	client/src/leap/soledad/client/shared_db.py
	client/src/leap/soledad/client/sqlcipher.py
	client/src/leap/soledad/client/target.py
	common/src/leap/soledad/common/couch.py
	common/src/leap/soledad/common/crypto.py
	common/src/leap/soledad/common/objectstore.py
	common/src/leap/soledad/common/tests/__init__.py
	common/src/leap/soledad/common/tests/couchdb.ini.template
	common/src/leap/soledad/common/tests/test_couch.py
	common/src/leap/soledad/common/tests/test_server.py
	common/src/leap/soledad/common/tests/test_soledad.py
	common/src/leap/soledad/common/tests/test_sqlcipher.py
	common/src/leap/soledad/common/tests/test_target.py
	common/src/leap/soledad/common/tests/u1db_tests/README
	common/src/leap/soledad/common/tests/u1db_tests/__init__.py
	common/src/leap/soledad/common/tests/u1db_tests/test_backends.py
	common/src/leap/soledad/common/tests/u1db_tests/test_document.py
	common/src/leap/soledad/common/tests/u1db_tests/test_http_app.py
	common/src/leap/soledad/common/tests/u1db_tests/test_http_client.py
	common/src/leap/soledad/common/tests/u1db_tests/test_http_database.py
	common/src/leap/soledad/common/tests/u1db_tests/test_https.py
	common/src/leap/soledad/common/tests/u1db_tests/test_open.py
	common/src/leap/soledad/common/tests/u1db_tests/test_remote_sync_target.py
	common/src/leap/soledad/common/tests/u1db_tests/test_sqlite_backend.py
	common/src/leap/soledad/common/tests/u1db_tests/test_sync.py
	common/src/leap/soledad/common/tests/u1db_tests/testing-certs/Makefile
	common/src/leap/soledad/common/tests/u1db_tests/testing-certs/cacert.pem
	common/src/leap/soledad/common/tests/u1db_tests/testing-certs/testing.cert
	common/src/leap/soledad/common/tests/u1db_tests/testing-certs/testing.key
	pkg/soledad
	server/pkg/soledad
	server/setup.py
	server/src/leap/soledad/server/auth.py
	setup.py
	soledad/setup.py
	soledad/src/leap/__init__.py
	soledad/src/leap/soledad/__init__.py
	soledad/src/leap/soledad/auth.py
	soledad/src/leap/soledad/crypto.py
	soledad/src/leap/soledad/shared_db.py
	soledad/src/leap/soledad/sqlcipher.py
	soledad/src/leap/soledad/target.py
	soledad/src/leap/soledad/tests/__init__.py
	soledad/src/leap/soledad/tests/couchdb.ini.template
	soledad/src/leap/soledad/tests/test_couch.py
	soledad/src/leap/soledad/tests/test_crypto.py
	soledad/src/leap/soledad/tests/test_server.py
	soledad/src/leap/soledad/tests/test_soledad.py
	soledad/src/leap/soledad/tests/test_sqlcipher.py
	soledad/src/leap/soledad/tests/test_target.py
	soledad/src/leap/soledad/tests/u1db_tests/README
	soledad/src/leap/soledad/tests/u1db_tests/__init__.py
	soledad/src/leap/soledad/tests/u1db_tests/test_backends.py
	soledad/src/leap/soledad/tests/u1db_tests/test_document.py
	soledad/src/leap/soledad/tests/u1db_tests/test_http_app.py
	soledad/src/leap/soledad/tests/u1db_tests/test_http_client.py
	soledad/src/leap/soledad/tests/u1db_tests/test_http_database.py
	soledad/src/leap/soledad/tests/u1db_tests/test_https.py
	soledad/src/leap/soledad/tests/u1db_tests/test_open.py
	soledad/src/leap/soledad/tests/u1db_tests/test_remote_sync_target.py
	soledad/src/leap/soledad/tests/u1db_tests/test_sqlite_backend.py
	soledad/src/leap/soledad/tests/u1db_tests/test_sync.py
	soledad/src/leap/soledad/tests/u1db_tests/testing-certs/Makefile
	soledad/src/leap/soledad/tests/u1db_tests/testing-certs/cacert.pem
	soledad/src/leap/soledad/tests/u1db_tests/testing-certs/testing.cert
	soledad/src/leap/soledad/tests/u1db_tests/testing-certs/testing.key
	soledad_server/pkg/soledad
	soledad_server/src/leap/soledad_server/auth.py
	soledad_server/src/leap/soledad_server/couch.py
	soledad_server/src/leap/soledad_server/objectstore.py
	src/leap/__init__.py
	src/leap/soledad/__init__.py
	src/leap/soledad/auth.py
	src/leap/soledad/backends/couch.py
	src/leap/soledad/backends/leap_backend.py
	src/leap/soledad/backends/objectstore.py
	src/leap/soledad/backends/sqlcipher.py
	src/leap/soledad/crypto.py
	src/leap/soledad/server.py
	src/leap/soledad/shared_db.py
	src/leap/soledad/tests/__init__.py
	src/leap/soledad/tests/couchdb.ini.template
	src/leap/soledad/tests/test_couch.py
	src/leap/soledad/tests/test_leap_backend.py
	src/leap/soledad/tests/test_server.py
	src/leap/soledad/tests/test_soledad.py
	src/leap/soledad/tests/test_sqlcipher.py
	src/leap/soledad/tests/u1db_tests/README
	src/leap/soledad/tests/u1db_tests/__init__.py
	src/leap/soledad/tests/u1db_tests/test_backends.py
	src/leap/soledad/tests/u1db_tests/test_document.py
	src/leap/soledad/tests/u1db_tests/test_http_app.py
	src/leap/soledad/tests/u1db_tests/test_http_client.py
	src/leap/soledad/tests/u1db_tests/test_http_database.py
	src/leap/soledad/tests/u1db_tests/test_https.py
	src/leap/soledad/tests/u1db_tests/test_open.py
	src/leap/soledad/tests/u1db_tests/test_remote_sync_target.py
	src/leap/soledad/tests/u1db_tests/test_sqlite_backend.py
	src/leap/soledad/tests/u1db_tests/test_sync.py
	src/leap/soledad/tests/u1db_tests/testing-certs/Makefile
	src/leap/soledad/tests/u1db_tests/testing-certs/cacert.pem
	src/leap/soledad/tests/u1db_tests/testing-certs/testing.cert
	src/leap/soledad/tests/u1db_tests/testing-certs/testing.key

1 files changed, 81 insertions, 0 deletions

diff --git a/server/setup.py b/server/setup.py
new file mode 100644
index 00000000..89354a57
--- /dev/null
+++ b/server/setup.py
@@ -0,0 +1,81 @@
+# -*- coding: utf-8 -*-
+# setup.py
+# Copyright (C) 2013 LEAP
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+
+import os
+from setuptools import (
+    setup,
+    find_packages
+)
+
+
+install_requirements = [
+    'configparser',
+    'couchdb',
+    'simplejson',
+    'twisted>=12.0.0',  # TODO: maybe we just want twisted-web?
+    'oauth',  # this is not strictly needed by us, but we need it
+              # until u1db adds it to its release as a dep.
+    'u1db',
+    'routes',
+    'PyOpenSSL',
+    'leap.soledad.common>=0.3.0',
+]
+
+
+if os.environ.get('VIRTUAL_ENV', None):
+    data_files = None
+else:
+    # XXX this should go only for linux/mac
+    data_files = [("/etc/init.d/", ["pkg/soledad"])]
+
+
+trove_classifiers = (
+    "Development Status :: 3 - Alpha",
+    "Intended Audience :: Developers",
+    "License :: OSI Approved :: "
+    "GNU General Public License v3 or later (GPLv3+)",
+    "Environment :: Console",
+    "Operating System :: OS Independent",
+    "Operating System :: POSIX",
+    "Programming Language :: Python :: 2.6",
+    "Programming Language :: Python :: 2.7",
+    "Topic :: Database :: Front-Ends",
+    "Topic :: Software Development :: Libraries :: Python Modules"
+)
+
+
+setup(
+    name='leap.soledad.server',
+    version='0.3.0',
+    url='https://leap.se/',
+    license='GPLv3+',
+    description='Synchronization of locally encrypted data among devices.',
+    author='The LEAP Encryption Access Project',
+    author_email='info@leap.se',
+    long_description=(
+        "Soledad is the part of LEAP that allows application data to be "
+        "securely shared among devices. It provides, to other parts of the "
+        "LEAP client, an API for data storage and sync."
+    ),
+    namespace_packages=["leap", "leap.soledad"],
+    packages=find_packages('src'),
+    package_dir={'': 'src'},
+    install_requires=install_requirements,
+    data_files=data_files,
+    classifiers=trove_classifiers,
+)