summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKali Kaneko <kali@leap.se>2013-10-30 16:04:23 -0200
committerKali Kaneko <kali@leap.se>2013-10-30 16:04:36 -0200
commit460446c151322f11876c6816fe64d2e9b5d406ab (patch)
treed191d269d9cea33ef2e8945cbd98c85584c57fcf
parent6008c15b85f75e2ed0255bedc4e28bb25058ee13 (diff)
use python-chardet instead of python-cchardet
-rw-r--r--debian/changelog2
-rw-r--r--debian/control3
-rw-r--r--debian/pydist-overrides1
3 files changed, 5 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index 8769d3ca..3401d5e3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
soledad (0.4.1) unstable; urgency=low
* Update to 0.4.1.
+ * Freeze version to 0.4.1 using freeze_debianver command.
+ * Use python-chardet as a fallback.
-- Micah Anderson <micah@debian.org> Tue, 15 Oct 2013 15:27:19 -0300
diff --git a/debian/control b/debian/control
index c5427347..cfdfd97f 100644
--- a/debian/control
+++ b/debian/control
@@ -39,7 +39,8 @@ Package: soledad-client
Architecture: all
Depends: ${misc:Depends}, ${python:Depends}, python-sqlcipher, python-pysqlite1.1,
python-simplejson, python-oauth, python-u1db, python-scrypt,
- python-dirspec, python-pycryptopp, soledad-common
+ python-dirspec, python-pycryptopp, soledad-common,
+ python-chardet
Description: Synchronization of locally encrypted data among devices.
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
diff --git a/debian/pydist-overrides b/debian/pydist-overrides
index c1b27213..f9e35108 100644
--- a/debian/pydist-overrides
+++ b/debian/pydist-overrides
@@ -3,3 +3,4 @@ PyOpenSSL python-openssl
leap.soledad.common soledad-common
leap.soledad.server soledad-server
leap.soledad.client soledad-client
+cchardet python-chardet