summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2014-12-31 15:27:20 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2014-12-31 15:27:20 -0400
commit25d57e0125ea24f4dcaf1c6ff62b694635a779a9 (patch)
treefed979f383a706514769a570de2080feb785cf68
parenta00c81ea0bd335e1a4c12994128f10e4460f8869 (diff)
touchups5.20141231
-rw-r--r--debian/changelog2
-rw-r--r--debian/control2
2 files changed, 2 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog
index 9aac57455..fcf1d1fa9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,7 +5,7 @@ git-annex (5.20141231) unstable; urgency=medium
* sync: Now supports remote groups, the same way git remote update does.
* setpresentkey: A new plumbing-level command.
* Run shutdown cleanup actions even if there were failures processing
- the command. Amoung other fixes, this means that addurl will stage
+ the command. Among other fixes, this means that addurl will stage
added files even if adding one of the urls fails.
* bittorrent: Fix locking problem when using addurl file://
* Windows: Fix local rsync filepath munging (fixes 26 test suite failures).
diff --git a/debian/control b/debian/control
index b8ce1c342..b3e06aec5 100644
--- a/debian/control
+++ b/debian/control
@@ -78,7 +78,7 @@ Build-Depends:
git-remote-gcrypt (>= 0.20130908-6),
llvm-3.4 [armel armhf],
Maintainer: Gergely Nagy <algernon@madhouse-project.org>
-Standards-Version: 3.9.5
+Standards-Version: 3.9.6
Vcs-Git: git://git.kitenet.net/git-annex
Homepage: http://git-annex.branchable.com/
XS-Testsuite: autopkgtest