aboutsummaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2014-05-02 15:32:49 -0300
committerGravatar Joey Hess <joey@kitenet.net>2014-05-02 15:32:49 -0300
commitcff2db0f2424dd47a60ce21c0ca42017bb1b709d (patch)
treeb8de4e471e4f77f235a2d4b4fc52b6620c59be4d /debian
parentf11dd1f77292d6a5eee3da9415a99e75c5da4e78 (diff)
parent10a3d627dcb23035bc68c9912e927288be493d8e (diff)
Merge branch 'master' into bootstrap3
Conflicts: debian/changelog
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog4
1 files changed, 4 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 043e9f015..9ed7d0ffd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,10 @@ git-annex (5.20140422) UNRELEASED; urgency=medium
* webapp: Switched to bootstrap 3.
Thanks, Sören Brunk.
+ * Standalone builds now check gpg signatures before upgrading.
+ * Simplified repository description line format. The remote name,
+ if any, is always in square brackets after the description.
+ * assistant: Clean up stale tmp files on startup.
-- Joey Hess <joeyh@debian.org> Fri, 02 May 2014 15:28:53 -0300