Merge lp:~nataliabidart/magicicada-server/protocol-link-magicicada-protocol into lp:magicicada-server

[Natalia Bidart]

- Restored protocol link in sourcedeps to point to magicicada-protocol folder and make the protocol wheel install in that folder.

[Natalia Bidart (nataliabidart)]

Trivial

review: Approve

=== modified file 'Makefile'
--- Makefile	2018-04-12 02:07:28 +0000
+++ Makefile	2018-04-13 14:25:56 +0000
@@ -101,7 +101,7 @@
 	test -d $(ENV) || virtualenv $(ENV)
 	$(ENV)/bin/pip install -Ur requirements.txt
 	$(ENV)/bin/pip install -Ur requirements-devel.txt
-	$(ENV)/bin/pip install ubuntuone-storageprotocol --no-deps -t $(TARGET_SOURCECODE_DIR)
+	$(ENV)/bin/pip install ubuntuone-storageprotocol --no-deps -t "$(TARGET_SOURCECODE_DIR)/magicicada-protocol"
 	touch $(ENV)/bin/activate
 
 raw-test:
 
=== modified symlink 'lib/ubuntuone/storageprotocol'
=== target changed u'../../.sourcecode/ubuntuone/storageprotocol' => u'../../.sourcecode/magicicada-protocol/ubuntuone/storageprotocol'