aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog10
-rw-r--r--debian/control10
-rw-r--r--doc/sidebar.mdwn2
-rw-r--r--git-annex.cabal4
4 files changed, 15 insertions, 11 deletions
diff --git a/debian/changelog b/debian/changelog
index 51c8eb2c8..36523ce04 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,7 @@
-git-annex (5.20140108) UNRELEASED; urgency=medium
+git-annex (5.20140116) unstable; urgency=medium
* Added tahoe special remote.
* external special remote protocol: Added GETGITDIR, and GETAVAILABILITY.
- * Android: Avoid passing --clobber to busybox wget.
* Refuse to build with git older than 1.7.1.1, which is needed for
git checkout -B
* map: Fix display of v5 direct mode repos.
@@ -15,12 +14,13 @@ git-annex (5.20140108) UNRELEASED; urgency=medium
(These log files can be safely removed.)
* assistant: Detect if .git/annex/index is corrupt at startup, and
recover.
- * Fix FTBFS on mipsel and sparc due to test suite not being available
- on those architectures.
* repair: Fix bug in packed refs file exploding code that caused a .gitrefs
directory to be created instead of .git/refs
+ * Fix FTBFS on mipsel and sparc due to test suite not being available
+ on those architectures.
+ * Android: Avoid passing --clobber to busybox wget.
- -- Joey Hess <joeyh@debian.org> Wed, 08 Jan 2014 13:13:54 -0400
+ -- Joey Hess <joeyh@debian.org> Thu, 16 Jan 2014 11:34:54 -0400
git-annex (5.20140107) unstable; urgency=medium
diff --git a/debian/control b/debian/control
index 17343f1a7..b7649b28d 100644
--- a/debian/control
+++ b/debian/control
@@ -63,7 +63,7 @@ Build-Depends:
curl,
openssh-client,
Maintainer: Joey Hess <joeyh@debian.org>
-Standards-Version: 3.9.4
+Standards-Version: 3.9.5
Vcs-Git: git://git.kitenet.net/git-annex
Homepage: http://git-annex.branchable.com/
XS-Testsuite: autopkgtest
@@ -84,8 +84,12 @@ Recommends:
ssh-askpass,
quvi,
git-remote-gcrypt (>= 0.20130908-4),
- nocache
-Suggests: graphviz, bup, libnss-mdns
+ nocache,
+Suggests:
+ graphviz,
+ bup,
+ tahoe-lafs,
+ libnss-mdns,
Description: manage files with git, without checking their contents into git
git-annex allows managing files with git, without checking the file
contents into git. While that may seem paradoxical, it is useful when
diff --git a/doc/sidebar.mdwn b/doc/sidebar.mdwn
index 17db401fa..ea11991a6 100644
--- a/doc/sidebar.mdwn
+++ b/doc/sidebar.mdwn
@@ -9,4 +9,4 @@
* [[forum]]
* [[comments]]
* [[contact]]
-* <a href="http://flattr.com/thing/84843/git-annex"><img src="https://api.flattr.com/button/flattr-badge-large.png" alt="Flattr this" title="Flattr this" /></a>
+* [Flattr this](http://flattr.com/thing/84843/git-annex)
diff --git a/git-annex.cabal b/git-annex.cabal
index 81afb5a48..034e70ee1 100644
--- a/git-annex.cabal
+++ b/git-annex.cabal
@@ -1,11 +1,11 @@
Name: git-annex
-Version: 5.20140107
+Version: 5.20140116
Cabal-Version: >= 1.8
License: GPL-3
Maintainer: Joey Hess <joey@kitenet.net>
Author: Joey Hess
Stability: Stable
-Copyright: 2010-2013 Joey Hess
+Copyright: 2010-2014 Joey Hess
License-File: COPYRIGHT
Homepage: http://git-annex.branchable.com/
Build-type: Custom