Merge branch 'master' into concurrentprogress

Conflicts:
	debian/changelog

8 files changed, 64 insertions, 0 deletions

diff --git a/doc/todo/addurl___8211__force-torrent_option.mdwn b/doc/todo/addurl___8211__force-torrent_option.mdwn
new file mode 100644
index 000000000..acbb953c0
--- /dev/null
+++ b/doc/todo/addurl___8211__force-torrent_option.mdwn
@@ -0,0 +1 @@
+There are sites that don't provide direct links to `.torrent` files. Currently there is no way to download contents of such torrents with `git annex`, it simply uses web remote instead of bittorrent.  Something like `--force-torrent` option could help here.
diff --git a/doc/todo/addurl___8211__force-torrent_option/comment_1_15be1914c8d05cd1ad8220bcfea9d0bf._comment b/doc/todo/addurl___8211__force-torrent_option/comment_1_15be1914c8d05cd1ad8220bcfea9d0bf._comment
new file mode 100644
index 000000000..456fb1ab4
--- /dev/null
+++ b/doc/todo/addurl___8211__force-torrent_option/comment_1_15be1914c8d05cd1ad8220bcfea9d0bf._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="joey"
+ subject="""comment 1"""
+ date="2015-04-14T19:11:28Z"
+ content="""
+I'd prefer torrent:url; this is consistent with quvi:url for forcing quvi
+be used.
+"""]]
diff --git a/doc/todo/git-annex-standalone_Debian_package.mdwn b/doc/todo/git-annex-standalone_Debian_package.mdwn
new file mode 100644
index 000000000..0172e1e72
--- /dev/null
+++ b/doc/todo/git-annex-standalone_Debian_package.mdwn
@@ -0,0 +1 @@
+As proposed with a sketch in https://github.com/joeyh/git-annex/pull/39, for DataLad we would need to get recent annex on older Debian/Ubuntu releases to get our testing farm and perspective users equipped with bleeding edge annex
diff --git a/doc/todo/git-annex-standalone_Debian_package/comment_1_ef36b0265127611ffeea3a5ed8c29515._comment b/doc/todo/git-annex-standalone_Debian_package/comment_1_ef36b0265127611ffeea3a5ed8c29515._comment
new file mode 100644
index 000000000..ad3f8b9e5
--- /dev/null
+++ b/doc/todo/git-annex-standalone_Debian_package/comment_1_ef36b0265127611ffeea3a5ed8c29515._comment
@@ -0,0 +1,20 @@
+[[!comment format=mdwn
+ username="joey"
+ subject="""comment 1"""
+ date="2015-04-11T13:52:28Z"
+ content="""
+I think this will work. I don't see a way to do it other than as a patch
+to debian/ though.. Unless perhaps you could pass flags to stuff to make
+a different directory be used. If you could do that, it could be included
+in git-annex's master.
+
+The package needs to depend on git (any version) so that the user can run
+"git annex".
+
+The rest of the depends are not necessary though. The standalone tarball
+includes its own wget, rsync, gpg, curl, and ssh, so git-annex will be able
+to use those.
+
+If removing eg, the depends on wget though, you will want to add a
+recommends on ca-certificates..
+"""]]
diff --git a/doc/todo/git-annex-standalone_Debian_package/comment_2_456413718e9faf3561a11000ee611611._comment b/doc/todo/git-annex-standalone_Debian_package/comment_2_456413718e9faf3561a11000ee611611._comment
new file mode 100644
index 000000000..50a2bf516
--- /dev/null
+++ b/doc/todo/git-annex-standalone_Debian_package/comment_2_456413718e9faf3561a11000ee611611._comment
@@ -0,0 +1,10 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawnx8kHW66N3BqmkVpgtXDlYMvr8TJ5VvfY"
+ nickname="Yaroslav"
+ subject="now available"
+ date="2015-04-12T13:49:04Z"
+ content="""
+from stock NeuroDebian repository across all debian/ubuntu releases.  Packaging is within debian-standalone branch of http://github.com/yarikoptic/git-annex
+
+So far -- built manually (well -- debian/build-standalone) on my laptop. Later will be automated on the buildbot.
+"""]]
diff --git a/doc/todo/git-annex-standalone_Debian_package/comment_3_22539df11d1a514987b9c257fd8b1998._comment b/doc/todo/git-annex-standalone_Debian_package/comment_3_22539df11d1a514987b9c257fd8b1998._comment
new file mode 100644
index 000000000..7f0d1d51a
--- /dev/null
+++ b/doc/todo/git-annex-standalone_Debian_package/comment_3_22539df11d1a514987b9c257fd8b1998._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawnx8kHW66N3BqmkVpgtXDlYMvr8TJ5VvfY"
+ nickname="Yaroslav"
+ subject="missed the comment"
+ date="2015-04-12T13:55:50Z"
+ content="""
+blind me managed to miss your comment, for which I am thankful.  A branch sounded like the best way to go so I don't need to mess with patching BUT now thinking about it, I might just indeed move it into a new debian/patch/series-standalone  which would be the quilt series to use to patch things for building standalone.   Then it could be shipped in the main repo and applied only when necessary. Sounds good?
+"""]]
diff --git a/doc/todo/git-annex-standalone_Debian_package/comment_4_0aecbfdc9048df2131d99ad316f5d6f7._comment b/doc/todo/git-annex-standalone_Debian_package/comment_4_0aecbfdc9048df2131d99ad316f5d6f7._comment
new file mode 100644
index 000000000..0f2393fc1
--- /dev/null
+++ b/doc/todo/git-annex-standalone_Debian_package/comment_4_0aecbfdc9048df2131d99ad316f5d6f7._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="joey"
+ subject="""comment 4"""
+ date="2015-04-14T19:14:16Z"
+ content="""
+The quilt series sounds reasonable if there's tooling to support building
+that way.
+"""]]
diff --git a/doc/todo/wishlist:_rsync_efficiency.mdwn b/doc/todo/wishlist:_rsync_efficiency.mdwn
new file mode 100644
index 000000000..fe1848f1b
--- /dev/null
+++ b/doc/todo/wishlist:_rsync_efficiency.mdwn
@@ -0,0 +1,8 @@
+If you look at the transfer rates during a copy job to remotes, you see it going down to zero for a short time between files.
+
+While that's understandable from rsync's PoV, it's not as efficient as git-annex could be.
+
+Would parallelization be an option? Are there alternate improvements?
+
+
+-- Richard