diff --git a/CHANGELOG b/CHANGELOG --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,12 @@ +git-annex (5.20140927) unstable; urgency=medium + + * Really depend (not just build-depend) on new enough git for --no-gpg-sign + to work. Closes: #763057 + * Add temporary workaround for bug #763078 which broke building on armel + and armhf. + + -- Joey Hess Sat, 27 Sep 2014 14:25:09 -0400 + git-annex (5.20140926) unstable; urgency=high * Depend on new enough git for --no-gpg-sign to work. Closes: #762446 diff --git a/debian/cabal-wrapper b/debian/cabal-wrapper --- a/debian/cabal-wrapper +++ b/debian/cabal-wrapper @@ -13,4 +13,8 @@ HOME=$(mktemp -d) export HOME +# Temporary workaround for #763078 +PATH=/usr/lib/llvm-3.4/bin:$PATH +export PATH + cabal "$@" diff --git a/debian/changelog b/debian/changelog --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +git-annex (5.20140927) unstable; urgency=medium + + * Really depend (not just build-depend) on new enough git for --no-gpg-sign + to work. Closes: #763057 + * Add temporary workaround for bug #763078 which broke building on armel + and armhf. + + -- Joey Hess Sat, 27 Sep 2014 14:25:09 -0400 + git-annex (5.20140926) unstable; urgency=high * Depend on new enough git for --no-gpg-sign to work. Closes: #762446 diff --git a/debian/control b/debian/control --- a/debian/control +++ b/debian/control @@ -74,6 +74,7 @@ curl, openssh-client, git-remote-gcrypt (>= 0.20130908-6), + llvm-3.4 [armel armhf], Maintainer: Joey Hess Standards-Version: 3.9.5 Vcs-Git: git://git.kitenet.net/git-annex @@ -84,7 +85,7 @@ Architecture: any Section: utils Depends: ${misc:Depends}, ${shlibs:Depends}, - git (>= 1:1.8.4), + git (>= 1:2.0), rsync, wget, curl, diff --git a/doc/bugs/hS3_prevents_build.mdwn b/doc/bugs/hS3_prevents_build.mdwn new file mode 100644 --- /dev/null +++ b/doc/bugs/hS3_prevents_build.mdwn @@ -0,0 +1,3 @@ +The `hS3` dependency doesn't work with the `network` / `network-uri` split, which causes a build failure for `git-annex` in a fresh sandbox with its current version bounds. Either more gymnastics are needed to constrain `network` to accommodate `hS3`, or the `s3-aws` branch could be merged in if it's ready. Building `git-annex` with a `< 2.6` constraint on `network` does succeed. + +> not a bug in git-annex, but in a dependency it uses, so [[done]]. (I already told the hS3 author about this, which is a very easy fix there, and he promised to fix it soon.) --[[Joey]] diff --git a/doc/news/version_5.20140817.mdwn b/doc/news/version_5.20140817.mdwn deleted file mode 100644 --- a/doc/news/version_5.20140817.mdwn +++ /dev/null @@ -1,42 +0,0 @@ -git-annex 5.20140817 released with [[!toggle text="these changes"]] -[[!toggleable text=""" - * New chunk= option to chunk files stored in special remotes. - Supported by: directory, S3, webdav, gcrypt, rsync, and all external - and hook special remotes. - * Partially transferred files are automatically resumed when using - chunked remotes! - * The old chunksize= option is deprecated. Do not use for new remotes. - * Legacy code for directory remotes using the old chunksize= option - will keep them working, but more slowly than before. - * webapp: Automatically install Konqueror integration scripts - to get and drop files. - * repair: Removing bad objects could leave fsck finding no more - unreachable objects, but some branches no longer accessible. - Fix this, including support for fixing up repositories that - were incompletely repaired before. - * Fix cost calculation for non-encrypted remotes. - * Display exception message when a transfer fails due to an exception. - * WebDAV: Sped up by avoiding making multiple http connections - when storing a file. - * WebDAV: Avoid buffering whole file in memory when uploading and - downloading. - * WebDAV: Dropped support for DAV before 1.0. - * testremote: New command to test uploads/downloads to a remote. - * Dropping an object from a bup special remote now deletes the git branch - for the object, although of course the object's content cannot be deleted - due to the nature of bup. - * unlock: Better error handling; continue past files that are not available - or cannot be unlocked due to disk space, and try all specified files. - * Windows: Now uses actual inode equivilants in new direct mode - repositories, for safer detection of eg, renaming of files with the same - size and mtime. - * direct: Fix ugly warning messages. - * WORM backend: When adding a file in a subdirectory, avoid including the - subdirectory in the key name. - * S3, Glacier, WebDAV: Fix bug that prevented accessing the creds - when the repository was configured with encryption=shared embedcreds=yes. - * direct: Avoid leaving file content in misctemp if interrupted. - * git-annex-shell sendkey: Don't fail if a remote asks for a key to be sent - that already has a transfer lock file indicating it's being sent to that - remote. The remote may have moved between networks, or reconnected. - * Switched from the old haskell HTTP library to http-conduit."""]] diff --git a/doc/news/version_5.20140927.mdwn b/doc/news/version_5.20140927.mdwn new file mode 100644 --- /dev/null +++ b/doc/news/version_5.20140927.mdwn @@ -0,0 +1,6 @@ +git-annex 5.20140927 released with [[!toggle text="these changes"]] +[[!toggleable text=""" + * Really depend (not just build-depend) on new enough git for --no-gpg-sign + to work. Closes: #[763057](http://bugs.debian.org/763057) + * Add temporary workaround for bug #763078 which broke building on armel + and armhf."""]] diff --git a/git-annex.cabal b/git-annex.cabal --- a/git-annex.cabal +++ b/git-annex.cabal @@ -1,5 +1,5 @@ Name: git-annex -Version: 5.20140926 +Version: 5.20140927 Cabal-Version: >= 1.8 License: GPL-3 Maintainer: Joey Hess