summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorKali Kaneko <kali@leap.se>2016-05-18 12:28:37 -0400
committerKali Kaneko <kali@leap.se>2016-05-18 12:28:37 -0400
commit09568a70ef68a4ef121d9e79fdc5366c4297544e (patch)
treeb8d4358f8bf9c65876961676a603f4d42b59cdb7 /debian
parent0673e3e3f70ebd3e0716c48966c5b3b75ed4f952 (diff)
parent4ca544212c3f5af08fdbad06133b0b443f6dfa02 (diff)
Merge branch 'debian/experimental' into debian/platform-0.8debian/platform-0.8
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog11
-rw-r--r--debian/control6
2 files changed, 8 insertions, 9 deletions
diff --git a/debian/changelog b/debian/changelog
index 99d1b94f..a164bda0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,15 +1,14 @@
soledad (0.8.0) unstable; urgency=medium
- * Release of soledad 0.8.0
+ * Update to 0.8.0 release
- -- Ben Carrillo <ben@futeisha.org> Wed, 04 May 2016 11:36:35 -0400
+ -- Ben Carrillo <ben@futeisha.org> Mon, 25 Apr 2016 21:08:20 -0400
-soledad (0.8.0~alpha+3) unstable; urgency=medium
+soledad (0.7.4) unstable; urgency=medium
- * Pre-release of soledad 0.8.0
- * Cherry-pick commits to create soledad user, add it to sudoers.
+ * Update to 0.7.4 release
- -- Ben Carrillo <ben@futeisha.org> Tue, 29 Sep 2015 10:43:00 -0400
+ -- Ben Carrillo <ben@futeisha.org> Thu, 29 Oct 2015 12:11:02 -0400
soledad (0.7.3) unstable; urgency=medium
diff --git a/debian/control b/debian/control
index 88d2d36e..6de62bc6 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ Package: soledad-server
Architecture: all
Depends: ${misc:Depends}, ${python:Depends}, python-configparser, python-couchdb,
python-simplejson, python-oauth, python-u1db, python-routes, python-openssl,
- soledad-common (>= 0.5.0), python-six, python-twisted-web (>= 13.0.0-1~bpo70+1),
+ soledad-common (>= 0.8.0), python-six, python-twisted-web (>= 13.0.0-1~bpo70+1),
sudo
Description: Synchronization of locally encrypted data among devices (server files)
Soledad is the part of LEAP that allows application data to be securely
@@ -34,8 +34,8 @@ Package: soledad-client
Architecture: all
Depends: ${misc:Depends}, ${python:Depends}, python-sqlcipher (>= 2.6.3.3+b1),
python-simplejson, python-oauth, python-u1db, python-scrypt,
- python-dirspec, python-pycryptopp (>= 0.6.0.20120313-1~), soledad-common,
- python-chardet, python-twisted-core (>= 13.0.0)
+ python-dirspec, soledad-common, python-chardet,
+ python-twisted-core (>= 13.0.0)
Description: Synchronization of locally encrypted data among devices (client files)
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