diff options
| author | Micah Anderson <micah@riseup.net> | 2013-10-22 13:29:11 -0400 |
|---|---|---|
| committer | Micah Anderson <micah@riseup.net> | 2013-10-22 13:29:11 -0400 |
| commit | f22b1a04f892857d162d87f9c9e120e7c5daadf7 (patch) | |
| tree | 8998a60a2f55aa6f22a76e7aa1ec176e16f5cf33 /debian | |
| parent | dd907d3098c582b9e92eb181efb87453f046dcc6 (diff) | |
| parent | 522b886046baf114f2b86173661e568c7c065da6 (diff) | |
Merge remote-tracking branch 'kali/debian-0.3.4' into debian
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rw-r--r-- | debian/control | 1 |
2 files changed, 8 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index d4a788ec..61c11d1a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +bitmask (0.3.4) unstable; urgency=low + + * Update to 0.3.4 release. + * Removed explicit gnupg dependency; now we indirectly depend on + python-gnupg-ng. + -- Ben Carrillo <ben@futeisha.org> Mon, 14 Oct 2013 17:34:43 -0300 + bitmask (0.3.3) unstable; urgency=low * Update to 0.3.3 release. diff --git a/debian/control b/debian/control index a0f9dac5..537293a1 100644 --- a/debian/control +++ b/debian/control @@ -42,6 +42,7 @@ Depends: python-leap-common, leap-mail, soledad-client +Recommends: xul-ext-bitmask Suggests: resolvconf Conflicts: autoresolv Enhances: openvpn |