diff options
| author | Kali Kaneko <kali@leap.se> | 2013-08-28 18:25:12 +0200 |
|---|---|---|
| committer | Kali Kaneko <kali@leap.se> | 2013-08-29 16:26:15 +0200 |
| commit | 6935fb90ac66833f4b9f20aae24465f7e6d6ebb4 (patch) | |
| tree | f1153febb64c9438fa9c1e25692c63fd9f251374 | |
| parent | 1ef39cfbe6680065126fbe636eca6a74389d9b91 (diff) | |
fix namespace
| -rw-r--r-- | debian/__init__.py | 6 | ||||
| -rw-r--r-- | debian/pydist-overrides | 1 | ||||
| -rwxr-xr-x | debian/rules | 13 | ||||
| -rw-r--r-- | debian/soledad-client.pyremove | 1 | ||||
| -rw-r--r-- | debian/soledad-common.pyremove | 1 | ||||
| -rw-r--r-- | debian/soledad-server.pyremove | 1 |
6 files changed, 20 insertions, 3 deletions
diff --git a/debian/__init__.py b/debian/__init__.py new file mode 100644 index 00000000..f48ad105 --- /dev/null +++ b/debian/__init__.py @@ -0,0 +1,6 @@ +# See http://peak.telecommunity.com/DevCenter/setuptools#namespace-packages +try: + __import__('pkg_resources').declare_namespace(__name__) +except ImportError: + from pkgutil import extend_path + __path__ = extend_path(__path__, __name__) diff --git a/debian/pydist-overrides b/debian/pydist-overrides index 26984829..c1b27213 100644 --- a/debian/pydist-overrides +++ b/debian/pydist-overrides @@ -1,4 +1,5 @@ pysqlcipher python-sqlcipher +PyOpenSSL python-openssl leap.soledad.common soledad-common leap.soledad.server soledad-server leap.soledad.client soledad-client diff --git a/debian/rules b/debian/rules index b1301dde..a5f1aa27 100755 --- a/debian/rules +++ b/debian/rules @@ -1,7 +1,10 @@ #!/usr/bin/make -f +# Uncomment this to turn on verbose mode. +#DH_VERBOSE=1 + %: - dh $@ --with python2 + dh $@ --with python2 --namespace=leap.soledad override_dh_auto_clean: cd client && python setup.py clean -a @@ -13,5 +16,9 @@ override_dh_auto_install: cd server && python setup.py install --root=../debian/soledad-server cd client && python setup.py install --root=../debian/soledad-client - - +override_dh_install: + # leap.soledad provides the leap.soledad namespace __init__.py + for pv in $(shell pyversions -vr debian/control); do \ + cp common/src/leap/__init__.py debian/soledad-common/usr/local/lib/python$$pv/*-packages/leap/; \ + cp common/src/leap/__init__.py debian/soledad-common/usr/local/lib/python$$pv/*-packages/leap/soledad/; \ + done diff --git a/debian/soledad-client.pyremove b/debian/soledad-client.pyremove new file mode 100644 index 00000000..936da7d3 --- /dev/null +++ b/debian/soledad-client.pyremove @@ -0,0 +1 @@ +*.pth diff --git a/debian/soledad-common.pyremove b/debian/soledad-common.pyremove new file mode 100644 index 00000000..936da7d3 --- /dev/null +++ b/debian/soledad-common.pyremove @@ -0,0 +1 @@ +*.pth diff --git a/debian/soledad-server.pyremove b/debian/soledad-server.pyremove new file mode 100644 index 00000000..936da7d3 --- /dev/null +++ b/debian/soledad-server.pyremove @@ -0,0 +1 @@ +*.pth |