diff options
| author | Micah Anderson <micah@riseup.net> | 2013-08-29 13:52:38 -0400 |
|---|---|---|
| committer | Micah Anderson <micah@riseup.net> | 2013-08-29 13:52:38 -0400 |
| commit | 2e0b170edd8dd59215d588b570c315cebdbabcfa (patch) | |
| tree | bb66e29941df0db548457e9463f4c80986574f78 /debian | |
| parent | e73ea3d9b7bf104e35068b1072c9b3f34e195106 (diff) | |
| parent | 7d0583675dd68ada3d8b2f20d45264fb267146c8 (diff) | |
Merge remote-tracking branch 'kali/bug/fix-namespace' into debian
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/__init__.py | 6 | ||||
| -rw-r--r-- | debian/changelog | 8 | ||||
| -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 |
7 files changed, 28 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/changelog b/debian/changelog index 1a9d130b..7745afa9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +soledad (0.3.1.1) unstable; urgency=low + + [ Ben Carrillo ] + * Fix installation of __init__ file on namespace module. + * Add LICENSE. + + -- Micah Anderson <micah@debian.org> Mon, 26 Aug 2013 18:21:09 +0200 + soledad (0.3.1) unstable; urgency=low [ Ben Carrillo ] 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 abe080c6..c66ed435 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 common && python setup.py install --root=../debian/soledad-common cd server && LEAP_SKIP_INIT=1 python setup.py install --root=../debian/soledad-server - - +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 |