diff options
| author | Kali Kaneko <kali@leap.se> | 2015-10-29 12:03:53 -0400 |
|---|---|---|
| committer | Kali Kaneko <kali@leap.se> | 2015-10-29 12:03:53 -0400 |
| commit | 4e5e21a8d008fd31307d3581fb5f791b0c2783e8 (patch) | |
| tree | 3a2e937037f2d0dffb341af59cd6535b48ededf1 | |
| parent | 78a9911c1aca902e671ecd06fcd24bf7eaa39746 (diff) | |
| parent | 9e3a80733c548de1e46d89e2ecb99aef8effe3e1 (diff) | |
Merge branch 'debian/experimental' of ssh://leap.se/keymanager into debian/experimental
| -rw-r--r-- | debian/changelog | 4 | ||||
| -rw-r--r-- | debian/control | 7 | ||||
| -rw-r--r-- | debian/copyright | 2 |
3 files changed, 9 insertions, 4 deletions
diff --git a/debian/changelog b/debian/changelog index c1a7b52..420db7f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,8 +7,10 @@ leap-keymanager (0.4.3) unstable; urgency=medium leap-keymanager (0.4.2) unstable; urgency=medium * Update to 0.4.2 release. + * Fix copyright symlink to point to correct GPL version + * Update package Description to be more informative - -- Ben Carrillo <ben@futeisha.org> Fri, 28 Aug 2015 15:44:14 -0400 + -- Micah Anderson <micah@leap.se> Tue, 01 Sep 2015 15:44:14 -0400 leap-keymanager (0.3.8) unstable; urgency=low diff --git a/debian/control b/debian/control index 0d190ba..03d5c1a 100644 --- a/debian/control +++ b/debian/control @@ -10,5 +10,8 @@ Architecture: all Depends: ${misc:Depends}, ${python:Depends}, gnupg Enhances: gnupg Description: LEAP's Key Manager - The Key Manager handles all types of keys to allow for point-to-point - encryption between parties communicating through LEAP infrastructure. + The Key Manager is a trusted user agent that is responsible for storing a + database of all the keys for the user, updating these keys, and auditing the + endorsements of the user’s own keys. Typically, the key manager will run on the + user’s device, but might be running on any device the user chooses to trust. + diff --git a/debian/copyright b/debian/copyright index 85071d3..fe27ccb 100644 --- a/debian/copyright +++ b/debian/copyright @@ -13,4 +13,4 @@ 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'. + Public License can be found in `/usr/share/common-licenses/GPL-3'. |