diff options
| author | Micah Anderson <micah@riseup.net> | 2013-08-27 12:20:29 -0400 |
|---|---|---|
| committer | Micah Anderson <micah@riseup.net> | 2013-08-27 12:20:29 -0400 |
| commit | 4951157e3740b42ecef6775c8927b912a6ee8870 (patch) | |
| tree | 00e7bf6c9d14106c8b06dd030b90d130fa8c40bd /debian/changelog | |
| parent | 1b4458bfc2ce97ec02180793eca0fcca38be4f84 (diff) | |
| parent | 5997cb2c8c2aa2af18079f9a9505731f498fb9a4 (diff) | |
Merge remote-tracking branch 'leapcode/debian' into debian
Conflicts:
MANIFEST.in
debian/changelog
debian/copyright
Diffstat (limited to 'debian/changelog')
| -rw-r--r-- | debian/changelog | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog index 69f0140d..a52d6c96 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,18 @@ -bitmask (0.3.1pre) unstable; urgency=low +bitmask (0.3.1) unstable; urgency=low - * Merge in develop changes + [ Ben Carrillo ] + * 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. + + [ Micah Anderson ] * Update debian/copyright for new license * Reformat extended description to fit properly - -- Micah Anderson <micah@debian.org> Thu, 22 Aug 2013 15:24:53 -0400 + -- Ben Carrillo <ben@futeisha.org> Mon, 26 Aug 2013 14:21:06 +0200 bitmask (0.3.0) unstable; urgency=low |