diff options
| author | Micah Anderson <micah@riseup.net> | 2015-01-13 16:53:38 -0500 |
|---|---|---|
| committer | Micah Anderson <micah@riseup.net> | 2015-01-13 16:53:38 -0500 |
| commit | 1d2648554006335bc04c4ae21c423578dbd8ee19 (patch) | |
| tree | 6ab6a6e5f183addc1e3822c5cea0bb1f29528c3d | |
| parent | ea9bdf4f0802285238b5432b5f05decb5267b218 (diff) | |
| parent | 67b738c2f5922dbc5cf105e9617ce6d1d5e4e8e3 (diff) | |
Merge branch 'debian/experimental' into ppappa
Conflicts:
debian/changelog
| -rw-r--r-- | debian/changelog | 6 | ||||
| -rw-r--r-- | debian/control | 2 | ||||
| -rw-r--r-- | debian/copyright | 2 |
3 files changed, 6 insertions, 4 deletions
diff --git a/debian/changelog b/debian/changelog index 103663a..a4ab6cd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,10 @@ -leap-mail (0.3.11ppa1) unstable; urgency=medium +leap-mail (0.3.11.1ppa1) unstable; urgency=medium + * Update Standards version to 3.9.6 (no changes) + * Update debian/copyright to fix space-in-std-shortname * Rebuild for ppa - -- Micah Anderson <micah@leap.se> Tue, 13 Jan 2015 16:47:35 -0500 + -- Micah Anderson <micah@leap.se> Tue, 13 Jan 2015 16:49:11 -0500 leap-mail (0.3.11) unstable; urgency=medium diff --git a/debian/control b/debian/control index 904f960..b573d95 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Maintainer: Micah Anderson <micah@leap.se> Section: python Priority: optional Build-Depends: python-setuptools (>= 0.6b3), python-all (>= 2.6.6-3), debhelper (>= 9) -Standards-Version: 3.9.5 +Standards-Version: 3.9.6 Package: leap-mail Architecture: all diff --git a/debian/copyright b/debian/copyright index f23ac59..7a9d97b 100644 --- a/debian/copyright +++ b/debian/copyright @@ -5,7 +5,7 @@ Source: <http://github.com/leapcode/leap_mail/> Files: * Copyright: 2012,2013 The LEAP Encryption Access Project -License: GPL-3+ OpenSSL +License: GPL-3+ with OpenSSL exception This package is released under the GNU GPL, version 3 or a later revision. For further details see the COPYING file. . |