add news item for git-annex 4.20130521

2 files changed, 24 insertions, 37 deletions

diff --git a/doc/news/version_4.20130323.mdwn b/doc/news/version_4.20130323.mdwn
deleted file mode 100644
index 1ccdf90d1..000000000
--- a/doc/news/version_4.20130323.mdwn
+++ /dev/null
@@ -1,37 +0,0 @@
-git-annex 4.20130323 released with [[!toggle text="these changes"]]
-[[!toggleable text="""
-   * webapp: Repository list is now included in the dashboard, and other
-     UI tweaks.
-   * webapp: Improved UI for pairing your own devices together using XMPP.
-   * webapp: Display an alert when there are XMPP remotes, and a cloud
-     transfer repository needs to be configured.
-   * Add incrementalbackup repository group.
-   * webapp: Encourage user to install git-annex on a server when adding
-     a ssh server, rather than just funneling them through to rsync.
-   * xmpp: --debug now enables a sanitized dump of the XMPP protocol
-   * xmpp: Try harder to detect presence of clients when there's a git push
-     to send.
-   * xmpp: Re-enable XA flag, since disabling it did not turn out to help
-     with the problems Google Talk has with not always sending presence
-     messages to clients.
-   * map: Combine duplicate repositories, for a nicer looking map.
-   * Fix several bugs caused by a bad Ord instance for Remote.
-   * webapp: Switch all forms to POST.
-   * assistant: Avoid syncing with annex-ignored remotes when reconnecting
-     to the network, or connecting a drive.
-   * assistant: Fix OSX bug that prevented committing changed files to a
-     repository when in indirect mode.
-   * webapp: Improved alerts displayed when syncing with remotes, and
-     when syncing with a remote fails.
-   * webapp: Force wrap long filenames in transfer display.
-   * assistant: The ConfigMonitor left one zombie behind each time
-     it checked for changes, now fixed.
-   * get, copy, move: Display an error message when an identical transfer
-     is already in progress, rather than failing with no indication why.
-   * assistant: Several optimisations to file transfers.
-   * OSX app and standalone Linux tarball now both support being added to
-     PATH; no need to use runshell to start git-annex.
-   * webapp: When adding a removable drive, you can now specify the
-     directory inside it to use.
-   * webapp: Confirm whether user wants to combine repositories when
-     adding a removable drive that already has a repository on it."""]]
\ No newline at end of file
diff --git a/doc/news/version_4.20130521.mdwn b/doc/news/version_4.20130521.mdwn
new file mode 100644
index 000000000..af4f25bfa
--- /dev/null
+++ b/doc/news/version_4.20130521.mdwn
@@ -0,0 +1,24 @@
+git-annex 4.20130521 released with [[!toggle text="these changes"]]
+[[!toggleable text="""
+   * Sanitize debian changelog version before putting it into cabal file.
+     Closes: #[708619](http://bugs.debian.org/708619)
+   * Switch to MonadCatchIO-transformers for better handling of state while
+     catching exceptions.
+   * Fix a zombie that could result when running a process like gpg to
+     read and write to it.
+   * Allow building with gpg2.
+   * Disable building with the haskell threaded runtime when the webapp
+     is not built. This may fix builds on mips, s390x and sparc, which are
+     failing to link -lHSrts\_thr
+   * Temporarily build without webapp on kfreebsd-i386, until yesod is
+     installable there again.
+   * Direct mode bug fix: After a conflicted merge was automatically resolved,
+     the content of a file that was already present could incorrectly
+     be replaced with a symlink.
+   * Fix a bug in the git-annex branch handling code that could
+     cause info from a remote to not be merged and take effect immediately.
+   * Direct mode is now fully tested by the test suite.
+   * Detect bad content in ~/.config/git-annex/program and look in PATH instead.
+   * OSX: Fixed gpg included in dmg.
+   * Linux standalone: Back to being built with glibc 2.13 for maximum
+     portability."""]]
\ No newline at end of file