summaryrefslogtreecommitdiff
path: root/debian
Commit message (Collapse)AuthorAge
* Avoid building the webapp on Debian architectures that do not yet have ↵Gravatar Joey Hess2012-09-29
| | | | template haskell and thus yesod. (Should be available for arm soonish I hope).
* reorgGravatar Joey Hess2012-09-28
|
* The Makefile now builds with the new yesod by default.Gravatar Joey Hess2012-09-28
| | | | | Systems like Debian that have the old yesod 1.0.1 should set GIT_ANNEX_LOCAL_FEATURES=-DWITH_OLD_YESOD
* Always do a system wide installation when DESTDIR is set. Closes: #689052Gravatar Joey Hess2012-09-28
|
* demote libnss-mdns to suggestsGravatar Joey Hess2012-09-28
| | | | | | | At recommends it causes avahi-daemon to be pulled in on upgrade, which is just too annoying to deal with avoiding on servers. MDNS is needed for robust peering, but probably most desktop systems have it anyway; it's in task-desktop.
* webapp: Avoid crashing when ssh-keygen -F chokes on an invalid known_hosts file.Gravatar Joey Hess2012-09-27
|
* add a configurator for S3Gravatar Joey Hess2012-09-26
|
* store S3 creds in a 600 mode file inside the local git repoGravatar Joey Hess2012-09-26
|
* Fix fallback to ~/Desktop when xdg-user-dir is not available. Closes: #688833Gravatar Joey Hess2012-09-25
| | | | | Really the fix here is to make Utility.Process only throw IOErrors, which is what I naturally assumed it'd throw.
* rename optionGravatar Joey Hess2012-09-25
|
* fsck: New --incremental-restart option which is nice for scheduling eg, ↵Gravatar Joey Hess2012-09-25
| | | | monthly incremental fsck runs in cron jobs.
* New --time-limit option, makes long git-annex commands stop after a ↵Gravatar Joey Hess2012-09-25
| | | | specified amount of time.
* changelogGravatar Joey Hess2012-09-25
|
* Test that uuid -m works, falling back to plain uuid if not.Gravatar Joey Hess2012-09-25
|
* copy: avoid updating location log when no copy is performedGravatar Joey Hess2012-09-24
| | | | | git annex copy --to remote often does not need to copy a file, but it was still updating the location log in this case.
* releasing version 3.201209243.20120924Gravatar Joey Hess2012-09-24
|
* license the webapp under the AGPL 3+Gravatar Joey Hess2012-09-24
| | | | | | | | | | | | | This means that anyone serving up the webapp to users as a service (ie, without providing any git-annex binary at all to the user) still needs to provide a link to the source code for it, including any modifications they may make. This may make git-annex be covered by the AGPL as a whole when it is built with the webapp. If in doubt, you should ask a lawyer. When git-annex is built with the webapp disabled, no AGPLed code is used. Even building in the assistant does not pull in AGPLed code.
* remove blaze-markupGravatar Joey Hess2012-09-24
|
* lintian fixesGravatar Joey Hess2012-09-24
|
* changelog and minor cleanup to fix mixed spaces/tabsGravatar Joey Hess2012-09-23
|
* changelog updatesGravatar Joey Hess2012-09-21
|
* sync: Pushes the git-annex branch to remote/synced/git-annex, rather than ↵Gravatar Joey Hess2012-09-16
| | | | | | | | | | | | | directly to remote/git-annex. This fixes a problem I was seeing in the assistant where two remotes would attempt to sync with one another at the same time, and both failed pushing the diverged git-annex branch. Then when both tried to resolve the failed push, they each modified their git-annex branch, which again each blocked the other from pushing into it. The result was that the git-annex branches were perpetually diverged (despite having the same content!) and once the assistant fell into this trap, it couldn't get out and always had to do the slow push/fail/pull/merge/push/fail cycle.
* Avoid crashing on encoding errors in filenames when writing transfer info ↵Gravatar Joey Hess2012-09-16
| | | | files and reading from checksum commands.
* reinject: When the provided file doesn't match, leave it where it is, rather ↵Gravatar Joey Hess2012-09-16
| | | | than moving to .git/annex/bad/
* Support repositories created with --separate-git-dir. Closes: #684405Gravatar Joey Hess2012-09-15
|
* migrate: Check content before generating the new key, to avoid generating a ↵Gravatar Joey Hess2012-09-14
| | | | key for corrupt data.
* Disable ssh connection caching if the path to the control socket would be ↵Gravatar Joey Hess2012-09-13
| | | | too long (and use relative path to minimise path to the control socket).
* SHA256E is new default backendGravatar Joey Hess2012-09-12
| | | | | | | | The default backend used when adding files to the annex is changed from SHA256 to SHA256E, to simplify interoperability with OSX, media players, and various programs that needlessly look at symlink targets. To get old behavior, add a .gitattributes containing: * annex.backend=SHA256
* update depsGravatar Joey Hess2012-09-11
|
* add build dep on network-infoGravatar Joey Hess2012-09-07
|
* add network-multicast to bulld dependsGravatar Joey Hess2012-09-07
|
* test: Set a lot of git environment variables so testing works in strange ↵Gravatar Joey Hess2012-09-06
| | | | environments that normally need git config to set names, etc. Closes: #682351 Thanks, gregor herrmann
* Merge branch 'master' into assistantGravatar Joey Hess2012-08-27
|\ | | | | | | | | | | | | Conflicts: debian/changelog Updated changelog for assistant and webapp
| * releasing version 3.201208253.20120825Gravatar Joey Hess2012-08-25
| |
| * Bugfix: Fix fsck in SHA*E backends, when the key contains composite ↵Gravatar Joey Hess2012-08-24
| | | | | | | | extensions, as added in 3.20120721.
* | Bugfix: Fix fsck in SHA*E backends, when the key contains composite ↵Gravatar Joey Hess2012-08-24
| | | | | | | | extensions, as added in 3.20120721.
* | Merge branch 'master' into assistantGravatar Joey Hess2012-08-20
|\| | | | | | | | | | | Conflicts: Makefile debian/copyright
| * add svg versions of the git-annex logo, in color and black and whiteGravatar Joey Hess2012-08-19
| | | | | | | | | | This is a simple application of inkscape's rather amazing tracing capabilities.
* | Merge branch 'master' into assistantGravatar Joey Hess2012-08-17
|\| | | | | | | | | Conflicts: debian/changelog
| * Pass --use-agent to gpg when in no tty mode. Thanks, Eskild Hustvedt.Gravatar Joey Hess2012-08-17
| |
* | Merge branch 'master' into assistantGravatar Joey Hess2012-08-16
|\| | | | | | | | | Conflicts: debian/changelog
* | Merge branch 'master' into assistantGravatar Joey Hess2012-08-09
|\ \ | | | | | | | | | | | | Conflicts: debian/changelog
| | * S3: Add fileprefix setting.Gravatar Joey Hess2012-08-09
| |/
| * releasing version 3.201208073.20120807Gravatar Joey Hess2012-08-07
| |
* | Merge branch 'master' into assistantGravatar Joey Hess2012-08-07
|\|
| * fix transfer log cleanup crashGravatar Joey Hess2012-08-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoid crashing when "git annex get" fails to download from one location, and falls back to downloading from a second location. The problem is that git annex get calls download recursively from within itself if the first download attempt fails. So the first time through, it writes a transfer info file, which is then overwritten on the second, recursive call. Then on cleanup, it tries to delete the file twice, which of course doesn't work. Fixed both by not crashing if the transfer file is removed, and by changing Get to not run download recursively like that. It's the only thing that did so, and it just seems like a bad idea.
* | Merge remote-tracking branch 'origin/master' into assistantGravatar Joey Hess2012-08-05
|\| | | | | | | | | Conflicts: Init.hs
| * unused, status: Avoid crashing when ran in bare repo.Gravatar Joey Hess2012-08-05
| |
| * Revert "init: If no description is provided for a new repository, one will ↵Gravatar Joey Hess2012-08-03
| | | | | | | | | | | | | | | | | | | | automatically be generated, like "joey@gnu:~/foo"" This reverts commit abde98cda21d5deeb16ed3baf736b06fdc2fce2f. Temporarily dropping from master, since this actually uses stuff that's only currently availble in the assistant branch. Will come back when I merge that, and can wait..
* | Merge branch 'master' into assistantGravatar Joey Hess2012-08-03
|\|