Merge branch 'master' into concurrentprogress
Conflicts: Command/Fsck.hs Messages.hs Remote/Directory.hs Remote/Git.hs Remote/Helper/Special.hs Types/Remote.hs debian/changelog git-annex.cabal
This commit is contained in:
Joey Hess
commit
e27b97d364
378 changed files with 4978 additions and 1158 deletions
100
debian/changelog
vendored
100
debian/changelog
vendored
|
|
@ -1,7 +1,80 @@
|
|||
git-annex (5.20150410) UNRELEASED; urgency=medium
|
||||
|
||||
* get, move, copy, mirror: Concurrent downloads and uploads are
|
||||
now supported! For example: git-annex get -J10
|
||||
|
||||
git-annex (5.20150508.2) UNRELEASED; urgency=medium
|
||||
|
||||
* import: Refuse to import files that are within the work tree, as that
|
||||
does not make sense and could cause data loss.
|
||||
* drop: Now supports --all, --unused, and --key.
|
||||
* drop: Now defaults to --all when run in a bare repository.
|
||||
(Previously, did nothing when run in a bare repository.)
|
||||
|
||||
-- Joey Hess <id@joeyh.name> Mon, 11 May 2015 12:45:06 -0400
|
||||
|
||||
git-annex (5.20150508.1) unstable; urgency=medium
|
||||
|
||||
* Now builds cleanly using ghc 7.10 (as well as ghc back to 7.6).
|
||||
* Imrovements to the git-annex-standalone.deb build process.
|
||||
(Thanks, Yaroslav Halchenko)
|
||||
|
||||
-- Joey Hess <id@joeyh.name> Mon, 11 May 2015 12:08:58 -0400
|
||||
|
||||
git-annex (5.20150508) unstable; urgency=medium
|
||||
|
||||
* Improve behavior when a git-annex command is told to operate
|
||||
on a file that doesn't exist. It will now continue to other
|
||||
files specified after that on the command line, and only error out at
|
||||
the end.
|
||||
* S3: Enable debug logging when annex.debug or --debug is set.
|
||||
* S3: git annex info will show additional information about a S3 remote
|
||||
(endpoint, port, storage class)
|
||||
* S3: Let git annex enableremote be used, without trying to recreate
|
||||
a bucket that should already exist.
|
||||
* S3: Fix incompatability with bucket names used by hS3; the aws library
|
||||
cannot handle upper-case bucket names. git-annex now converts them to
|
||||
lower case automatically.
|
||||
* import: Check for gitignored files before moving them into the tree.
|
||||
(Needs git 1.8.4 or newer.)
|
||||
* import: Don't stop entire import when one file fails due to being
|
||||
gitignored or conflicting with something in the work tree.
|
||||
* import: Before removing a duplicate file in --deduplicate or
|
||||
--clean-duplicates mode, verify that enough copies of its content still
|
||||
exist.
|
||||
* Improve integration with KDE's file manager to work with dolphin
|
||||
version 14.12.3 while still being compatable with 4.14.2.
|
||||
Thanks, silvio.
|
||||
* assistant: Added --autostop to complement --autostart.
|
||||
* Work around wget bug #784348 which could cause it to clobber git-annex
|
||||
symlinks when downloading from ftp.
|
||||
* Support checking ftp urls for file presence.
|
||||
* Fix bogus failure of fsck --fast.
|
||||
* fsck: Ignore error recording the fsck in the activity log,
|
||||
which can happen when running fsck in a read-only repository.
|
||||
Closes: #698559
|
||||
(fsck can still need to write to the repository if it find problems,
|
||||
but a successful fsck can be done read-only)
|
||||
* Improve quvi 0.4 output parsing to handle cases wher there is no known
|
||||
filename extension. This is currently the case when using quvi with
|
||||
youtube. In this case, the extension ".m" will be used.
|
||||
* Dropped support for older versions of yesod, warp, and dbus than the ones
|
||||
in Debian Jessie.
|
||||
* Switch from the obsolete dataenc library for base64 encoding to sandi.
|
||||
(Thanks, Magnus Therning)
|
||||
* Debian's ghc now supports TH on arm! Adjust build dependencies
|
||||
to build the webapp on arm, and enable DAV support on arm. \o/
|
||||
* Adjust some other arch specific build dependencies that are now
|
||||
available on more architectures in Devian unstable.
|
||||
* Windows: Remove cygwin ssh, the newer version of which has stopped
|
||||
honoring the setting of HOME. Instead, copy msysgit's ssh into PATH.
|
||||
Note that setting up a remote ssh server using password authentication
|
||||
is known to be broken in this release on Windows.
|
||||
* Windows: Roll back to an older version of rsync from cygwin.
|
||||
The newer version has some dependency on a newer ssh from cygwin.
|
||||
|
||||
-- Joey Hess <id@joeyh.name> Fri, 08 May 2015 13:42:30 -0400
|
||||
|
||||
git-annex (5.20150420) unstable; urgency=medium
|
||||
|
||||
* Fix activity log parsing, which caused the log to not retain
|
||||
activity from other uuids.
|
||||
* Union merge could fall over if there was a file in the repository
|
||||
|
|
@ -9,13 +82,32 @@ git-annex (5.20150410) UNRELEASED; urgency=medium
|
|||
* info dir: Added information about repositories that
|
||||
contain files in the specified directory.
|
||||
* info: Added --bytes option.
|
||||
* bittorrent: Fix handling of magnet links.
|
||||
* When a key's size is unknown, still check the annex.diskreserve,
|
||||
and avoid getting content if the disk is too full.
|
||||
* Fix fsck --from a git remote in a local directory, and from
|
||||
a directory special remote.
|
||||
This was a reversion caused by the relative path changes in 5.20150113.
|
||||
* fsck --from remote: When bad content is found in the remote,
|
||||
and the local repo does not have a copy of the content, preserve
|
||||
the bad content in .git/annex/bad/ to avoid further data loss.
|
||||
* fsck --from remote: Avoid downloading a key if it would go over
|
||||
the annex.diskreserve limit.
|
||||
* required: New command, like wanted, but for required content.
|
||||
* Removed dependency on haskell SHA library,
|
||||
instead using cryptohash >= 0.11.0.
|
||||
* Make repo init more robust.
|
||||
* New debian/rules build-standalone target, which generates a
|
||||
git-annex-standalone.deb that should work on many old Debian etc
|
||||
systems. Thanks, Yaroslav Halchenko.
|
||||
* Windows: Renamed start menu file to avoid loop in some versions
|
||||
of Windows where the menu file is treated as a git-annex program.
|
||||
* bittorrent: Fix handling of magnet links.
|
||||
* Windows: Fixed support of remotes on other drives.
|
||||
(A reversion introduced in version 5.20150113.)
|
||||
* Windows: Bundled versions of rsync, wget, ssh, and gpg from
|
||||
cygwin all updated. Thanks, Yury V. Zaytsev.
|
||||
|
||||
-- Joey Hess <id@joeyh.name> Thu, 09 Apr 2015 20:59:43 -0400
|
||||
-- Joey Hess <id@joeyh.name> Mon, 20 Apr 2015 14:44:04 -0400
|
||||
|
||||
git-annex (5.20150409) unstable; urgency=medium
|
||||
|
||||
|
|
|
|||
45
debian/control
vendored
45
debian/control
vendored
|
|
@ -10,14 +10,13 @@ Build-Depends:
|
|||
libghc-data-default-dev,
|
||||
libghc-hslogger-dev,
|
||||
libghc-pcre-light-dev,
|
||||
libghc-sha-dev,
|
||||
libghc-cryptohash-dev,
|
||||
libghc-dataenc-dev,
|
||||
libghc-cryptohash-dev (>= 0.11.0),
|
||||
libghc-sandi-dev,
|
||||
libghc-utf8-string-dev,
|
||||
libghc-aws-dev (>= 0.9.2-2~),
|
||||
libghc-conduit-dev,
|
||||
libghc-resourcet-dev,
|
||||
libghc-dav-dev (>= 1.0) [amd64 i386 kfreebsd-amd64 kfreebsd-i386 powerpc],
|
||||
libghc-dav-dev (>= 1.0) [amd64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 powerpc ppc64el hurd-i386],
|
||||
libghc-quickcheck2-dev,
|
||||
libghc-monad-control-dev (>= 0.3),
|
||||
libghc-exceptions-dev (>= 0.6),
|
||||
|
|
@ -32,18 +31,20 @@ Build-Depends:
|
|||
libghc-edit-distance-dev,
|
||||
libghc-hinotify-dev [linux-any],
|
||||
libghc-stm-dev (>= 2.3),
|
||||
libghc-dbus-dev (>= 0.10.3) [linux-any],
|
||||
libghc-dbus-dev (>= 0.10.7) [linux-any],
|
||||
libghc-fdo-notify-dev (>= 0.3) [linux-any],
|
||||
libghc-yesod-dev [i386 amd64 kfreebsd-i386 kfreebsd-amd64 powerpc],
|
||||
libghc-yesod-static-dev [i386 amd64 kfreebsd-i386 kfreebsd-amd64 powerpc],
|
||||
libghc-yesod-default-dev [i386 amd64 kfreebsd-amd64 powerpc],
|
||||
libghc-hamlet-dev [i386 amd64 kfreebsd-i386 kfreebsd-amd64 powerpc],
|
||||
libghc-shakespeare-dev [i386 amd64 kfreebsd-i386 kfreebsd-amd64 powerpc],
|
||||
libghc-clientsession-dev [i386 amd64 kfreebsd-i386 kfreebsd-amd64 powerpc],
|
||||
libghc-warp-dev [i386 amd64 kfreebsd-i386 kfreebsd-amd64 powerpc],
|
||||
libghc-warp-tls-dev [i386 amd64 kfreebsd-i386 kfreebsd-amd64 powerpc],
|
||||
libghc-wai-dev [i386 amd64 kfreebsd-i386 kfreebsd-amd64 powerpc],
|
||||
libghc-wai-extra-dev [i386 amd64 kfreebsd-i386 kfreebsd-amd64 powerpc],
|
||||
libghc-yesod-dev (>= 1.2.6.1) [i386 amd64 armel armhf kfreebsd-i386 kfreebsd-amd64 powerpc ppc64el],
|
||||
libghc-yesod-core-dev (>= 1.2.19) [i386 amd64 armel armhf kfreebsd-i386 kfreebsd-amd64 powerpc ppc64el],
|
||||
libghc-yesod-form-dev (>= 1.3.15) [i386 amd64 armel armhf kfreebsd-i386 kfreebsd-amd64 powerpc ppc64el],
|
||||
libghc-yesod-static-dev (>= 1.2.4) [i386 amd64 armel armhf kfreebsd-i386 kfreebsd-amd64 powerpc ppc64el],
|
||||
libghc-yesod-default-dev (>= 1.2.0) [i386 amd64 armel armhf kfreebsd-amd64 powerpc ppc64el],
|
||||
libghc-hamlet-dev [i386 amd64 armel armhf kfreebsd-i386 kfreebsd-amd64 powerpc ppc64el],
|
||||
libghc-shakespeare-dev [i386 amd64 armel armhf kfreebsd-i386 kfreebsd-amd64 powerpc ppc64el],
|
||||
libghc-clientsession-dev [i386 amd64 armel armhf kfreebsd-i386 kfreebsd-amd64 powerpc ppc64el],
|
||||
libghc-warp-dev (>= 3.0.0.5) [i386 amd64 armel armhf kfreebsd-i386 kfreebsd-amd64 powerpc ppc64el],
|
||||
libghc-warp-tls-dev [i386 amd64 armel armhf kfreebsd-i386 kfreebsd-amd64 powerpc ppc64el],
|
||||
libghc-wai-dev [i386 amd64 kfreebsd-i386 armel armhf kfreebsd-amd64 powerpc ppc64el],
|
||||
libghc-wai-extra-dev [i386 amd64 armel armhf kfreebsd-i386 kfreebsd-amd64 powerpc ppc64el],
|
||||
libghc-securemem-dev,
|
||||
libghc-byteable-dev,
|
||||
libghc-dns-dev,
|
||||
|
|
@ -65,13 +66,12 @@ Build-Depends:
|
|||
libghc-esqueleto-dev,
|
||||
libghc-monad-logger-dev,
|
||||
libghc-feed-dev (>= 0.3.9.2),
|
||||
libghc-regex-tdfa-dev [!mipsel !s390],
|
||||
libghc-regex-compat-dev [mipsel s390],
|
||||
libghc-tasty-dev (>= 0.7) [!sparc],
|
||||
libghc-tasty-hunit-dev [!sparc],
|
||||
libghc-tasty-quickcheck-dev [!sparc],
|
||||
libghc-tasty-rerun-dev [!sparc],
|
||||
libghc-optparse-applicative-dev [!sparc],
|
||||
libghc-regex-tdfa-dev,
|
||||
libghc-tasty-dev (>= 0.7),
|
||||
libghc-tasty-hunit-dev,
|
||||
libghc-tasty-quickcheck-dev,
|
||||
libghc-tasty-rerun-dev,
|
||||
libghc-optparse-applicative-dev,
|
||||
lsof [!kfreebsd-i386 !kfreebsd-amd64 !hurd-any],
|
||||
ikiwiki,
|
||||
perlmagick,
|
||||
|
|
@ -81,7 +81,6 @@ Build-Depends:
|
|||
curl,
|
||||
openssh-client,
|
||||
git-remote-gcrypt (>= 0.20130908-6),
|
||||
llvm-3.4 [armel armhf],
|
||||
Maintainer: Gergely Nagy <algernon@madhouse-project.org>
|
||||
Standards-Version: 3.9.6
|
||||
Vcs-Git: git://git.kitenet.net/git-annex
|
||||
|
|
|
|||
4
debian/copyright
vendored
4
debian/copyright
vendored
|
|
@ -28,10 +28,6 @@ Files: Utility/Gpg.hs Utility/DirWatcher*
|
|||
Copyright: © 2010-2014 Joey Hess <id@joeyh.name>
|
||||
License: GPL-3+
|
||||
|
||||
Files: Assistant/WebApp/Bootstrap3.hs
|
||||
Copyright: 2010 Michael Snoyman
|
||||
License: BSD-2-clause
|
||||
|
||||
Files: doc/logo* */favicon.ico standalone/osx/git-annex.app/Contents/Resources/git-annex.icns standalone/android/icons/*
|
||||
Copyright: 2007 Henrik Nyh <http://henrik.nyh.se/>
|
||||
2010 Joey Hess <id@joeyh.name>
|
||||
|
|
|
|||
17
debian/create-standalone-changelog
vendored
Executable file
17
debian/create-standalone-changelog
vendored
Executable file
|
|
@ -0,0 +1,17 @@
|
|||
#!/bin/bash
|
||||
#
|
||||
# A little helper script to build a package with standalone git-annex
|
||||
# It relies on being run within git-annex's git repository
|
||||
#
|
||||
set -eu
|
||||
|
||||
umask 022
|
||||
|
||||
# This is the same method that the configure script uses when git-annex is
|
||||
# built from git master.
|
||||
ANNEX_VERSION=$(runghc Build/BuildVersion.hs)
|
||||
|
||||
ANNEX_NDVERSION=$( echo ${ANNEX_VERSION} | sed -e 's,-,+git,' -e 's,$,-1~ndall+1,')
|
||||
|
||||
dch --noconf -v ${ANNEX_NDVERSION} \
|
||||
--force-bad-version --force-distribution -D neurodebian "Backported fresh snapshot"
|
||||
1
debian/patches/series.standalone-build
vendored
Normal file
1
debian/patches/series.standalone-build
vendored
Normal file
|
|
@ -0,0 +1 @@
|
|||
standalone-build
|
||||
59
debian/patches/standalone-build
vendored
Normal file
59
debian/patches/standalone-build
vendored
Normal file
|
|
@ -0,0 +1,59 @@
|
|||
From: Yaroslav Halchenko <debian@onerussian.com>
|
||||
Subject: Patch debian/ to provide a standalone build of git-annex
|
||||
|
||||
Origin: NeuroDebian
|
||||
Last-Update: 2015-04-20
|
||||
|
||||
--- a/debian/control
|
||||
+++ b/debian/control
|
||||
@@ -87,15 +87,14 @@ Vcs-Git: git://git.kitenet.net/git-annex
|
||||
Homepage: http://git-annex.branchable.com/
|
||||
XS-Testsuite: autopkgtest
|
||||
|
||||
-Package: git-annex
|
||||
+Package: git-annex-standalone
|
||||
Architecture: any
|
||||
Section: utils
|
||||
-Depends: ${misc:Depends}, ${shlibs:Depends},
|
||||
- git (>= 1:1.8.1),
|
||||
- rsync,
|
||||
- wget,
|
||||
- curl,
|
||||
- openssh-client (>= 1:5.6p1)
|
||||
+Conflicts: git-annex
|
||||
+Provides: git-annex
|
||||
+Depends: ${misc:Depends},
|
||||
+ git,
|
||||
+ openssh-client
|
||||
Recommends:
|
||||
lsof,
|
||||
gnupg,
|
||||
@@ -110,7 +109,7 @@ Suggests:
|
||||
bup,
|
||||
tahoe-lafs,
|
||||
libnss-mdns,
|
||||
-Description: manage files with git, without checking their contents into git
|
||||
+Description: manage files with git, without checking their contents into git -- standalone build
|
||||
git-annex allows managing files with git, without checking the file
|
||||
contents into git. While that may seem paradoxical, it is useful when
|
||||
dealing with files larger than git can currently easily handle, whether due
|
||||
@@ -128,3 +127,7 @@ Description: manage files with git, with
|
||||
noticing when files are changed, and automatically committing them
|
||||
to git and transferring them to other computers. The git-annex webapp
|
||||
makes it easy to set up and use git-annex this way.
|
||||
+ .
|
||||
+ This package provides a standalone bundle build of git-annex, which
|
||||
+ should be installable on any more or less recent Debian or Ubuntu
|
||||
+ release.
|
||||
--- /dev/null
|
||||
+++ b/debian/install
|
||||
@@ -0,0 +1 @@
|
||||
+tmp/git-annex.linux usr/lib
|
||||
--- /dev/null
|
||||
+++ b/debian/links
|
||||
@@ -0,0 +1 @@
|
||||
+/usr/lib/git-annex.linux/git-annex /usr/bin/git-annex
|
||||
--- /dev/null
|
||||
+++ b/debian/manpages
|
||||
@@ -0,0 +1 @@
|
||||
+debian/git-annex-standalone/usr/lib/git-annex.linux/usr/share/man/man1/git-annex*
|
||||
18
debian/rules
vendored
18
debian/rules
vendored
|
|
@ -2,8 +2,26 @@
|
|||
|
||||
export CABAL=debian/cabal-wrapper
|
||||
|
||||
STANDALONE_BUILD=$(shell grep -qe '^Package: git-annex-standalone' debian/control \
|
||||
&& echo 1 || echo 0)
|
||||
|
||||
# Do use the changelog's version number, rather than making one up.
|
||||
export RELEASE_BUILD=1
|
||||
|
||||
%:
|
||||
dh $@
|
||||
|
||||
|
||||
# Standalone build logic/helpers
|
||||
ifeq ($(STANDALONE_BUILD),1)
|
||||
|
||||
override_dh_auto_build:
|
||||
make linuxstandalone
|
||||
|
||||
override_dh_auto_install:
|
||||
: # nothing to do, we just need to copy the beast, as instructed in debian/install
|
||||
|
||||
override_dh_fixperms:
|
||||
dh_fixperms -Xld-linux
|
||||
|
||||
endif
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue