lintian fixes, including updates to desktop file to add Keywords

3 files changed, 22 insertions, 9 deletions

diff --git a/debian/bitmask.desktop b/debian/bitmask.desktop
index a934a762..2fb9f10a 100644
--- a/debian/bitmask.desktop
+++ b/debian/bitmask.desktop
@@ -1,6 +1,5 @@
 [Desktop Entry]
 Version=1.0
-Encoding=UTF-8
 Type=Application
 Name=Bitmask
 Comment=Secure Communication
@@ -12,3 +11,4 @@ Icon=bitmask
 Categories=Network;Application;
 StartupNotify=true
 X-AppInstall-Package=bitmask
+Keywords=email;messaging;encryption;vpn;leap
diff --git a/debian/changelog b/debian/changelog
index d7483a5c..da84ff4b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,11 @@
 bitmask (0.9.0~rc2) unstable; urgency=medium
 
   * Update to 0.9.0rc2 release.
+  * Update debian/control Description
+  * Remove deprecated Encoding key in debian/bitmask.desktop
+  * Add Keywords entry to debian/bitmask.desktop
 
- -- Ben Carrillo <ben@futeisha.org>  Mon, 31 Aug 2015 14:57:24 -0400
+ -- Micah Anderson <micah@debian.org>  Tue, 01 Sep 2015 14:57:24 -0400
 
 bitmask (0.8.1) unstable; urgency=medium
 
diff --git a/debian/control b/debian/control
index 36bbb8db..94363c35 100644
--- a/debian/control
+++ b/debian/control
@@ -47,11 +47,21 @@ Depends:
 # Recommends: xul-ext-bitmask
 Suggests: policykit-1-gnome
 Enhances: openvpn, gnupg
-Description: Provides the desktop client for the LEAP Encryption Access Project Platform.
- LEAP (LEAP Encryption Access Project) develops a plan to secure everyday
- communication, breaking down into discrete services.
+Description: Provides the desktop client for LEAP 
+ The LEAP project aims to secure everyday communication.
  .
- The client for the current phase gives support to the EIP Service. The
- Encrypted Internet Proxy) provides circumvention, location anonymization, and
- traffic encryption in a hassle-free, automatically self-configuring fashion,
- and has an enhanced level of security.
+ This client is necessary for users to run on their local machines for:
+ .
+ * The LEAP VPN service which provides circumvention, location anonymization,
+ and traffic encryption in a hassle-free, automatically self-configuring
+ fashion, and has an enhanced level of security.
+ .
+ * The LEAP email service which provides full end-to-end client-encrypted email,
+ quietly handling the complexities of public key encryption and allowing for
+ backward compatibility with legacy email when necessary. Email is encrypted and
+ stored so only the recipient can read it, both locally and when synchronized
+ with the server; all message relay among service providers is required to be
+ encrypted when possible; and public keys are automatically discovered and
+ validated.
+
+