diff options
| -rwxr-xr-x | debian/cabal-wrapper | 4 | ||||
| -rw-r--r-- | debian/changelog | 6 | ||||
| -rw-r--r-- | debian/control | 1 | ||||
| -rw-r--r-- | doc/news/version_5.20140817.mdwn | 42 | ||||
| -rw-r--r-- | doc/news/version_5.20140927.mdwn | 6 | ||||
| -rw-r--r-- | git-annex.cabal | 2 |
6 files changed, 16 insertions, 45 deletions
diff --git a/debian/cabal-wrapper b/debian/cabal-wrapper index e0623f79f..1326aead7 100755 --- a/debian/cabal-wrapper +++ b/debian/cabal-wrapper @@ -13,4 +13,8 @@ set -e 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 index 46c86790b..ae0e2c758 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,11 @@ -git-annex (5.20140927) UNRELEASED; urgency=medium +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 <joeyh@debian.org> Sat, 27 Sep 2014 12:14:15 -0400 + -- Joey Hess <joeyh@debian.org> Sat, 27 Sep 2014 14:25:09 -0400 git-annex (5.20140926) unstable; urgency=high diff --git a/debian/control b/debian/control index ec29aedbf..3b4ee9e84 100644 --- a/debian/control +++ b/debian/control @@ -74,6 +74,7 @@ Build-Depends: curl, openssh-client, git-remote-gcrypt (>= 0.20130908-6), + llvm-3.4 [armel armhf], Maintainer: Joey Hess <joeyh@debian.org> Standards-Version: 3.9.5 Vcs-Git: git://git.kitenet.net/git-annex diff --git a/doc/news/version_5.20140817.mdwn b/doc/news/version_5.20140817.mdwn deleted file mode 100644 index 82e44eb57..000000000 --- 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."""]]
\ No newline at end of file diff --git a/doc/news/version_5.20140927.mdwn b/doc/news/version_5.20140927.mdwn new file mode 100644 index 000000000..9aabf1594 --- /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."""]]
\ No newline at end of file diff --git a/git-annex.cabal b/git-annex.cabal index 9dd815732..84448eca7 100644 --- 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 <joey@kitenet.net> |