summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog11
-rw-r--r--debian/clean2
-rw-r--r--debian/control13
-rw-r--r--debian/copyright2
4 files changed, 14 insertions, 14 deletions
diff --git a/debian/changelog b/debian/changelog
index ba3609f4..a52d6c96 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
bitmask (0.3.1) unstable; urgency=low
+ [ Ben Carrillo ]
* Merge master for new release
* Cherrypick fix for updown script.
* Add data files to install /etc/leap/resolv-update
@@ -7,13 +8,11 @@ bitmask (0.3.1) unstable; urgency=low
* Install CHANGELOG.
* Update path to icon and menu entry to new package name.
- -- Ben Carrillo <ben@futeisha.org> Mon, 26 Aug 2013 14:21:06 +0200
-
-bitmask (0.3.1~pre) unstable; urgency=low
-
- * Merge develop for new release
+ [ Micah Anderson ]
+ * Update debian/copyright for new license
+ * Reformat extended description to fit properly
- -- Micah Anderson <micah@debian.org> Thu, 22 Aug 2013 17:22:26 -0400
+ -- Ben Carrillo <ben@futeisha.org> Mon, 26 Aug 2013 14:21:06 +0200
bitmask (0.3.0) unstable; urgency=low
diff --git a/debian/clean b/debian/clean
index 322f3a67..698f87e3 100644
--- a/debian/clean
+++ b/debian/clean
@@ -1 +1,3 @@
docs/man/leap-client.1
+MANIFEST
+src/leap.bitmask.egg-info/*
diff --git a/debian/control b/debian/control
index ca019e84..b965a664 100644
--- a/debian/control
+++ b/debian/control
@@ -45,11 +45,10 @@ Suggests: resolvconf
Conflicts: autoresolv
Enhances: openvpn
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.
+ LEAP (LEAP Encryption Access Project) develops a plan to secure everyday
+ communication, breaking down into discrete services.
.
- The client for the current phase gives support to the EIP Service.
- EIP (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.
+ 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.
diff --git a/debian/copyright b/debian/copyright
index 193bcce0..3d4db2b3 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,5 +1,5 @@
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: bitmask
+Upstream-Name: bitmask
Upstream-Contact: info@leap.se
Source: <http://github.com/leapcode/leap_client/>