Commit graph

343 commits

Author SHA1 Message Date
Joey Hess
8a651bafd2 git-annex release 5.20140117 for unstable [dgit]
-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIVAwUAUtl+XskQ2SIlEuPHAQjFvxAAsDrvW7PkVB09QGq0y0WI2aw1VeiQ+Zl1
 5s1PxrJnSddKWhvnLM+jwP3eL5q+HPsOjz3CVzwBkhFPR9D3iVAg/766tRiwQZB4
 B1JCCOnzs6YsTr/prdHDQ+p3HQLp8WIg84d+Mcmfin0i9vvW6T07oDOmpLQHk1sc
 EsJu1jBG6wY6uI+jxciXtzo+tM1fywy3Ko3OZVqmN5RufjV4dMNEjyUAQIFuQ3q1
 AZPDoKZsj44EPHNomflFnD1rUeEKfK3jXO5Hjb059ABGVuRb5Z6GRgKSCkht2MLP
 9cz8n677S3FPli1w7B3mJSqkVFrjyk9ITq/RISawQ9gKCgmZ3PWkP199fJipIP0K
 8tjhihgCb7m9WnxnTyN+GrmHfBA7zcorkXyhs56kjuRSo4fwlPQ+AwbkdIpU8YlW
 O0PJoWP/qjMjgzyzXdCAjdame3T12kfK9VQQL2fZrSt0I6Y2WCe7T7W2/ii51LQs
 vRxFhe96MJPvOU4eW7YJ3xzMtvey76Nq9KuIrqw7lgtcFLmGAVqnqMTaHQyB2my/
 1iCUU2qt0TZkWbTwVO6V8fdLOM2AUfZGwnTpbAac+v01c4PBtBl0id773s5SW85L
 Vcsrs8O20oOWj65/yP0c9JZH82D7qdahObSlczcP85z6yHLOb9t9HtuvMkPRhXvs
 axTdEmB2DcY=
 =1pPT
 -----END PGP SIGNATURE-----

Merge tag 'debian/5.20140117' into debian-wheezy-backport

git-annex release 5.20140117 for unstable [dgit]

Conflicts:
	debian/control
2014-01-24 14:24:33 +00:00
Joey Hess
3cbb366ebc Really fix FTBFS on mipsel and sparc due to test suite not being available on those architectures. 2014-01-17 14:48:56 -04:00
Joey Hess
31b80e55f8 prep release 2014-01-16 11:38:16 -04:00
Joey Hess
85272d8a98 Added tahoe special remote.
Known problems:

1. Tries to tahoe start when daemon is already running.

2. If multiple tahoe remotes are set up on the same computer,
   they will have the same node.url configured by default,
   and this confuses tahoe commands.

This commit was sponsored by LeastAuthority.com
2014-01-08 16:14:41 -04:00
Joey Hess
5740489927 Revert "need a newish version of containers"
This reverts commit bad6b46f7f.
2014-01-07 20:42:13 -04:00
Joey Hess
bad6b46f7f need a newish version of containers 2014-01-07 14:18:41 -04:00
Joey Hess
0a98f1be15 prep release 2014-01-07 12:25:12 -04:00
Joey Hess
1c02fc4987 no lsof on kfreebsd 2014-01-07 12:12:36 -04:00
Joey Hess
515e2fef54 prep release 2013-12-30 14:20:55 -04:00
Joey Hess
0e47d6ba97 prep release 2013-12-21 12:00:47 -04:00
Joey Hess
a168b8de12 switch define used, not android specific 2013-12-18 02:06:15 -04:00
Joey Hess
d7ee0bdbb8 OSX: Remove ssh and ssh-keygen from dmg as they're included in OSX by default. 2013-12-13 14:25:24 -04:00
Joey Hess
011b8bc7ec pull in Win32-extras, to be able to get current process id in Windows
Fixed up a number of things that had worked around there not being a way to
get that.

Most notably, transfer info files on windows now include the process id,
since no locking is currently done. This means the file format varies
between windows and unix.
2013-12-11 00:15:10 -04:00
Joey Hess
063a183a61 windows disk free space checking 2013-12-10 01:18:04 -04:00
Joey Hess
85936392ec fix 2013-12-06 22:38:01 -04:00
Joey Hess
0a66293600 avoid hsc2hs on windows (more epathtolong) 2013-12-06 18:06:22 -04:00
Joey Hess
e5a683ae4c enable Webapp on windows, using EvilLinker to link 2013-12-06 15:04:19 -04:00
Joey Hess
eed6809525 isolate dependency workaround to windows 2013-12-05 21:25:20 -04:00
Joey Hess
97c4af975f syntax 2013-12-05 20:42:52 -04:00
Joey Hess
b2e56dab52 temporarily disable webapp on windows; re-enable webdav on windows
The gcc response file should make it build with webdav (fingers crossed).

webapp is waiting on a haskell platform upgrade on the autobuilder.
Current one has a too old version of network for hxt to install.
2013-12-05 19:15:23 -04:00
Joey Hess
10309c1d80 work around https://github.com/kazu-yamamoto/logger/issues/18 2013-12-05 17:51:46 -04:00
Joey Hess
d99b2db372 Revert "test enable webapp on windows"
This reverts commit 958d9fa110.

Some stuff fails to install on the autobuilder, it will need to be upgraded
probably.
2013-12-05 14:23:42 -04:00
Joey Hess
958d9fa110 test enable webapp on windows
It builds, but fails to link locally. Let's try on the autobuilder.
2013-12-05 14:17:31 -04:00
Joey Hess
4ebb35dc59 explicitly disable WebDAV on Windows
For reasons suspiciously similar to 342d508e -- ie, building with it
enabled crashes the compiler, at least in my development VM.. dunno why.
2013-12-04 17:14:24 -04:00
Joey Hess
4249c85ece prep release 2013-11-30 16:33:03 -04:00
Joey Hess
27b70f7c5b update 2013-11-28 08:00:42 -04:00
Joey Hess
6896db17ae prep release 2013-11-27 18:47:37 -04:00
Joey Hess
710b7c72b1 fix flag name 2013-11-25 13:16:04 -04:00
Joey Hess
5163d5fb39 ensure that Android TH splice is expanded in native side of build 2013-11-25 13:01:53 -04:00
Joey Hess
e9b88f8db1 releasing package git-annex version 5.20131120 2013-11-20 13:10:11 -04:00
Joey Hess
187b844b1e releasing package git-annex version 5.20131118 2013-11-18 11:01:00 -04:00
Joey Hess
238fa05545 tasty fully working 2013-11-14 20:09:47 -04:00
Joey Hess
2755c7f558 Merge branch 'master' into tasty-tests
Conflicts:
	Test.hs
2013-11-14 17:04:58 -04:00
Joey Hess
b9b5e3370d build assistant and watcher on windows (doesn't work yet) 2013-11-12 17:22:34 -04:00
Joey Hess
4e3240ed7a signed tag
-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.15 (GNU/Linux)
 
 iQIVAwUAUnp1hMkQ2SIlEuPHAQhDDw//Wgr3T0kjcSwgY+c1LwPw5mvnzxARTDJr
 uXkl2Wl53yRXZxIFhz4twU3HcfT3cVotYJv2aC5nYtq9siZi/S6uf/60TYIot5v9
 9/WkQMz37UYoBfJ3qPy+gIhFIUyfMfg4jfKot8XcuyvDT85jCUVmiWlmYkrwGTw/
 ODQhYlE5WOX1mrdYpYn0QHqydnkliKnt1RjqynBSHxHdusDPdI8VVzW6YtqIdFX7
 gNJ4WZhB+kXU9Q8fy2nORhVUezSDls3jB7kHX0vgeKI6VTEQJLNNIERprhtFSr0j
 YqA+kLb7NzwKKDt5ns+lELT9ifbS0tzvKSPzL6I6y8obY3im+ua6Gkj0hoh4Fe5U
 DRGoVSrQ3gF0Pa/fijLq2OhIsfU5sAjFi8lE2jLWJDkQdwgYoJ1sZWJjLWQrG5k5
 uZqrVrAb6223BgAbA3r4EiBlZxaomekalfOzSIqqELs6BKw6ktzyHPLI1JHwOJvg
 z49LeNrE5B5KNRYQV9BRqctgsvMzX2c6cZBKUgf+YmaDmK4LDjZeqgQ/ZDsTV045
 DQJal8aAlK4ftIGHYz/DnssQEjODc+ZEP5QOGWX9e1JK8Rc7wJ5n0/liONaB8mx2
 0Tpl/jY5POs5bkbJv0kPTZajjKQPxbMCt+LpRbtLH/8cDUZ41Hg7DyZ/Uz1VTSyG
 iPeu6efahcU=
 =N03T
 -----END PGP SIGNATURE-----

Merge tag '4.20131106' into debian-wheezy-backport

signed tag

Conflicts:
	Assistant/WebApp/Configurators/WebDAV.hs
	git-annex.cabal
2013-11-12 15:07:39 -04:00
Joey Hess
16fa980689 separate android 4.0 and 4.3 builds needed
Also, parameterize the abdroid abi version
2013-11-12 14:24:53 -04:00
Joey Hess
9ccfaa84f1 pass -optl-z -optlnocopyreloc on Android 2013-11-11 23:33:50 -04:00
Joey Hess
691850ca39 Allow optionally configuring git-annex with -fEKG to enable awesome remote monitoring interfaceat http://localhost:4242/ 2013-11-06 16:33:45 -04:00
Joey Hess
a74018ea98 prep release 2013-11-06 11:37:06 -04:00
Joey Hess
3b76a141ea prep release 2013-11-01 11:57:47 -04:00
Joey Hess
76dd6f814d always depend on async 2013-10-26 11:46:45 -04:00
Joey Hess
f51327f44e releasing package git-annex version 4.20131024 2013-10-24 13:14:54 -04:00
Joey Hess
342d508e00 avoid trying to link with XMPP on Windows
It doesn't work, in a most puzzling way, which just wasted me hours, even
if XMPP libs are installed. Webapp too.
2013-10-17 18:56:28 -04:00
Joey Hess
ad86926f09 Revert "avoid hsc files on Windows"
This reverts commit 158ba9d332.

My windows build environment was broken; reverted to backup.
2013-10-17 17:53:50 -04:00
Joey Hess
158ba9d332 avoid hsc files on Windows
This used to work, but now hsc2hs is failing with a usage message.
Since I have not changed my windows build environment at all, it must be
some change due to a change in the cabal file. Perhaps too make flags are
causing it to hit a windows command line length limit?

Anyway, these hsc files did nothing on Windows, so can be omitted and not
built to work around yet another epic windows weirdness.
2013-10-17 16:35:14 -04:00
Joey Hess
b4a2da76fa Wheezy backport: Relax cabal version constraint on gnutls (allow the version in wheezy to be used, despite it being a bit buggy). 2013-10-15 19:46:05 -04:00
Joey Hess
fdf399c1c0 allow building w/o cryptohash
Mostly for the debian stable autobuilds, which have a too old version
to use the Crypto.Hash module.
(cherry picked from commit 20fb905bb6)
2013-10-13 18:07:54 +00:00
Joey Hess
e420a00184 tagging package git-annex version 4.20131002
-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.14 (GNU/Linux)
 
 iQIVAwUAUkx+F8kQ2SIlEuPHAQh38A//U0P0puOLMTiv0P9jlLNKWPbBwr4uqEII
 BXvfa6L6Dq/0bUYuoPL2qEq8bjee26RXERCPG4xFy4FjWffR76l66t/oMvLI8ot4
 oO098UyG4NqUqzK8iFXnb/WP8EcFUuPg/V2Jio4K6QIrZ3dsK0EcRyNlbNjuakp4
 +/rN6ZnFEA0KEZ+4FUFW3NAlhgHqoAaUQIfUyYlyRD0fEwkXpImGkPPGVHyfELun
 mTlJQyyVzJw16SCGfliWf4X+BA5UbSRPlb0lJm94MRkF8UIqStH0ZfA6LPf86b7S
 PR9MfwOA3Y8858QIVI0prjIpVonUZ43ixhtA2/WpJVR8oUp/jKw/Njjcw4AHlWjI
 n93d0/vlPcWCu0yFPP+M1mnKJ5c00wDDWM4AFMi6VZCFzOaIlSfjfUQpY3r8KBoD
 6FwxOSiDgNtkRQPx20a3CPVKN8bJxn5+MxXJI84SVN4ynjb85y9Tb1nI2VEtI3aS
 eIv36ahBSa9P4lgn/txLtTVZq6P9Xt3JFXrKarlUC3t2Rbe44q9MPbog5zmo37k0
 GRvIU9XbmGJQfzNGtEeLYzkc5yT/dDadBeQuLnK21Z5idauETtYO32pA8Q6TQ3IN
 b68skRJ6okHiC6g0KWM82ALelolcLO0++EUV+elq/7Xip6sPuxbIdoohl6juL7bu
 PmkPE8+F5Xg=
 =Gfcv
 -----END PGP SIGNATURE-----

Merge tag '4.20131002' into debian-wheezy-backport

tagging package git-annex version 4.20131002

# gpg: Signature made Wed Oct  2 20:12:07 2013 UTC using RSA key ID 2512E3C7
# gpg: Can't check signature: public key not found
2013-10-13 18:04:31 +00:00
Joey Hess
6622875cf8 Revert "use vector in local status", which was not an improvement
This reverts commit eb3ce3581a.
2013-10-07 04:06:10 -04:00
Joey Hess
eb3ce3581a use vector in local status
Thought was that this would be faster than a map, since a vector can be
updated more efficiently. It turns out to not seem to matter; runtime and
memory usage are basically identical.
2013-10-07 04:05:14 -04:00