Merge branch 'debian/platform-0.10' of ssh://leap.se/leap_mx into debian/platform-0.10

24 files changed, 856 insertions, 534 deletions

diff --git a/.gitignore b/.gitignore
index dc8af53..114fc4c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -54,4 +54,11 @@ docs/cov_html/
 *.conf
 *.config
 
+# ignore debian stuff
+debian/files
+debian/leap-mx.postinst.debhelper
+debian/leap-mx.postrm.debhelper
+debian/leap-mx.prerm.debhelper
+debian/leap-mx.substvars
+debian/leap-mx/
 _trial_temp
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 49844b4..628d9b9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,8 +1,50 @@
 stages:
-  - test
+  #- test
+  - package
+  - test_package
 
-test:
-  image: leapcode/soledad:latest
-  stage: test
+.job_template: &job_definition
+  stage: package
+  image: "0xacab.org:4567/leap/gitlab-buildpackage:build_${DIST}_${ARCH}"
   script:
-    - tox --recreate
+    # Remove hardcoded pep440 version file so
+    # `python setup.py version` reports the correct one
+    # based on `git describe`
+    - rm src/leap/mx/_version.py
+    - build-build-package
+    # sleep 1h to allow debugging of running container
+    #- sleep 3600
+  artifacts:
+    expire_in: 1w
+    paths:
+    - '*_*.xz'
+    - '*_*.dsc'
+    - '*_amd64.changes'
+    - '*.deb'
+    - 'results/*'
+
+#test:
+#  image: leapcode/soledad:latest
+#  stage: test
+#  script:
+#  - tox --recreate
+
+package:amd64:jessie:
+  variables:
+    #CI_DEBUG_TRACE: "true"
+    REPOREMOTE: "gitlab-runner@deb.leap.se"
+    REPOURL: "deb.leap.se/gitbuildpackage"
+    REPOREMOTE_OPTS: "-p 4422 -o StrictHostKeyChecking=no -i /etc/dockerbuild.id_rsa -o SendEnv=REPOSITORY"
+    REPOSITORY: "/srv/gitbuildpackage"
+    ARCH: "amd64"
+    DIST: "jessie"
+    REPOS: "jessie"
+  <<: *job_definition
+
+lintian:
+  variables:
+    ARCH: "amd64"
+    DIST: "jessie"
+  image: "0xacab.org:4567/leap/gitlab-buildpackage:build_${DIST}_${ARCH}"
+  stage: test_package
+  script: bash -x build-test-lintian
diff --git a/changes/bug_keep_watcher_in_memory b/changes/bug_keep_watcher_in_memory
new file mode 100644
index 0000000..4ac9541
--- /dev/null
+++ b/changes/bug_keep_watcher_in_memory
@@ -0,0 +1 @@
+  o Keep file watcher in memory to prevent losing file events.
\ No newline at end of file
diff --git a/deb_release.sh b/deb_release.sh
new file mode 100755
index 0000000..31e9bfd
--- /dev/null
+++ b/deb_release.sh
@@ -0,0 +1,8 @@
+#!/bin/zsh
+
+VERSION_FILE="src/leap/mx/_version.py"
+rm ${VERSION_FILE}
+python setup.py freeze_debianver
+sed -i 's/-dirty//g' ${VERSION_FILE}
+git add ${VERSION_FILE}
+git commit -m "[pkg] freeze debian version"
diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 0000000..3b80881
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,175 @@
+leap-mx (0.9.1) unstable; urgency=medium
+
+  * Update to 0.9.1 release 
+  * Update to systemd file. 
+
+ -- Ben Carrillo <ben@futeisha.org>  Tue, 17 Jan 2017 21:46:02 +0100
+
+leap-mx (0.8.1) unstable; urgency=medium
+
+  * Update to 0.8.1 hotfix version 
+
+ -- Ben Carrillo <ben@futeisha.org>  Fri, 13 May 2016 09:18:45 -0400
+
+leap-mx (0.8.0) unstable; urgency=medium
+
+  * Update to 0.8.0 version
+
+ -- Ben Carrillo <ben@futeisha.org>  Wed, 04 May 2016 11:28:05 -0400
+
+leap-mx (0.7.0) unstable; urgency=medium
+
+  * Update to 0.7.0 version
+
+ -- drebs <drebs@leap.se>  Wed, 29 Apr 2015 16:18:53 -0300
+
+leap-mx (0.6.2) unstable; urgency=medium
+
+  * Update to 0.6.2 version
+
+ -- drebs <drebs@leap.se>  Tue, 21 Apr 2015 17:04:16 -0300
+
+leap-mx (0.6.1) unstable; urgency=medium
+
+  * Update to 0.6.1 version
+  * Install leap.mx changelog.
+
+ -- Ben Carrillo <ben@futeisha.org>  Wed, 11 Feb 2015 11:44:50 -0400
+
+leap-mx (0.6.0.1) unstable; urgency=medium
+
+  * Sync upstream initscript and ours, adding syslog options
+    to better handle logging (#4599, #6307)
+
+ -- Micah Anderson <micah@debian.org>  Mon, 12 Jan 2015 14:25:16 -0500
+
+leap-mx (0.6.0) unstable; urgency=medium
+
+  * Update to 0.6.0 version
+
+ -- Ben Carrillo <ben@futeisha.org>  Tue, 11 Nov 2014 21:53:58 +0100
+
+leap-mx (0.5.0) unstable; urgency=medium
+
+  * 0.5.0 final version (unified release with bitmask and soledad)
+
+ -- Ben Carrillo <ben@futeisha.org>  Tue, 22 Apr 2014 08:40:16 -0500
+
+leap-mx (0.3.5) unstable; urgency=low
+
+  * Update to 0.3.5
+
+ -- Ben Carrillo <ben@futeisha.org>  Tue, 10 Dec 2013 16:02:10 -0400
+
+leap-mx (0.3.4) unstable; urgency=low
+
+  * Update to 0.3.4
+
+ -- Ben Carrillo <ben@futeisha.org>  Fri, 15 Nov 2013 23:13:24 -0200
+
+leap-mx (0.3.3.2) unstable; urgency=low
+
+  * Cherry-pick e108a2ffec444c09b3661379a1051fda1f9952cf
+
+ -- Micah Anderson <micah@debian.org>  Sat, 09 Nov 2013 14:32:08 -0500
+
+leap-mx (0.3.3.1) unstable; urgency=low
+
+  * Add python-leap-common to pydist-overrides
+
+ -- Micah Anderson <micah@debian.org>  Sat, 09 Nov 2013 13:31:53 -0500
+
+leap-mx (0.3.3) unstable; urgency=low
+
+  * Update to 0.3.3
+  * Add python-chardet requirements so it substitutes cchardet.
+
+ -- Ben Carrillo <ben@futeisha.org>  Tue, 05 Nov 2013 11:53:34 -0200
+
+leap-mx (0.3.2) unstable; urgency=low
+
+  * Update to 0.3.2 release
+  * Freeze reported version using freeze_debianver command.
+
+ -- Micah Anderson <micah@debian.org>  Thu, 12 Sep 2013 14:24:05 +0200
+
+leap-mx (0.3.1.5) unstable; urgency=low
+
+  * Cherry pick fix from
+    https://github.com/chiiph/leap_mx/commit/78f6ca775dc42eba69f2dc1e134ca360c0813aff
+    to keep file watcher in memory to prevent losing file events
+
+ -- Micah Anderson <micah@debian.org>  Fri, 30 Aug 2013 12:40:15 -0400
+
+leap-mx (0.3.1.4) unstable; urgency=low
+
+  * add debian/dirs to make sure that /var/lib/leap_mx is created (#3622)
+
+ -- Micah Anderson <micah@debian.org>  Fri, 30 Aug 2013 12:34:50 -0400
+
+leap-mx (0.3.1.3) unstable; urgency=low
+
+  * Pull in fix to couchdb saving
+
+ -- Micah Anderson <micah@debian.org>  Thu, 29 Aug 2013 21:49:28 -0400
+
+leap-mx (0.3.1.2) unstable; urgency=low
+
+  * Update with python-couchdb dependency
+
+ -- Micah Anderson <micah@debian.org>  thu, 22 aug 2013 15:27:02 -0400
+
+leap-mx (0.3.1.1) unstable; urgency=low
+
+  * merge develop to prepare for new version
+
+ -- Micah Anderson <micah@debian.org>  thu, 22 aug 2013 15:27:02 -0400
+
+leap-mx (0.3.0.3) unstable; urgency=low
+
+  * Pin twisted version in Depends to get 13 or greater
+
+ -- Micah Anderson <micah@debian.org>  Sat, 17 Aug 2013 12:10:49 -0400
+
+leap-mx (0.3.0.2) unstable; urgency=low
+
+  * Fix initscript variables
+
+ -- Micah Anderson <micah@debian.org>  Tue, 13 Aug 2013 16:33:45 -0400
+
+leap-mx (0.3.0.1) unstable; urgency=low
+
+  * Require twisted >=13.0.0-1~bpo70
+
+ -- Micah Anderson <micah@debian.org>  Tue, 13 Aug 2013 16:10:21 -0400
+
+leap-mx (0.3.0) unstable; urgency=low
+
+  * Update to 0.3.0
+  * Source /lib/lsb/init-functions in initscripts
+  * Require twisted >=13.0.0-1
+
+ -- Micah Anderson <micah@debian.org>  Tue, 13 Aug 2013 15:49:33 -0400
+
+leap-mx (0.2.2.2) unstable; urgency=low
+
+  * Added status command to initscript
+
+ -- Micah Anderson <micah@debian.org>  Thu, 25 Jul 2013 14:03:18 -0400
+
+leap-mx (0.2.2.1) unstable; urgency=low
+
+  * Fix installation of documentation
+  * Fix package descriptions
+  * Install initscript using packaging tools
+  * Add LSB headers to initscript
+  * Add debian/copyright
+  * Fix permissions on leap_mx.tac
+
+ -- Micah Anderson <micah@debian.org>  Thu, 18 Jul 2013 15:58:31 -0400
+
+leap-mx (0.2.2) unstable; urgency=low
+
+  * Initial Debian package
+
+ -- Micah Anderson <micah@debian.org>  Thu, 06 Jun 2013 16:20:55 -0400
diff --git a/debian/clean b/debian/clean
new file mode 100644
index 0000000..4a664ba
--- /dev/null
+++ b/debian/clean
@@ -0,0 +1 @@
+src/leap.mx.egg-info/*
diff --git a/debian/compat b/debian/compat
new file mode 100644
index 0000000..ec63514
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+9
diff --git a/debian/control b/debian/control
new file mode 100644
index 0000000..d8ae0f2
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,14 @@
+Source: leap-mx
+Maintainer: drebs <drebs@leap.se>
+Uploader: Micah Anderson <micah@debian.org>
+Section: python
+Priority: optional
+Build-Depends: python-setuptools (>= 0.6b3), python-all (>= 2.6.6-3), debhelper (>= 9), dh-systemd
+Standards-Version: 3.9.6
+
+Package: leap-mx
+Architecture: all
+Depends: ${misc:Depends}, ${python:Depends}, python-twisted (>= 13.0.0-1~bpo70+1)
+Description: Asynchronous, transparently-encrypting remailer for the LEAP platform
+ Asynchronous, transparently-encrypting remailer using BigCouch/CouchDB
+ and OpenPGP, written in Twisted Python.
diff --git a/debian/copyright b/debian/copyright
new file mode 100644
index 0000000..0c2eab5
--- /dev/null
+++ b/debian/copyright
@@ -0,0 +1,579 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: leap-mx
+Upstream-Contact: info@leap.se
+Source: <git://code.leap.se/leap_mx/>
+
+Files: *
+Copyright: Copyright (C) 2013 LEAP
+License: AGPL
+
+Files: debian/*
+Copyright: Copyright 2013 Micah Anderson <micah@leap.se>
+License: GPL-3+
+
+License: GPL-3+
+ On Debian systems, the complete text of the GNU General
+ Public License can be found in `/usr/share/common-licenses/GPL'.
+
+License: AGPL
+ Preamble
+ .
+ The GNU Affero General Public License is a free, copyleft license for software
+ and other kinds of works, specifically designed to ensure cooperation with the
+ community in the case of network server software.
+ .
+ The licenses for most software and other practical works are designed to take
+ away your freedom to share and change the works. By contrast, our General
+ Public Licenses are intended to guarantee your freedom to share and change all
+ versions of a program--to make sure it remains free software for all its users.
+ .
+ When we speak of free software, we are referring to freedom, not price. Our
+ General Public Licenses are designed to make sure that you have the freedom to
+ distribute copies of free software (and charge for them if you wish), that you
+ receive source code or can get it if you want it, that you can change the
+ software or use pieces of it in new free programs, and that you know you can do
+ these things.
+ .
+ Developers that use our General Public Licenses protect your rights with two
+ steps: (1) assert copyright on the software, and (2) offer you this License
+ which gives you legal permission to copy, distribute and/or modify the
+ software.
+ .
+ A secondary benefit of defending all users' freedom is that improvements made
+ in alternate versions of the program, if they receive widespread use, become
+ available for other developers to incorporate. Many developers of free software
+ are heartened and encouraged by the resulting cooperation. However, in the case
+ of software used on network servers, this result may fail to come about. The
+ GNU General Public License permits making a modified version and letting the
+ public access it on a server without ever releasing its source code to the
+ public.
+ .
+ The GNU Affero General Public License is designed specifically to ensure that,
+ in such cases, the modified source code becomes available to the community. It
+ requires the operator of a network server to provide the source code of the
+ modified version running there to the users of that server. Therefore, public
+ use of a modified version, on a publicly accessible server, gives the public
+ access to the source code of the modified version.
+ .
+ An older license, called the Affero General Public License and published by
+ Affero, was designed to accomplish similar goals. This is a different license,
+ not a version of the Affero GPL, but Affero has released a new version of the
+ Affero GPL which permits relicensing under this license.
+ .
+ The precise terms and conditions for copying, distribution and modification
+ follow.
+ .
+ TERMS AND CONDITIONS
+ .
+ 0. Definitions.
+ .
+ "This License" refers to version 3 of the GNU Affero General Public License.
+ .
+ "Copyright" also means copyright-like laws that apply to other kinds of works,
+ such as semiconductor masks.
+ .
+ "The Program" refers to any copyrightable work licensed under this
+ License. Each licensee is addressed as "you". "Licensees" and "recipients" may
+ be individuals or organizations.
+ .
+ To "modify" a work means to copy from or adapt all or part of the work in a
+ fashion requiring copyright permission, other than the making of an exact
+ copy. The resulting work is called a "modified version" of the earlier work or
+ a work "based on" the earlier work.
+ .
+ A "covered work" means either the unmodified Program or a work based on the
+ Program.
+ .
+ To "propagate" a work means to do anything with it that, without permission,
+ would make you directly or secondarily liable for infringement under applicable
+ copyright law, except executing it on a computer or modifying a private
+ copy. Propagation includes copying, distribution (with or without
+ modification), making available to the public, and in some countries other
+ activities as well.
+ .
+ To "convey" a work means any kind of propagation that enables other parties to
+ make or receive copies. Mere interaction with a user through a computer
+ network, with no transfer of a copy, is not conveying.
+ .
+ An interactive user interface displays "Appropriate Legal Notices" to the
+ extent that it includes a convenient and prominently visible feature that (1)
+ displays an appropriate copyright notice, and (2) tells the user that there is
+ no warranty for the work (except to the extent that warranties are provided),
+ that licensees may convey the work under this License, and how to view a copy
+ of this License. If the interface presents a list of user commands or options,
+ such as a menu, a prominent item in the list meets this criterion.
+ .
+ 1. Source Code.
+ .
+ The "source code" for a work means the preferred form of the work for making
+ modifications to it. "Object code" means any non-source form of a work.
+ .
+ A "Standard Interface" means an interface that either is an official standard
+ defined by a recognized standards body, or, in the case of interfaces specified
+ for a particular programming language, one that is widely used among developers
+ working in that language.
+ .
+ The "System Libraries" of an executable work include anything, other than the
+ work as a whole, that (a) is included in the normal form of packaging a Major
+ Component, but which is not part of that Major Component, and (b) serves only
+ to enable use of the work with that Major Component, or to implement a Standard
+ Interface for which an implementation is available to the public in source code
+ form. A "Major Component", in this context, means a major essential component
+ (kernel, window system, and so on) of the specific operating system (if any) on
+ which the executable work runs, or a compiler used to produce the work, or an
+ object code interpreter used to run it.
+ .
+ The "Corresponding Source" for a work in object code form means all the source
+ code needed to generate, install, and (for an executable work) run the object
+ code and to modify the work, including scripts to control those
+ activities. However, it does not include the work's System Libraries, or
+ general-purpose tools or generally available free programs which are used
+ unmodified in performing those activities but which are not part of the
+ work. For example, Corresponding Source includes interface definition files
+ associated with source files for the work, and the source code for shared
+ libraries and dynamically linked subprograms that the work is specifically
+ designed to require, such as by intimate data communication or control flow
+ between those subprograms and other parts of the work.
+ .
+ The Corresponding Source need not include anything that users can regenerate
+ automatically from other parts of the Corresponding Source.
+ .
+ The Corresponding Source for a work in source code form is that same work.
+ .
+ 2. Basic Permissions.
+ .
+ All rights granted under this License are granted for the term of copyright on
+ the Program, and are irrevocable provided the stated conditions are met. This
+ License explicitly affirms your unlimited permission to run the unmodified
+ Program. The output from running a covered work is covered by this License only
+ if the output, given its content, constitutes a covered work. This License
+ acknowledges your rights of fair use or other equivalent, as provided by
+ copyright law.
+ .
+ You may make, run and propagate covered works that you do not convey, without
+ conditions so long as your license otherwise remains in force. You may convey
+ covered works to others for the sole purpose of having them make modifications
+ exclusively for you, or provide you with facilities for running those works,
+ provided that you comply with the terms of this License in conveying all
+ material for which you do not control copyright. Those thus making or running
+ the covered works for you must do so exclusively on your behalf, under your
+ direction and control, on terms that prohibit them from making any copies of
+ your copyrighted material outside their relationship with you.
+ .
+ Conveying under any other circumstances is permitted solely under the
+ conditions stated below. Sublicensing is not allowed; section 10 makes it
+ unnecessary.
+ .
+ 3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+ .
+ No covered work shall be deemed part of an effective technological measure
+ under any applicable law fulfilling obligations under article 11 of the WIPO
+ copyright treaty adopted on 20 December 1996, or similar laws prohibiting or
+ restricting circumvention of such measures.
+ .
+ When you convey a covered work, you waive any legal power to forbid
+ circumvention of technological measures to the extent such circumvention is
+ effected by exercising rights under this License with respect to the covered
+ work, and you disclaim any intention to limit operation or modification of the
+ work as a means of enforcing, against the work's users, your or third parties'
+ legal rights to forbid circumvention of technological measures.
+ .
+ 4. Conveying Verbatim Copies.
+ .
+ You may convey verbatim copies of the Program's source code as you receive it,
+ in any medium, provided that you conspicuously and appropriately publish on
+ each copy an appropriate copyright notice; keep intact all notices stating that
+ this License and any non-permissive terms added in accord with section 7 apply
+ to the code; keep intact all notices of the absence of any warranty; and give
+ all recipients a copy of this License along with the Program.
+ .
+ You may charge any price or no price for each copy that you convey, and you may
+ offer support or warranty protection for a fee.
+ .
+ 5. Conveying Modified Source Versions.
+ .
+ You may convey a work based on the Program, or the modifications to produce it
+ from the Program, in the form of source code under the terms of section 4,
+ provided that you also meet all of these conditions:
+ .
+ a) The work must carry prominent notices stating that you modified it, and
+ giving a relevant date.
+ .
+ b) The work must carry prominent notices stating that it is released under this
+ License and any conditions added under section 7. This requirement modifies the
+ requirement in section 4 to "keep intact all notices".
+ .
+ c) You must license the entire work, as a whole, under this License to anyone
+ who comes into possession of a copy. This License will therefore apply, along
+ with any applicable section 7 additional terms, to the whole of the work, and
+ all its parts, regardless of how they are packaged. This License gives no
+ permission to license the work in any other way, but it does not invalidate
+ such permission if you have separately received it.
+ .
+ d) If the work has interactive user interfaces, each must display Appropriate
+ Legal Notices; however, if the Program has interactive interfaces that do not
+ display Appropriate Legal Notices, your work need not make them do so.
+ .
+ A compilation of a covered work with other separate and independent works,
+ which are not by their nature extensions of the covered work, and which are not
+ combined with it such as to form a larger program, in or on a volume of a
+ storage or distribution medium, is called an "aggregate" if the compilation and
+ its resulting copyright are not used to limit the access or legal rights of the
+ compilation's users beyond what the individual works permit. Inclusion of a
+ covered work in an aggregate does not cause this License to apply to the other
+ parts of the aggregate.
+ .
+ 6. Conveying Non-Source Forms.
+ .
+ You may convey a covered work in object code form under the terms of sections 4
+ and 5, provided that you also convey the machine-readable Corresponding Source
+ under the terms of this License, in one of these ways:
+ .
+ a) Convey the object code in, or embodied in, a physical product (including a
+ physical distribution medium), accompanied by the Corresponding Source fixed on
+ a durable physical medium customarily used for software interchange.
+ .
+ b) Convey the object code in, or embodied in, a physical product (including a
+ physical distribution medium), accompanied by a written offer, valid for at
+ least three years and valid for as long as you offer spare parts or customer
+ support for that product model, to give anyone who possesses the object code
+ either (1) a copy of the Corresponding Source for all the software in the
+ product that is covered by this License, on a durable physical medium
+ customarily used for software interchange, for a price no more than your
+ reasonable cost of physically performing this conveying of source, or (2)
+ access to copy the Corresponding Source from a network server at no charge.
+ .
+ c) Convey individual copies of the object code with a copy of the written offer
+ to provide the Corresponding Source. This alternative is allowed only
+ occasionally and noncommercially, and only if you received the object code with
+ such an offer, in accord with subsection 6b.
+ .
+ d) Convey the object code by offering access from a designated place (gratis or
+ for a charge), and offer equivalent access to the Corresponding Source in the
+ same way through the same place at no further charge. You need not require
+ recipients to copy the Corresponding Source along with the object code. If the
+ place to copy the object code is a network server, the Corresponding Source may
+ be on a different server (operated by you or a third party) that supports
+ equivalent copying facilities, provided you maintain clear directions next to
+ the object code saying where to find the Corresponding Source. Regardless of
+ what server hosts the Corresponding Source, you remain obligated to ensure that
+ it is available for as long as needed to satisfy these requirements.
+ .
+ e) Convey the object code using peer-to-peer transmission, provided you inform
+ other peers where the object code and Corresponding Source of the work are
+ being offered to the general public at no charge under subsection 6d.
+ .
+ A separable portion of the object code, whose source code is excluded from the
+ Corresponding Source as a System Library, need not be included in conveying the
+ object code work.
+ .
+ A "User Product" is either (1) a "consumer product", which means any tangible
+ personal property which is normally used for personal, family, or household
+ purposes, or (2) anything designed or sold for incorporation into a
+ dwelling. In determining whether a product is a consumer product, doubtful
+ cases shall be resolved in favor of coverage. For a particular product received
+ by a particular user, "normally used" refers to a typical or common use of that
+ class of product, regardless of the status of the particular user or of the way
+ in which the particular user actually uses, or expects or is expected to use,
+ the product. A product is a consumer product regardless of whether the product
+ has substantial commercial, industrial or non-consumer uses, unless such uses
+ represent the only significant mode of use of the product.
+ .
+ "Installation Information" for a User Product means any methods, procedures,
+ authorization keys, or other information required to install and execute
+ modified versions of a covered work in that User Product from a modified
+ version of its Corresponding Source. The information must suffice to ensure
+ that the continued functioning of the modified object code is in no case
+ prevented or interfered with solely because modification has been made.
+ .
+ If you convey an object code work under this section in, or with, or
+ specifically for use in, a User Product, and the conveying occurs as part of a
+ transaction in which the right of possession and use of the User Product is
+ transferred to the recipient in perpetuity or for a fixed term (regardless of
+ how the transaction is characterized), the Corresponding Source conveyed under
+ this section must be accompanied by the Installation Information. But this
+ requirement does not apply if neither you nor any third party retains the
+ ability to install modified object code on the User Product (for example, the
+ work has been installed in ROM).
+ .
+ The requirement to provide Installation Information does not include a
+ requirement to continue to provide support service, warranty, or updates for a
+ work that has been modified or installed by the recipient, or for the User
+ Product in which it has been modified or installed. Access to a network may be
+ denied when the modification itself materially and adversely affects the
+ operation of the network or violates the rules and protocols for communication
+ across the network.
+ .
+ Corresponding Source conveyed, and Installation Information provided, in accord
+ with this section must be in a format that is publicly documented (and with an
+ implementation available to the public in source code form), and must require
+ no special password or key for unpacking, reading or copying.
+ .
+ 7. Additional Terms.
+ .
+ "Additional permissions" are terms that supplement the terms of this License by
+ making exceptions from one or more of its conditions. Additional permissions
+ that are applicable to the entire Program shall be treated as though they were
+ included in this License, to the extent that they are valid under applicable
+ law. If additional permissions apply only to part of the Program, that part may
+ be used separately under those permissions, but the entire Program remains
+ governed by this License without regard to the additional permissions.
+ .
+ When you convey a copy of a covered work, you may at your option remove any
+ additional permissions from that copy, or from any part of it. (Additional
+ permissions may be written to require their own removal in certain cases when
+ you modify the work.) You may place additional permissions on material, added
+ by you to a covered work, for which you have or can give appropriate copyright
+ permission.
+ .
+ Notwithstanding any other provision of this License, for material you add to a
+ covered work, you may (if authorized by the copyright holders of that material)
+ supplement the terms of this License with terms:
+ .
+ a) Disclaiming warranty or limiting liability differently from the terms of
+ sections 15 and 16 of this License; or
+ .
+ b) Requiring preservation of specified reasonable legal notices or author
+ attributions in that material or in the Appropriate Legal Notices displayed by
+ works containing it; or
+ .
+ c) Prohibiting misrepresentation of the origin of that material, or requiring
+ that modified versions of such material be marked in reasonable ways as
+ different from the original version; or
+ .
+ d) Limiting the use for publicity purposes of names of licensors or authors of
+ the material; or
+ .
+ e) Declining to grant rights under trademark law for use of some trade names,
+ trademarks, or service marks; or
+ .
+ f) Requiring indemnification of licensors and authors of that material by
+ anyone who conveys the material (or modified versions of it) with contractual
+ assumptions of liability to the recipient, for any liability that these
+ contractual assumptions directly impose on those licensors and authors.
+ .
+ All other non-permissive additional terms are considered "further restrictions"
+ within the meaning of section 10. If the Program as you received it, or any
+ part of it, contains a notice stating that it is governed by this License along
+ with a term that is a further restriction, you may remove that term. If a
+ license document contains a further restriction but permits relicensing or
+ conveying under this License, you may add to a covered work material governed
+ by the terms of that license document, provided that the further restriction
+ does not survive such relicensing or conveying.
+ .
+ If you add terms to a covered work in accord with this section, you must place,
+ in the relevant source files, a statement of the additional terms that apply to
+ those files, or a notice indicating where to find the applicable terms.
+ .
+ Additional terms, permissive or non-permissive, may be stated in the form of a
+ separately written license, or stated as exceptions; the above requirements
+ apply either way.
+ .
+ 8. Termination.
+ .
+ You may not propagate or modify a covered work except as expressly provided
+ under this License. Any attempt otherwise to propagate or modify it is void,
+ and will automatically terminate your rights under this License (including any
+ patent licenses granted under the third paragraph of section 11).
+ .
+ However, if you cease all violation of this License, then your license from a
+ particular copyright holder is reinstated (a) provisionally, unless and until
+ the copyright holder explicitly and finally terminates your license, and (b)
+ permanently, if the copyright holder fails to notify you of the violation by
+ some reasonable means prior to 60 days after the cessation.
+ .
+ Moreover, your license from a particular copyright holder is reinstated
+ permanently if the copyright holder notifies you of the violation by some
+ reasonable means, this is the first time you have received notice of violation
+ of this License (for any work) from that copyright holder, and you cure the
+ violation prior to 30 days after your receipt of the notice.
+ .
+ Termination of your rights under this section does not terminate the licenses
+ of parties who have received copies or rights from you under this License. If
+ your rights have been terminated and not permanently reinstated, you do not
+ qualify to receive new licenses for the same material under section 10.
+ .
+ 9. Acceptance Not Required for Having Copies.
+ .
+ You are not required to accept this License in order to receive or run a copy
+ of the Program. Ancillary propagation of a covered work occurring solely as a
+ consequence of using peer-to-peer transmission to receive a copy likewise does
+ not require acceptance. However, nothing other than this License grants you
+ permission to propagate or modify any covered work. These actions infringe
+ copyright if you do not accept this License. Therefore, by modifying or
+ propagating a covered work, you indicate your acceptance of this License to do
+ so.
+ .
+ 10. Automatic Licensing of Downstream Recipients.
+ .
+ Each time you convey a covered work, the recipient automatically receives a
+ license from the original licensors, to run, modify and propagate that work,
+ subject to this License. You are not responsible for enforcing compliance by
+ third parties with this License.
+ .
+ An "entity transaction" is a transaction transferring control of an
+ organization, or substantially all assets of one, or subdividing an
+ organization, or merging organizations. If propagation of a covered work
+ results from an entity transaction, each party to that transaction who receives
+ a copy of the work also receives whatever licenses to the work the party's
+ predecessor in interest had or could give under the previous paragraph, plus a
+ right to possession of the Corresponding Source of the work from the
+ predecessor in interest, if the predecessor has it or can get it with
+ reasonable efforts.
+ .
+ You may not impose any further restrictions on the exercise of the rights
+ granted or affirmed under this License. For example, you may not impose a
+ license fee, royalty, or other charge for exercise of rights granted under this
+ License, and you may not initiate litigation (including a cross-claim or
+ counterclaim in a lawsuit) alleging that any patent claim is infringed by
+ making, using, selling, offering for sale, or importing the Program or any
+ portion of it.
+ .
+ 11. Patents.
+ .
+ A "contributor" is a copyright holder who authorizes use under this License of
+ the Program or a work on which the Program is based. The work thus licensed is
+ called the contributor's "contributor version".
+ .
+ A contributor's "essential patent claims" are all patent claims owned or
+ controlled by the contributor, whether already acquired or hereafter acquired,
+ that would be infringed by some manner, permitted by this License, of making,
+ using, or selling its contributor version, but do not include claims that would
+ be infringed only as a consequence of further modification of the contributor
+ version. For purposes of this definition, "control" includes the right to grant
+ patent sublicenses in a manner consistent with the requirements of this
+ License.
+ .
+ Each contributor grants you a non-exclusive, worldwide, royalty-free patent
+ license under the contributor's essential patent claims, to make, use, sell,
+ offer for sale, import and otherwise run, modify and propagate the contents of
+ its contributor version.
+ .
+ In the following three paragraphs, a "patent license" is any express agreement
+ or commitment, however denominated, not to enforce a patent (such as an express
+ permission to practice a patent or covenant not to sue for patent
+ infringement). To "grant" such a patent license to a party means to make such
+ an agreement or commitment not to enforce a patent against the party.
+ .
+ If you convey a covered work, knowingly relying on a patent license, and the
+ Corresponding Source of the work is not available for anyone to copy, free of
+ charge and under the terms of this License, through a publicly available
+ network server or other readily accessible means, then you must either (1)
+ cause the Corresponding Source to be so available, or (2) arrange to deprive
+ yourself of the benefit of the patent license for this particular work, or (3)
+ arrange, in a manner consistent with the requirements of this License, to
+ extend the patent license to downstream recipients. "Knowingly relying" means
+ you have actual knowledge that, but for the patent license, your conveying the
+ covered work in a country, or your recipient's use of the covered work in a
+ country, would infringe one or more identifiable patents in that country that
+ you have reason to believe are valid.
+ .
+ If, pursuant to or in connection with a single transaction or arrangement, you
+ convey, or propagate by procuring conveyance of, a covered work, and grant a
+ patent license to some of the parties receiving the covered work authorizing
+ them to use, propagate, modify or convey a specific copy of the covered work,
+ then the patent license you grant is automatically extended to all recipients
+ of the covered work and works based on it.
+ .
+ A patent license is "discriminatory" if it does not include within the scope of
+ its coverage, prohibits the exercise of, or is conditioned on the non-exercise
+ of one or more of the rights that are specifically granted under this
+ License. You may not convey a covered work if you are a party to an arrangement
+ with a third party that is in the business of distributing software, under
+ which you make payment to the third party based on the extent of your activity
+ of conveying the work, and under which the third party grants, to any of the
+ parties who would receive the covered work from you, a discriminatory patent
+ license (a) in connection with copies of the covered work conveyed by you (or
+ copies made from those copies), or (b) primarily for and in connection with
+ specific products or compilations that contain the covered work, unless you
+ entered into that arrangement, or that patent license was granted, prior to 28
+ March 2007.
+ .
+ Nothing in this License shall be construed as excluding or limiting any implied
+ license or other defenses to infringement that may otherwise be available to
+ you under applicable patent law.
+ .
+ 12. No Surrender of Others' Freedom.
+ .
+ If conditions are imposed on you (whether by court order, agreement or
+ otherwise) that contradict the conditions of this License, they do not excuse
+ you from the conditions of this License. If you cannot convey a covered work so
+ as to satisfy simultaneously your obligations under this License and any other
+ pertinent obligations, then as a consequence you may not convey it at all. For
+ example, if you agree to terms that obligate you to collect a royalty for
+ further conveying from those to whom you convey the Program, the only way you
+ could satisfy both those terms and this License would be to refrain entirely
+ from conveying the Program.
+ .
+ 13. Remote Network Interaction; Use with the GNU General Public License.
+ .
+ Notwithstanding any other provision of this License, if you modify the Program,
+ your modified version must prominently offer all users interacting with it
+ remotely through a computer network (if your version supports such interaction)
+ an opportunity to receive the Corresponding Source of your version by providing
+ access to the Corresponding Source from a network server at no charge, through
+ some standard or customary means of facilitating copying of software. This
+ Corresponding Source shall include the Corresponding Source for any work
+ covered by version 3 of the GNU General Public License that is incorporated
+ pursuant to the following paragraph.
+ .
+ Notwithstanding any other provision of this License, you have permission to
+ link or combine any covered work with a work licensed under version 3 of the
+ GNU General Public License into a single combined work, and to convey the
+ resulting work. The terms of this License will continue to apply to the part
+ which is the covered work, but the work with which it is combined will remain
+ governed by version 3 of the GNU General Public License.
+ .
+ 14. Revised Versions of this License.
+ .
+ The Free Software Foundation may publish revised and/or new versions of the GNU
+ Affero General Public License from time to time. Such new versions will be
+ similar in spirit to the present version, but may differ in detail to address
+ new problems or concerns.
+ .
+ Each version is given a distinguishing version number. If the Program specifies
+ that a certain numbered version of the GNU Affero General Public License "or
+ any later version" applies to it, you have the option of following the terms
+ and conditions either of that numbered version or of any later version
+ published by the Free Software Foundation. If the Program does not specify a
+ version number of the GNU Affero General Public License, you may choose any
+ version ever published by the Free Software Foundation.
+ .
+ If the Program specifies that a proxy can decide which future versions of the
+ GNU Affero General Public License can be used, that proxy's public statement of
+ acceptance of a version permanently authorizes you to choose that version for
+ the Program.
+ .
+ Later license versions may give you additional or different
+ permissions. However, no additional obligations are imposed on any author or
+ copyright holder as a result of your choosing to follow a later version.
+ .
+ 15. Disclaimer of Warranty.
+ .
+ THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE
+ LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER
+ PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER
+ EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE
+ QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE
+ DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR
+ CORRECTION.
+ .
+ 16. Limitation of Liability.
+ .
+ IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY
+ COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS THE PROGRAM AS
+ PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL,
+ INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE
+ THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED
+ INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE
+ PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY
+ HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ .
+ 17. Interpretation of Sections 15 and 16.
+ .
+ If the disclaimer of warranty and limitation of liability provided above cannot
+ be given local legal effect according to their terms, reviewing courts shall
+ apply local law that most closely approximates an absolute waiver of all civil
+ liability in connection with the Program, unless a warranty or assumption of
+ liability accompanies a copy of the Program in return for a fee.
diff --git a/debian/dirs b/debian/dirs
new file mode 100644
index 0000000..eb81abe
--- /dev/null
+++ b/debian/dirs
@@ -0,0 +1 @@
+var/lib/leap_mx
diff --git a/debian/leap-mx.doc b/debian/leap-mx.doc
new file mode 100644
index 0000000..f19ab81
--- /dev/null
+++ b/debian/leap-mx.doc
@@ -0,0 +1,5 @@
+doc/*
+doc/sample-config/*
+README.md
+VERSION.md
+VERSION.md
diff --git a/debian/leap-mx.init b/debian/leap-mx.init
new file mode 120000
index 0000000..b2cb6f8
--- /dev/null
+++ b/debian/leap-mx.init
@@ -0,0 +1 @@
+../pkg/leap-mx.init
\ No newline at end of file
diff --git a/debian/leap-mx.service b/debian/leap-mx.service
new file mode 120000
index 0000000..17c747b
--- /dev/null
+++ b/debian/leap-mx.service
@@ -0,0 +1 @@
+../pkg/leap-mx.service
\ No newline at end of file
diff --git a/debian/pydist-overrides b/debian/pydist-overrides
new file mode 100644
index 0000000..5f32948
--- /dev/null
+++ b/debian/pydist-overrides
@@ -0,0 +1,5 @@
+couchdb python-couchdb
+leap.soledad.common soledad-common
+leap.soledad_server soledad-server
+leap.keymanager leap-keymanager
+leap.common python-leap-common
diff --git a/debian/rules b/debian/rules
new file mode 100755
index 0000000..f858329
--- /dev/null
+++ b/debian/rules
@@ -0,0 +1,9 @@
+#!/usr/bin/make -f
+
+%:
+	dh $@ --with python2 --buildsystem=python_distutils
+
+override_dh_installchangelogs:
+	dh_installchangelogs CHANGELOG.rst
+
+
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..89ae9db
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (native)
diff --git a/pkg/utils/gpg-keys/generated-2013-02-15_19-15-001.pub b/pkg/utils/gpg-keys/generated-2013-02-15_19-15-001.pub
deleted file mode 100644
index 1c8fd34..0000000
--- a/pkg/utils/gpg-keys/generated-2013-02-15_19-15-001.pub
+++ /dev/null
diff --git a/pkg/utils/gpg-keys/generated-2013-02-15_19-15-001.sec b/pkg/utils/gpg-keys/generated-2013-02-15_19-15-001.sec
deleted file mode 100644
index 97a60e7..0000000
--- a/pkg/utils/gpg-keys/generated-2013-02-15_19-15-001.sec
+++ /dev/null
diff --git a/pkg/utils/gpg-keys/generated-2013-02-15_19-15-002.pub b/pkg/utils/gpg-keys/generated-2013-02-15_19-15-002.pub
deleted file mode 100644
index 1cbf8d8..0000000
--- a/pkg/utils/gpg-keys/generated-2013-02-15_19-15-002.pub
+++ /dev/null
diff --git a/pkg/utils/gpg-keys/generated-2013-02-15_19-15-002.sec b/pkg/utils/gpg-keys/generated-2013-02-15_19-15-002.sec
deleted file mode 100644
index f89cd97..0000000
--- a/pkg/utils/gpg-keys/generated-2013-02-15_19-15-002.sec
+++ /dev/null
diff --git a/pkg/utils/gpg-keys/generated-2013-02-15_19-15-003.pub b/pkg/utils/gpg-keys/generated-2013-02-15_19-15-003.pub
deleted file mode 100644
index bc0ac12..0000000
--- a/pkg/utils/gpg-keys/generated-2013-02-15_19-15-003.pub
+++ /dev/null
diff --git a/pkg/utils/gpg-keys/generated-2013-02-15_19-15-003.sec b/pkg/utils/gpg-keys/generated-2013-02-15_19-15-003.sec
deleted file mode 100644
index 397f44a..0000000
--- a/pkg/utils/gpg-keys/generated-2013-02-15_19-15-003.sec
+++ /dev/null
diff --git a/pkg/utils/gpg-keys/gpg-batch-key-script b/pkg/utils/gpg-keys/gpg-batch-key-script
deleted file mode 100644
index 7e48db0..0000000
--- a/pkg/utils/gpg-keys/gpg-batch-key-script
+++ /dev/null
@@ -1,45 +0,0 @@
-%echo Generating keypair 001/003...
-Key-Type: RSA
-Key-Length: 4096
-Subkey-Type: RSA
-Subkey-Length: 4096
-Name-Real: Louis Lingg
-Name-Email: blackhole@leap.se
-Name-Comment: Test Key 001/003
-Expire-Date: 2013-03-15
-Passphrase: leap
-%pubring generated-2013-02-15_19-15-001.pub
-%secring generated-2013-02-15_19-15-001.sec
-%commit
-%echo done. 001 keys out of 003 completed.
-
-%echo Generating keypair 002/003...
-Key-Type: RSA
-Key-Length: 4096
-Subkey-Type: RSA
-Subkey-Length: 4096
-Name-Real: Louis Lingg
-Name-Email: blackhole@leap.se
-Name-Comment: Test Key 002/003
-Expire-Date: 2013-03-15
-Passphrase: leap
-%pubring generated-2013-02-15_19-15-002.pub
-%secring generated-2013-02-15_19-15-002.sec
-%commit
-%echo done. 002 keys out of 003 completed.
-
-%echo Generating keypair 003/003...
-Key-Type: RSA
-Key-Length: 4096
-Subkey-Type: RSA
-Subkey-Length: 4096
-Name-Real: Louis Lingg
-Name-Email: blackhole@leap.se
-Name-Comment: Test Key 003/003
-Expire-Date: 2013-03-15
-Passphrase: leap
-%pubring generated-2013-02-15_19-15-003.pub
-%secring generated-2013-02-15_19-15-003.sec
-%commit
-%echo done. 003 keys out of 003 completed.
-
diff --git a/src/leap/mx/_version.py b/src/leap/mx/_version.py
deleted file mode 100644
index ed9fc86..0000000
--- a/src/leap/mx/_version.py
+++ /dev/null
@@ -1,484 +0,0 @@
-
-# This file helps to compute a version number in source trees obtained from
-# git-archive tarball (such as those provided by githubs download-from-tag
-# feature). Distribution tarballs (built by setup.py sdist) and build
-# directories (produced by setup.py build) will contain a much shorter file
-# that just contains the computed version number.
-
-# This file is released into the public domain. Generated by
-# versioneer-0.16 (https://github.com/warner/python-versioneer)
-
-"""Git implementation of _version.py."""
-
-import errno
-import os
-import re
-import subprocess
-import sys
-
-
-def get_keywords():
-    """Get the keywords needed to look up the version information."""
-    # these strings will be replaced by git during git-archive.
-    # setup.py/versioneer.py will grep for the variable names, so they must
-    # each be defined on a line of their own. _version.py will just call
-    # get_keywords().
-    git_refnames = "$Format:%d$"
-    git_full = "$Format:%H$"
-    keywords = {"refnames": git_refnames, "full": git_full}
-    return keywords
-
-
-class VersioneerConfig:
-    """Container for Versioneer configuration parameters."""
-
-
-def get_config():
-    """Create, populate and return the VersioneerConfig() object."""
-    # these strings are filled in when 'setup.py versioneer' creates
-    # _version.py
-    cfg = VersioneerConfig()
-    cfg.VCS = "git"
-    cfg.style = "pep440"
-    cfg.tag_prefix = ""
-    cfg.parentdir_prefix = "None"
-    cfg.versionfile_source = "src/leap/mx/_version.py"
-    cfg.verbose = False
-    return cfg
-
-
-class NotThisMethod(Exception):
-    """Exception raised if a method is not valid for the current scenario."""
-
-
-LONG_VERSION_PY = {}
-HANDLERS = {}
-
-
-def register_vcs_handler(vcs, method):  # decorator
-    """Decorator to mark a method as the handler for a particular VCS."""
-    def decorate(f):
-        """Store f in HANDLERS[vcs][method]."""
-        if vcs not in HANDLERS:
-            HANDLERS[vcs] = {}
-        HANDLERS[vcs][method] = f
-        return f
-    return decorate
-
-
-def run_command(commands, args, cwd=None, verbose=False, hide_stderr=False):
-    """Call the given command(s)."""
-    assert isinstance(commands, list)
-    p = None
-    for c in commands:
-        try:
-            dispcmd = str([c] + args)
-            # remember shell=False, so use git.cmd on windows, not just git
-            p = subprocess.Popen([c] + args, cwd=cwd, stdout=subprocess.PIPE,
-                                 stderr=(subprocess.PIPE if hide_stderr
-                                         else None))
-            break
-        except EnvironmentError:
-            e = sys.exc_info()[1]
-            if e.errno == errno.ENOENT:
-                continue
-            if verbose:
-                print("unable to run %s" % dispcmd)
-                print(e)
-            return None
-    else:
-        if verbose:
-            print("unable to find command, tried %s" % (commands,))
-        return None
-    stdout = p.communicate()[0].strip()
-    if sys.version_info[0] >= 3:
-        stdout = stdout.decode()
-    if p.returncode != 0:
-        if verbose:
-            print("unable to run %s (error)" % dispcmd)
-        return None
-    return stdout
-
-
-def versions_from_parentdir(parentdir_prefix, root, verbose):
-    """Try to determine the version from the parent directory name.
-
-    Source tarballs conventionally unpack into a directory that includes
-    both the project name and a version string.
-    """
-    dirname = os.path.basename(root)
-    if not dirname.startswith(parentdir_prefix):
-        if verbose:
-            print("guessing rootdir is '%s', but '%s' doesn't start with "
-                  "prefix '%s'" % (root, dirname, parentdir_prefix))
-        raise NotThisMethod("rootdir doesn't start with parentdir_prefix")
-    return {"version": dirname[len(parentdir_prefix):],
-            "full-revisionid": None,
-            "dirty": False, "error": None}
-
-
-@register_vcs_handler("git", "get_keywords")
-def git_get_keywords(versionfile_abs):
-    """Extract version information from the given file."""
-    # the code embedded in _version.py can just fetch the value of these
-    # keywords. When used from setup.py, we don't want to import _version.py,
-    # so we do it with a regexp instead. This function is not used from
-    # _version.py.
-    keywords = {}
-    try:
-        f = open(versionfile_abs, "r")
-        for line in f.readlines():
-            if line.strip().startswith("git_refnames ="):
-                mo = re.search(r'=\s*"(.*)"', line)
-                if mo:
-                    keywords["refnames"] = mo.group(1)
-            if line.strip().startswith("git_full ="):
-                mo = re.search(r'=\s*"(.*)"', line)
-                if mo:
-                    keywords["full"] = mo.group(1)
-        f.close()
-    except EnvironmentError:
-        pass
-    return keywords
-
-
-@register_vcs_handler("git", "keywords")
-def git_versions_from_keywords(keywords, tag_prefix, verbose):
-    """Get version information from git keywords."""
-    if not keywords:
-        raise NotThisMethod("no keywords at all, weird")
-    refnames = keywords["refnames"].strip()
-    if refnames.startswith("$Format"):
-        if verbose:
-            print("keywords are unexpanded, not using")
-        raise NotThisMethod("unexpanded keywords, not a git-archive tarball")
-    refs = set([r.strip() for r in refnames.strip("()").split(",")])
-    # starting in git-1.8.3, tags are listed as "tag: foo-1.0" instead of
-    # just "foo-1.0". If we see a "tag: " prefix, prefer those.
-    TAG = "tag: "
-    tags = set([r[len(TAG):] for r in refs if r.startswith(TAG)])
-    if not tags:
-        # Either we're using git < 1.8.3, or there really are no tags. We use
-        # a heuristic: assume all version tags have a digit. The old git %d
-        # expansion behaves like git log --decorate=short and strips out the
-        # refs/heads/ and refs/tags/ prefixes that would let us distinguish
-        # between branches and tags. By ignoring refnames without digits, we
-        # filter out many common branch names like "release" and
-        # "stabilization", as well as "HEAD" and "master".
-        tags = set([r for r in refs if re.search(r'\d', r)])
-        if verbose:
-            print("discarding '%s', no digits" % ",".join(refs-tags))
-    if verbose:
-        print("likely tags: %s" % ",".join(sorted(tags)))
-    for ref in sorted(tags):
-        # sorting will prefer e.g. "2.0" over "2.0rc1"
-        if ref.startswith(tag_prefix):
-            r = ref[len(tag_prefix):]
-            if verbose:
-                print("picking %s" % r)
-            return {"version": r,
-                    "full-revisionid": keywords["full"].strip(),
-                    "dirty": False, "error": None
-                    }
-    # no suitable tags, so version is "0+unknown", but full hex is still there
-    if verbose:
-        print("no suitable tags, using unknown + full revision id")
-    return {"version": "0+unknown",
-            "full-revisionid": keywords["full"].strip(),
-            "dirty": False, "error": "no suitable tags"}
-
-
-@register_vcs_handler("git", "pieces_from_vcs")
-def git_pieces_from_vcs(tag_prefix, root, verbose, run_command=run_command):
-    """Get version from 'git describe' in the root of the source tree.
-
-    This only gets called if the git-archive 'subst' keywords were *not*
-    expanded, and _version.py hasn't already been rewritten with a short
-    version string, meaning we're inside a checked out source tree.
-    """
-    if not os.path.exists(os.path.join(root, ".git")):
-        if verbose:
-            print("no .git in %s" % root)
-        raise NotThisMethod("no .git directory")
-
-    GITS = ["git"]
-    if sys.platform == "win32":
-        GITS = ["git.cmd", "git.exe"]
-    # if there is a tag matching tag_prefix, this yields TAG-NUM-gHEX[-dirty]
-    # if there isn't one, this yields HEX[-dirty] (no NUM)
-    describe_out = run_command(GITS, ["describe", "--tags", "--dirty",
-                                      "--always", "--long",
-                                      "--match", "%s*" % tag_prefix],
-                               cwd=root)
-    # --long was added in git-1.5.5
-    if describe_out is None:
-        raise NotThisMethod("'git describe' failed")
-    describe_out = describe_out.strip()
-    full_out = run_command(GITS, ["rev-parse", "HEAD"], cwd=root)
-    if full_out is None:
-        raise NotThisMethod("'git rev-parse' failed")
-    full_out = full_out.strip()
-
-    pieces = {}
-    pieces["long"] = full_out
-    pieces["short"] = full_out[:7]  # maybe improved later
-    pieces["error"] = None
-
-    # parse describe_out. It will be like TAG-NUM-gHEX[-dirty] or HEX[-dirty]
-    # TAG might have hyphens.
-    git_describe = describe_out
-
-    # look for -dirty suffix
-    dirty = git_describe.endswith("-dirty")
-    pieces["dirty"] = dirty
-    if dirty:
-        git_describe = git_describe[:git_describe.rindex("-dirty")]
-
-    # now we have TAG-NUM-gHEX or HEX
-
-    if "-" in git_describe:
-        # TAG-NUM-gHEX
-        mo = re.search(r'^(.+)-(\d+)-g([0-9a-f]+)$', git_describe)
-        if not mo:
-            # unparseable. Maybe git-describe is misbehaving?
-            pieces["error"] = ("unable to parse git-describe output: '%s'"
-                               % describe_out)
-            return pieces
-
-        # tag
-        full_tag = mo.group(1)
-        if not full_tag.startswith(tag_prefix):
-            if verbose:
-                fmt = "tag '%s' doesn't start with prefix '%s'"
-                print(fmt % (full_tag, tag_prefix))
-            pieces["error"] = ("tag '%s' doesn't start with prefix '%s'"
-                               % (full_tag, tag_prefix))
-            return pieces
-        pieces["closest-tag"] = full_tag[len(tag_prefix):]
-
-        # distance: number of commits since tag
-        pieces["distance"] = int(mo.group(2))
-
-        # commit: short hex revision ID
-        pieces["short"] = mo.group(3)
-
-    else:
-        # HEX: no tags
-        pieces["closest-tag"] = None
-        count_out = run_command(GITS, ["rev-list", "HEAD", "--count"],
-                                cwd=root)
-        pieces["distance"] = int(count_out)  # total number of commits
-
-    return pieces
-
-
-def plus_or_dot(pieces):
-    """Return a + if we don't already have one, else return a ."""
-    if "+" in pieces.get("closest-tag", ""):
-        return "."
-    return "+"
-
-
-def render_pep440(pieces):
-    """Build up version string, with post-release "local version identifier".
-
-    Our goal: TAG[+DISTANCE.gHEX[.dirty]] . Note that if you
-    get a tagged build and then dirty it, you'll get TAG+0.gHEX.dirty
-
-    Exceptions:
-    1: no tags. git_describe was just HEX. 0+untagged.DISTANCE.gHEX[.dirty]
-    """
-    if pieces["closest-tag"]:
-        rendered = pieces["closest-tag"]
-        if pieces["distance"] or pieces["dirty"]:
-            rendered += plus_or_dot(pieces)
-            rendered += "%d.g%s" % (pieces["distance"], pieces["short"])
-            if pieces["dirty"]:
-                rendered += ".dirty"
-    else:
-        # exception #1
-        rendered = "0+untagged.%d.g%s" % (pieces["distance"],
-                                          pieces["short"])
-        if pieces["dirty"]:
-            rendered += ".dirty"
-    return rendered
-
-
-def render_pep440_pre(pieces):
-    """TAG[.post.devDISTANCE] -- No -dirty.
-
-    Exceptions:
-    1: no tags. 0.post.devDISTANCE
-    """
-    if pieces["closest-tag"]:
-        rendered = pieces["closest-tag"]
-        if pieces["distance"]:
-            rendered += ".post.dev%d" % pieces["distance"]
-    else:
-        # exception #1
-        rendered = "0.post.dev%d" % pieces["distance"]
-    return rendered
-
-
-def render_pep440_post(pieces):
-    """TAG[.postDISTANCE[.dev0]+gHEX] .
-
-    The ".dev0" means dirty. Note that .dev0 sorts backwards
-    (a dirty tree will appear "older" than the corresponding clean one),
-    but you shouldn't be releasing software with -dirty anyways.
-
-    Exceptions:
-    1: no tags. 0.postDISTANCE[.dev0]
-    """
-    if pieces["closest-tag"]:
-        rendered = pieces["closest-tag"]
-        if pieces["distance"] or pieces["dirty"]:
-            rendered += ".post%d" % pieces["distance"]
-            if pieces["dirty"]:
-                rendered += ".dev0"
-            rendered += plus_or_dot(pieces)
-            rendered += "g%s" % pieces["short"]
-    else:
-        # exception #1
-        rendered = "0.post%d" % pieces["distance"]
-        if pieces["dirty"]:
-            rendered += ".dev0"
-        rendered += "+g%s" % pieces["short"]
-    return rendered
-
-
-def render_pep440_old(pieces):
-    """TAG[.postDISTANCE[.dev0]] .
-
-    The ".dev0" means dirty.
-
-    Eexceptions:
-    1: no tags. 0.postDISTANCE[.dev0]
-    """
-    if pieces["closest-tag"]:
-        rendered = pieces["closest-tag"]
-        if pieces["distance"] or pieces["dirty"]:
-            rendered += ".post%d" % pieces["distance"]
-            if pieces["dirty"]:
-                rendered += ".dev0"
-    else:
-        # exception #1
-        rendered = "0.post%d" % pieces["distance"]
-        if pieces["dirty"]:
-            rendered += ".dev0"
-    return rendered
-
-
-def render_git_describe(pieces):
-    """TAG[-DISTANCE-gHEX][-dirty].
-
-    Like 'git describe --tags --dirty --always'.
-
-    Exceptions:
-    1: no tags. HEX[-dirty]  (note: no 'g' prefix)
-    """
-    if pieces["closest-tag"]:
-        rendered = pieces["closest-tag"]
-        if pieces["distance"]:
-            rendered += "-%d-g%s" % (pieces["distance"], pieces["short"])
-    else:
-        # exception #1
-        rendered = pieces["short"]
-    if pieces["dirty"]:
-        rendered += "-dirty"
-    return rendered
-
-
-def render_git_describe_long(pieces):
-    """TAG-DISTANCE-gHEX[-dirty].
-
-    Like 'git describe --tags --dirty --always -long'.
-    The distance/hash is unconditional.
-
-    Exceptions:
-    1: no tags. HEX[-dirty]  (note: no 'g' prefix)
-    """
-    if pieces["closest-tag"]:
-        rendered = pieces["closest-tag"]
-        rendered += "-%d-g%s" % (pieces["distance"], pieces["short"])
-    else:
-        # exception #1
-        rendered = pieces["short"]
-    if pieces["dirty"]:
-        rendered += "-dirty"
-    return rendered
-
-
-def render(pieces, style):
-    """Render the given version pieces into the requested style."""
-    if pieces["error"]:
-        return {"version": "unknown",
-                "full-revisionid": pieces.get("long"),
-                "dirty": None,
-                "error": pieces["error"]}
-
-    if not style or style == "default":
-        style = "pep440"  # the default
-
-    if style == "pep440":
-        rendered = render_pep440(pieces)
-    elif style == "pep440-pre":
-        rendered = render_pep440_pre(pieces)
-    elif style == "pep440-post":
-        rendered = render_pep440_post(pieces)
-    elif style == "pep440-old":
-        rendered = render_pep440_old(pieces)
-    elif style == "git-describe":
-        rendered = render_git_describe(pieces)
-    elif style == "git-describe-long":
-        rendered = render_git_describe_long(pieces)
-    else:
-        raise ValueError("unknown style '%s'" % style)
-
-    return {"version": rendered, "full-revisionid": pieces["long"],
-            "dirty": pieces["dirty"], "error": None}
-
-
-def get_versions():
-    """Get version information or return default if unable to do so."""
-    # I am in _version.py, which lives at ROOT/VERSIONFILE_SOURCE. If we have
-    # __file__, we can work backwards from there to the root. Some
-    # py2exe/bbfreeze/non-CPython implementations don't do __file__, in which
-    # case we can only use expanded keywords.
-
-    cfg = get_config()
-    verbose = cfg.verbose
-
-    try:
-        return git_versions_from_keywords(get_keywords(), cfg.tag_prefix,
-                                          verbose)
-    except NotThisMethod:
-        pass
-
-    try:
-        root = os.path.realpath(__file__)
-        # versionfile_source is the relative path from the top of the source
-        # tree (where the .git directory might live) to this file. Invert
-        # this to find the root from __file__.
-        for i in cfg.versionfile_source.split('/'):
-            root = os.path.dirname(root)
-    except NameError:
-        return {"version": "0+unknown", "full-revisionid": None,
-                "dirty": None,
-                "error": "unable to find root of source tree"}
-
-    try:
-        pieces = git_pieces_from_vcs(cfg.tag_prefix, root, verbose)
-        return render(pieces, cfg.style)
-    except NotThisMethod:
-        pass
-
-    try:
-        if cfg.parentdir_prefix:
-            return versions_from_parentdir(cfg.parentdir_prefix, root, verbose)
-    except NotThisMethod:
-        pass
-
-    return {"version": "0+unknown", "full-revisionid": None,
-            "dirty": None,
-            "error": "unable to compute version"}