summaryrefslogtreecommitdiff
path: root/debian/changelog
diff options
context:
space:
mode:
authormicah <micah@riseup.net>2013-08-27 08:31:16 -0700
committermicah <micah@riseup.net>2013-08-27 08:31:16 -0700
commit5997cb2c8c2aa2af18079f9a9505731f498fb9a4 (patch)
tree0b0f74fbd7ec8119171a1aa355e9e95b0193395e /debian/changelog
parent655a9a610cfe69530b8f6fde41e9255435374253 (diff)
parenta894346b666b657dec99c41783e4c862777b62b3 (diff)
Merge pull request #276 from kalikaneko/debian-0.3.1
Debian 0.3.1
Diffstat (limited to 'debian/changelog')
-rw-r--r--debian/changelog13
1 files changed, 12 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index c72287f6..ba3609f4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,15 @@
-bitmask (0.3.1pre) unstable; urgency=low
+bitmask (0.3.1) unstable; urgency=low
+
+ * Merge master for new release
+ * Cherrypick fix for updown script.
+ * Add data files to install /etc/leap/resolv-update
+ * Add leap.mail and leap.soledad.client dependencies explicitly.
+ * 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