prep release5.20150812

2 files changed, 24 insertions, 24 deletions

diff --git a/debian/changelog b/debian/changelog
index 3100d0125..c43a3e813 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,21 @@
-git-annex (5.20150732) UNRELEASED; urgency=medium
+git-annex (5.20150812) unstable; urgency=medium
 
+  * Added support for SHA3 hashed keys (in 8 varieties), when git-annex is
+    built using the cryptonite library.
+  * metadata: Fix reversion introduced in 5.20150727 that caused recursive
+    display of metadata to not work.
+  * Windows: Fix bug that caused git-annex sync to fail due to missing
+    environment variable.
+  * Fix setting/setting/viewing metadata that contains unicode or other
+    special characters, when in a non-unicode locale.
+  * Simplify setup process for a ssh remote. Now it suffices to run git
+    remote add, followed by git-annex sync. Now the remote is automatically
+    initialized for use by git-annex, where before the git-annex branch had
+    to manually be pushed before using git-annex sync. Note that this
+    involved changes to git-annex-shell, so if the remote is using an old
+    version, the manual push is still needed.
+  * git-annex-shell: Don't let configlist auto-init repository when in
+    readonly mode.
   * Perform a clean shutdown when --time-limit is reached.
     This includes running queued git commands, and cleanup actions normally
     run when a command is finished.
@@ -9,37 +25,21 @@ git-annex (5.20150732) UNRELEASED; urgency=medium
   * fsck: Commit incremental fsck database after every 1000 files
     fscked, or every 5 minutes, whichever comes first. Previously,
     commits were made every 1000 files fscked.
-  * Tighten dependency on optparse-applicative to 0.11.0.
-  * Added back debian/cabal-wrapper, since it still seems needed after all.
+  * Linux standalone: Work around problem that prevented it from working
+    properly if unpacked into a directory that contains ":" or ";" in its
+    name.
   * proxy: Fix proxy git commit of non-annexed files in direct mode. 
   * proxy: If a non-proxied git command, such as git revert
     would normally fail because of unstaged files in the work tree,
     make the proxied command fail the same way.
   * proxy: Fix removal of files deleted by the proxied command.
   * proxy: Fix behavior when run in subdirectory of git repo.
-  * Windows: Fix bug that caused git-annex sync to fail due to missing
-    environment variable.
-  * Linux standalone: Work around problem that prevented it from working
-    properly if unpacked into a directory that contains ":" or ";" in its
-    name.
-  * Simplify setup process for a ssh remote. Now it suffices to run git
-    remote add, followed by git-annex sync. Now the remote is automatically
-    initialized for use by git-annex, where before the git-annex branch had
-    to manually be pushed before using git-annex sync. Note that this
-    involved changes to git-annex-shell, so if the remote is using an old
-    version, the manual push is still needed.
-  * git-annex-shell: Don't let configlist auto-init repository when in
-    readonly mode.
-  * Added support for SHA3 hashed keys (in 8 varieties), when git-annex is
-    built using the cryptonite library.
   * Improve Setup.hs file so that cabal copy --destdir works.
     Thanks, Magnus Therning.
-  * metadata: Fix reversion introduced in 5.20150727 that caused recursive
-    display of metadata to not work.
-  * Fix setting/setting/viewing metadata that contains unicode or other
-    special characters, when in a non-unicode locale.
+  * Tighten dependency on optparse-applicative to 0.11.0.
+  * Added back debian/cabal-wrapper, since it still seems needed after all.
 
- -- Joey Hess <id@joeyh.name>  Fri, 31 Jul 2015 12:31:39 -0400
+ -- Joey Hess <id@joeyh.name>  Wed, 12 Aug 2015 11:14:58 -0400
 
 git-annex (5.20150731) unstable; urgency=medium
 
diff --git a/git-annex.cabal b/git-annex.cabal
index 13b22c338..5431d6ddc 100644
--- a/git-annex.cabal
+++ b/git-annex.cabal
@@ -1,5 +1,5 @@
 Name: git-annex
-Version: 5.20150731
+Version: 5.20150812
 Cabal-Version: >= 1.8
 License: GPL-3
 Maintainer: Joey Hess <id@joeyh.name>