From 8ef57d4824d3e4e49a6ade7da6a870a92b2b950d Mon Sep 17 00:00:00 2001
From: Kali Kaneko <kali@leap.se>
Date: Tue, 29 Sep 2015 10:44:16 -0400
Subject: [pkg] update debian changelog

---
 debian/changelog | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 8c779836..5e36c162 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+soledad (0.8.0~alpha) UNRELEASED; urgency=medium
+
+  * Pre-release of soledad 0.8.0
+
+ -- Ben Carrillo <ben@futeisha.org>  Tue, 29 Sep 2015 10:43:00 -0400
+
 soledad (0.7.3) unstable; urgency=medium
 
   * Update to 0.7.3 release
-- 
cgit v1.2.3


From 12119af36b2815a13565efcbf7d73629b06a4674 Mon Sep 17 00:00:00 2001
From: Folker Bernitt <fbernitt@thoughtworks.com>
Date: Wed, 12 Aug 2015 16:20:47 +0200
Subject: Replace cchardet dependency with python-chardet for debian.

---
 debian/pydist-overrides | 1 +
 1 file changed, 1 insertion(+)

diff --git a/debian/pydist-overrides b/debian/pydist-overrides
index b0817d87..a577bca6 100644
--- a/debian/pydist-overrides
+++ b/debian/pydist-overrides
@@ -2,6 +2,7 @@ pysqlcipher python-sqlcipher
 PyOpenSSL python-openssl
 u1db python-u1db
 scrypt python-scrypt
+cchardet python-chardet
 zope.proxy python-zope.proxy
 configparser python-configparser
 leap.soledad.common soledad-common
-- 
cgit v1.2.3


From 0a99d63c71b1a714571bd77c10a2a3dfe6caf04e Mon Sep 17 00:00:00 2001
From: Christoph Kluenter <ckluente@thoughtworks.com>
Date: Thu, 24 Sep 2015 20:36:22 +0200
Subject: [pkg] include script to create user-db

See PR 279
---
 debian/rules                   |  1 +
 debian/soledad-server.install  |  2 ++
 debian/soledad-server.postinst | 11 +++++++++++
 3 files changed, 14 insertions(+)
 create mode 100644 debian/soledad-server.install
 create mode 100644 debian/soledad-server.postinst

diff --git a/debian/rules b/debian/rules
index 75310561..88ef50b5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -22,6 +22,7 @@ override_dh_install:
 	    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
+	dh_install
 
 override_dh_auto_clean:
 	dh_auto_clean
diff --git a/debian/soledad-server.install b/debian/soledad-server.install
new file mode 100644
index 00000000..01342c4b
--- /dev/null
+++ b/debian/soledad-server.install
@@ -0,0 +1,2 @@
+server/pkg/create-user-db usr/bin/
+debian/soledad-sudoers etc/sudoers.d/
diff --git a/debian/soledad-server.postinst b/debian/soledad-server.postinst
new file mode 100644
index 00000000..19a2b888
--- /dev/null
+++ b/debian/soledad-server.postinst
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+export PATH=/bin:/usr/bin:/sbin:/usr/sbin
+
+id soledad-admin > /dev/null
+RET=$?
+
+if [ ! $RET -eq 0 ]; then
+	adduser --system soledad-admin --home /srv/leap/ --disabled-password --shell /bin/sh --ingroup nogroup
+fi
+
-- 
cgit v1.2.3


From d5bf6b606a95c12a1beb18acbe2716253d9d093f Mon Sep 17 00:00:00 2001
From: Christoph <chris@inferno.nadir.org>
Date: Tue, 29 Sep 2015 11:12:14 -0300
Subject: include sudoers file for soledad-admin

See PR 279
---
 debian/soledad-sudoers | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 debian/soledad-sudoers

diff --git a/debian/soledad-sudoers b/debian/soledad-sudoers
new file mode 100644
index 00000000..642497f8
--- /dev/null
+++ b/debian/soledad-sudoers
@@ -0,0 +1,2 @@
+Cmnd_Alias SOLEDAD_CREATE_DB = /usr/bin/create-user-db
+soledad ALL=(soledad-admin) NOPASSWD: SOLEDAD_CREATE_DB
-- 
cgit v1.2.3


From 9526f7a877533969e799bcd3b79abb2f20eef5cb Mon Sep 17 00:00:00 2001
From: varac <varacanero@zeromail.org>
Date: Tue, 29 Sep 2015 16:19:27 +0200
Subject: [pkg] Also install the soledad user and group on package install

- Resolves: https://leap.se/code/issues/7499
---
 debian/soledad-server.postinst | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/debian/soledad-server.postinst b/debian/soledad-server.postinst
index 19a2b888..55dc0d14 100644
--- a/debian/soledad-server.postinst
+++ b/debian/soledad-server.postinst
@@ -2,10 +2,26 @@
 
 export PATH=/bin:/usr/bin:/sbin:/usr/sbin
 
-id soledad-admin > /dev/null
+# create soledad group
+getent group soledad > /dev/null
 RET=$?
 
 if [ ! $RET -eq 0 ]; then
-	adduser --system soledad-admin --home /srv/leap/ --disabled-password --shell /bin/sh --ingroup nogroup
+    addgroup --system soledad
 fi
 
+# create soledad user
+id soledad > /dev/null 2>&1
+RET=$?
+
+if [ ! $RET -eq 0 ]; then
+  adduser --system soledad --no-create-home --home /srv/leap/ --ingroup soledad
+fi
+
+# create soledad-admin user
+id soledad-admin > /dev/null 2>&1
+RET=$?
+
+if [ ! $RET -eq 0 ]; then
+  adduser --system soledad-admin --no-create-home --home /srv/leap/ --ingroup soledad
+fi
-- 
cgit v1.2.3


From d1cd4ed6c66b898ba62e4186161b2c5f079be34d Mon Sep 17 00:00:00 2001
From: Kali Kaneko <kali@leap.se>
Date: Tue, 29 Sep 2015 10:46:48 -0400
Subject: Freeze debian version.

---
 client/src/leap/soledad/client/_version.py | 4 ++--
 common/src/leap/soledad/common/_version.py | 4 ++--
 server/src/leap/soledad/server/_version.py | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/client/src/leap/soledad/client/_version.py b/client/src/leap/soledad/client/_version.py
index 51402de9..6df387cd 100644
--- a/client/src/leap/soledad/client/_version.py
+++ b/client/src/leap/soledad/client/_version.py
@@ -5,8 +5,8 @@
 # unpacked source archive. Distribution tarballs contain a pre-generated copy
 # of this file.
 
-version_version = '0.7.3'
-version_full = '169d137fcc93dbc2fb76b79961e147672ecf7327'
+version_version = '0.8.0a1'
+version_full = '9526f7a877533969e799bcd3b79abb2f20eef5cb'
 
 
 def get_versions(default={}, verbose=False):
diff --git a/common/src/leap/soledad/common/_version.py b/common/src/leap/soledad/common/_version.py
index 51402de9..6df387cd 100644
--- a/common/src/leap/soledad/common/_version.py
+++ b/common/src/leap/soledad/common/_version.py
@@ -5,8 +5,8 @@
 # unpacked source archive. Distribution tarballs contain a pre-generated copy
 # of this file.
 
-version_version = '0.7.3'
-version_full = '169d137fcc93dbc2fb76b79961e147672ecf7327'
+version_version = '0.8.0a1'
+version_full = '9526f7a877533969e799bcd3b79abb2f20eef5cb'
 
 
 def get_versions(default={}, verbose=False):
diff --git a/server/src/leap/soledad/server/_version.py b/server/src/leap/soledad/server/_version.py
index 51402de9..6df387cd 100644
--- a/server/src/leap/soledad/server/_version.py
+++ b/server/src/leap/soledad/server/_version.py
@@ -5,8 +5,8 @@
 # unpacked source archive. Distribution tarballs contain a pre-generated copy
 # of this file.
 
-version_version = '0.7.3'
-version_full = '169d137fcc93dbc2fb76b79961e147672ecf7327'
+version_version = '0.8.0a1'
+version_full = '9526f7a877533969e799bcd3b79abb2f20eef5cb'
 
 
 def get_versions(default={}, verbose=False):
-- 
cgit v1.2.3


From f1e20420cbb45f79ded4de5adbcc29d843f4ac02 Mon Sep 17 00:00:00 2001
From: Kali Kaneko <kali@leap.se>
Date: Tue, 29 Sep 2015 10:50:22 -0400
Subject: [pkg] comment cherry-picks

---
 debian/changelog | 1 +
 1 file changed, 1 insertion(+)

diff --git a/debian/changelog b/debian/changelog
index 5e36c162..5472d89e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 soledad (0.8.0~alpha) UNRELEASED; urgency=medium
 
   * Pre-release of soledad 0.8.0
+  * Cherry-pick commits to create soledad user, add it to sudoers.
 
  -- Ben Carrillo <ben@futeisha.org>  Tue, 29 Sep 2015 10:43:00 -0400
 
-- 
cgit v1.2.3


From 8b35c4707340b58b2f2ae8d424da1cf9c0ec2cf0 Mon Sep 17 00:00:00 2001
From: Kali Kaneko <kali@leap.se>
Date: Wed, 30 Sep 2015 16:52:11 -0400
Subject: [pkg] remove dh-python since not in wheezy

---
 debian/control | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/control b/debian/control
index cf1252e3..bac1e744 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: soledad
 Section: python
 Priority: optional
 Maintainer: Micah Anderson <micah@debian.org>
-Build-Depends: python-setuptools (>= 0.6b3), python-all (>= 2.6.6-3), debhelper (>= 9), dh-python
+Build-Depends: python-setuptools (>= 0.6b3), python-all (>= 2.6.6-3), debhelper (>= 9)
 Standards-Version: 3.9.6
 
 Package: soledad-server
-- 
cgit v1.2.3


From be2a2966ec6c8d8608424cf934a9313de3cac822 Mon Sep 17 00:00:00 2001
From: Kali Kaneko <kali@leap.se>
Date: Thu, 1 Oct 2015 10:52:48 -0400
Subject: [pkg] add template for postrm, disable debhelper in postrm

debhelper was producing the following error on the postrm autogenerated
code:

 E: soledad-server: postrm-contains-additional-updaterc.d-calls etc/init.d/soledad-server

I'm disabling debhelper postrm generation, but leaving here the postrm
template for future work. we need to address several things:

- remove config files
- remove soledad users
- remove homedirs for soledad users
- remove sudoers entries
---
 debian/soledad-server.postrm | 54 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 54 insertions(+)
 create mode 100644 debian/soledad-server.postrm

diff --git a/debian/soledad-server.postrm b/debian/soledad-server.postrm
new file mode 100644
index 00000000..b4e5618e
--- /dev/null
+++ b/debian/soledad-server.postrm
@@ -0,0 +1,54 @@
+#!/bin/sh
+# postrm script for soledad-server
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <postrm> `remove'
+#        * <postrm> `purge'
+#        * <old-postrm> `upgrade' <new-version>
+#        * <new-postrm> `failed-upgrade' <old-version>
+#        * <new-postrm> `abort-install'
+#        * <new-postrm> `abort-install' <old-version>
+#        * <new-postrm> `abort-upgrade' <old-version>
+#        * <disappearer's-postrm> `disappear' <overwriter>
+#          <overwriter-version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+case "$1" in
+    purge)
+
+	# XXX some actions needed here:
+	# XXX remove soledad users?
+	# XXX remove users from sudoers?
+
+	#for d in path1 \
+	#	 path2 \ 
+	#	 path3 ; do
+	#	[ -d $d ] && rm -rf $d
+	#done
+
+    ;;
+
+    remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
+    ;;
+
+    *)
+	echo "postrm called with unknown argument \`$1'" >&2
+	exit 1
+    ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+# XXX kali: disabling debhelper autogenerated code for postrm ----------
+# it was causing the following error:
+#  postrm-contains-additional-updaterc.d-calls etc/init.d/soledad-server
+# XXX DEBHELPER#
+# ----------------------------------------------------------------------
+
+exit 0
-- 
cgit v1.2.3


From 0902e0a99d170f4fc56cd428dfe00896dfb3dca1 Mon Sep 17 00:00:00 2001
From: Kali Kaneko <kali@leap.se>
Date: Tue, 6 Oct 2015 10:59:36 -0400
Subject: [pkg] comment out twisted generic dependency

---
 client/pkg/requirements.pip | 2 +-
 server/pkg/requirements.pip | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/pkg/requirements.pip b/client/pkg/requirements.pip
index 6b74b16d..75c1025f 100644
--- a/client/pkg/requirements.pip
+++ b/client/pkg/requirements.pip
@@ -7,5 +7,5 @@ pycryptopp
 # repos instead.
 chardet
 zope.proxy
-twisted
+#twisted  # we handle specific packages in debian/control
 oauth
diff --git a/server/pkg/requirements.pip b/server/pkg/requirements.pip
index 58834d0e..e7d474f9 100644
--- a/server/pkg/requirements.pip
+++ b/server/pkg/requirements.pip
@@ -2,7 +2,7 @@ configparser
 u1db
 routes
 PyOpenSSL
-twisted
+#twisted  # we don't want all twisted deps in deb!
 #pinned for wheezy compatibility
 Beaker==1.6.3 #wheezy
 couchdb==0.8 #wheezy
-- 
cgit v1.2.3


From d74bbe94e2135cb66406005f69406bb4a23a2780 Mon Sep 17 00:00:00 2001
From: Christoph Kluenter <ckluente@thouthworks.com>
Date: Tue, 27 Oct 2015 11:18:26 +0100
Subject: restart soledad server after upgrade

---
 debian/soledad-server.postinst | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/debian/soledad-server.postinst b/debian/soledad-server.postinst
index 55dc0d14..0f46caf6 100644
--- a/debian/soledad-server.postinst
+++ b/debian/soledad-server.postinst
@@ -25,3 +25,6 @@ RET=$?
 if [ ! $RET -eq 0 ]; then
   adduser --system soledad-admin --no-create-home --home /srv/leap/ --ingroup soledad
 fi
+
+
+invoke-rc.d soledad-server start
-- 
cgit v1.2.3


From 73a76a0034333e06e256961cccaf4400cb622b47 Mon Sep 17 00:00:00 2001
From: Kali Kaneko <kali@leap.se>
Date: Thu, 29 Oct 2015 15:50:17 -0400
Subject: [pkg] bump soledad-client dependency

---
 debian/control | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/control b/debian/control
index bac1e744..2b379093 100644
--- a/debian/control
+++ b/debian/control
@@ -34,7 +34,7 @@ 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
+ 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 
-- 
cgit v1.2.3


From 34f689c888991cec60d33face290924946a80b42 Mon Sep 17 00:00:00 2001
From: Kali Kaneko <kali@leap.se>
Date: Tue, 17 Nov 2015 21:05:22 -0400
Subject: Freeze debian version.

---
 client/src/leap/soledad/client/_version.py | 4 ++--
 common/src/leap/soledad/common/_version.py | 4 ++--
 server/src/leap/soledad/server/_version.py | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/client/src/leap/soledad/client/_version.py b/client/src/leap/soledad/client/_version.py
index 6df387cd..889fba38 100644
--- a/client/src/leap/soledad/client/_version.py
+++ b/client/src/leap/soledad/client/_version.py
@@ -5,8 +5,8 @@
 # unpacked source archive. Distribution tarballs contain a pre-generated copy
 # of this file.
 
-version_version = '0.8.0a1'
-version_full = '9526f7a877533969e799bcd3b79abb2f20eef5cb'
+version_version = '0.8.0alpha2'
+version_full = 'aa6a34bc4ac5962dacaa5908778e444fe5aae3d7'
 
 
 def get_versions(default={}, verbose=False):
diff --git a/common/src/leap/soledad/common/_version.py b/common/src/leap/soledad/common/_version.py
index 6df387cd..889fba38 100644
--- a/common/src/leap/soledad/common/_version.py
+++ b/common/src/leap/soledad/common/_version.py
@@ -5,8 +5,8 @@
 # unpacked source archive. Distribution tarballs contain a pre-generated copy
 # of this file.
 
-version_version = '0.8.0a1'
-version_full = '9526f7a877533969e799bcd3b79abb2f20eef5cb'
+version_version = '0.8.0alpha2'
+version_full = 'aa6a34bc4ac5962dacaa5908778e444fe5aae3d7'
 
 
 def get_versions(default={}, verbose=False):
diff --git a/server/src/leap/soledad/server/_version.py b/server/src/leap/soledad/server/_version.py
index 6df387cd..889fba38 100644
--- a/server/src/leap/soledad/server/_version.py
+++ b/server/src/leap/soledad/server/_version.py
@@ -5,8 +5,8 @@
 # unpacked source archive. Distribution tarballs contain a pre-generated copy
 # of this file.
 
-version_version = '0.8.0a1'
-version_full = '9526f7a877533969e799bcd3b79abb2f20eef5cb'
+version_version = '0.8.0alpha2'
+version_full = 'aa6a34bc4ac5962dacaa5908778e444fe5aae3d7'
 
 
 def get_versions(default={}, verbose=False):
-- 
cgit v1.2.3


From 4fae5af899396db68db8130e7de2b25ec52addb1 Mon Sep 17 00:00:00 2001
From: Kali Kaneko <kali@leap.se>
Date: Tue, 17 Nov 2015 21:07:00 -0400
Subject: bump pre-release to 0.8.0~alpha2

---
 debian/changelog | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 5472d89e..d8344b0c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-soledad (0.8.0~alpha) UNRELEASED; urgency=medium
+soledad (0.8.0~alpha2) unstable; urgency=medium
 
   * Pre-release of soledad 0.8.0
   * Cherry-pick commits to create soledad user, add it to sudoers.
-- 
cgit v1.2.3


From 17ac3bd3e9d4dbe137345c1e54fac667cb9212a4 Mon Sep 17 00:00:00 2001
From: Kali Kaneko <kali@leap.se>
Date: Fri, 4 Dec 2015 15:03:16 -0400
Subject: [pkg] bump to alpha3

---
 debian/changelog | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index d8344b0c..84ac7e6b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-soledad (0.8.0~alpha2) unstable; urgency=medium
+soledad (0.8.0~alpha3) unstable; urgency=medium
 
   * Pre-release of soledad 0.8.0
   * Cherry-pick commits to create soledad user, add it to sudoers.
-- 
cgit v1.2.3


From 40596e1dfb58b9f41d7be09b73f40b0702b4133f Mon Sep 17 00:00:00 2001
From: Kali Kaneko <kali@leap.se>
Date: Wed, 9 Dec 2015 12:06:59 -0400
Subject: [pkg] change version to ~alpha+3 to fix precedence. Closes: #7694

---
 debian/changelog | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 84ac7e6b..6e25affd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-soledad (0.8.0~alpha3) unstable; urgency=medium
+soledad (0.8.0~alpha+3) unstable; urgency=medium
 
   * Pre-release of soledad 0.8.0
   * Cherry-pick commits to create soledad user, add it to sudoers.
-- 
cgit v1.2.3


From aba18bc950c946c04f6aeebdbf6531db19650594 Mon Sep 17 00:00:00 2001
From: Kali Kaneko <kali@leap.se>
Date: Wed, 4 May 2016 11:35:25 -0400
Subject: Freeze debian version.

---
 client/src/leap/soledad/client/_version.py | 10 ++++++----
 common/src/leap/soledad/common/_version.py | 10 ++++++----
 server/src/leap/soledad/server/_version.py | 10 ++++++----
 3 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/client/src/leap/soledad/client/_version.py b/client/src/leap/soledad/client/_version.py
index 23749c7c..a72d4aa7 100644
--- a/client/src/leap/soledad/client/_version.py
+++ b/client/src/leap/soledad/client/_version.py
@@ -1,12 +1,14 @@
+
 # This file was generated by the `freeze_debianver` command in setup.py
-# Using 'versioneer.py' (0.7+) from
+# Using 'versioneer.py' (0.16) from
 # revision-control system data, or from the parent directory name of an
 # unpacked source archive. Distribution tarballs contain a pre-generated copy
 # of this file.
 
-version_version = '0.8.0alpha2'
-version_full = 'aa6a34bc4ac5962dacaa5908778e444fe5aae3d7'
+version_version = '0.8.0'
+full_revisionid = '259d37b430564c03f27d0835e23769473034df6f'
 
 
 def get_versions(default={}, verbose=False):
-    return {'version': version_version, 'full': version_full}
+        return {'version': version_version,
+                'full-revisionid': full_revisionid}
diff --git a/common/src/leap/soledad/common/_version.py b/common/src/leap/soledad/common/_version.py
index 23749c7c..a72d4aa7 100644
--- a/common/src/leap/soledad/common/_version.py
+++ b/common/src/leap/soledad/common/_version.py
@@ -1,12 +1,14 @@
+
 # This file was generated by the `freeze_debianver` command in setup.py
-# Using 'versioneer.py' (0.7+) from
+# Using 'versioneer.py' (0.16) from
 # revision-control system data, or from the parent directory name of an
 # unpacked source archive. Distribution tarballs contain a pre-generated copy
 # of this file.
 
-version_version = '0.8.0alpha2'
-version_full = 'aa6a34bc4ac5962dacaa5908778e444fe5aae3d7'
+version_version = '0.8.0'
+full_revisionid = '259d37b430564c03f27d0835e23769473034df6f'
 
 
 def get_versions(default={}, verbose=False):
-    return {'version': version_version, 'full': version_full}
+        return {'version': version_version,
+                'full-revisionid': full_revisionid}
diff --git a/server/src/leap/soledad/server/_version.py b/server/src/leap/soledad/server/_version.py
index 23749c7c..a72d4aa7 100644
--- a/server/src/leap/soledad/server/_version.py
+++ b/server/src/leap/soledad/server/_version.py
@@ -1,12 +1,14 @@
+
 # This file was generated by the `freeze_debianver` command in setup.py
-# Using 'versioneer.py' (0.7+) from
+# Using 'versioneer.py' (0.16) from
 # revision-control system data, or from the parent directory name of an
 # unpacked source archive. Distribution tarballs contain a pre-generated copy
 # of this file.
 
-version_version = '0.8.0alpha2'
-version_full = 'aa6a34bc4ac5962dacaa5908778e444fe5aae3d7'
+version_version = '0.8.0'
+full_revisionid = '259d37b430564c03f27d0835e23769473034df6f'
 
 
 def get_versions(default={}, verbose=False):
-    return {'version': version_version, 'full': version_full}
+        return {'version': version_version,
+                'full-revisionid': full_revisionid}
-- 
cgit v1.2.3


From 470868f699954922bea1a06085d4ec5f083b92a6 Mon Sep 17 00:00:00 2001
From: Kali Kaneko <kali@leap.se>
Date: Wed, 4 May 2016 11:39:13 -0400
Subject: [deb] bump changelog to 0.8.0 final

---
 debian/changelog | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 6e25affd..99d1b94f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+soledad (0.8.0) unstable; urgency=medium
+
+  * Release of soledad 0.8.0
+
+ -- Ben Carrillo <ben@futeisha.org>  Wed, 04 May 2016 11:36:35 -0400
+
 soledad (0.8.0~alpha+3) unstable; urgency=medium
 
   * Pre-release of soledad 0.8.0
-- 
cgit v1.2.3