From 8eb31d7a05fcdabf0d57ce0183a72818b157e6f4 Mon Sep 17 00:00:00 2001
From: drebs <drebs@leap.se>
Date: Mon, 19 Aug 2013 09:28:15 -0300
Subject: Update to new soledad package scheme.

---
 pkg/requirements.pip | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

(limited to 'pkg')

diff --git a/pkg/requirements.pip b/pkg/requirements.pip
index 7ec489d..ea59aaa 100644
--- a/pkg/requirements.pip
+++ b/pkg/requirements.pip
@@ -2,13 +2,5 @@ Twisted>=12.0.2
 paisley>=0.3.1
 ## XXX change me to whatever you name the package in pypi
 python-gnupg>=0.3.0
-leap.soledad
-leap.soledad_server
+leap.soledad.common>=0.3.0
 leap.keymanager>=0.2.0
-
-###############
-# Development #
-###############
-
-#leap.soledad  # make this a dep as soon as it is installable from pypi !!
--e git://github.com/andrejb/soledad.git@develop#egg=leap.soledad
-- 
cgit v1.2.3


From 0f1369ce34ff79d3b9a220b52b14182927a19c1c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1s=20Touceda?= <chiiph@leap.se>
Date: Thu, 22 Aug 2013 12:23:05 -0300
Subject: Use the right database

---
 pkg/mx.tac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'pkg')

diff --git a/pkg/mx.tac b/pkg/mx.tac
index cdebba7..c101de9 100755
--- a/pkg/mx.tac
+++ b/pkg/mx.tac
@@ -51,7 +51,7 @@ check_recipient_port = config.getint("check recipient", "port")
 
 cdb = couchdbhelper.ConnectedCouchDB(server,
                                      port=port,
-                                     dbName="users",
+                                     dbName="identities",
                                      username=user,
                                      password=password)
 
-- 
cgit v1.2.3