summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorKali Kaneko <kali@leap.se>2015-11-03 11:23:44 -0400
committerKali Kaneko <kali@leap.se>2015-11-03 11:23:44 -0400
commit72f2bd630cbc72d12b6fe9c0f28b9e3d3d141f49 (patch)
tree77e6894a9f260b417a87dacd026605192eb578d9 /debian
parent0b52cb4d9bfa59eeb6b7d8ce386be1a0118df6ef (diff)
[pkg] correct info about cherry-pick
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog2
1 files changed, 1 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index 67b19ad6..d4158eee 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,7 +9,7 @@ bitmask (0.9.0) unstable; urgency=medium
* Add versioned dependency on python-twisted-core
* Add Recommends on thunderbird extension
* Cherry-pick 9362e25 to avoid using system tornado in zmq.
- * Cherry-pick 4ba1771 to support gnupg2 as default in system.
+ * Cherry-pick 5d48352, pick gpg1 if /usr/bin/gpg is symlink.
-- Ben Carrillo <ben@futeisha.org> Thu, 29 Oct 2015 12:16:57 -0400