diff options
author | Yaroslav Halchenko <debian@onerussian.com> | 2018-02-09 01:11:25 -0500 |
---|---|---|
committer | Joey Hess <joeyh@joeyh.name> | 2018-02-09 11:00:59 -0400 |
commit | 08e48bdb194efc315e59a5ecb744051c9c764552 (patch) | |
tree | 6c50e82b02919d2cbc8a535b317e844bf705164d | |
parent | ad75f1f76d96b3617b4d346535f3a80b02f5c05a (diff) |
Adjusted debian/patches/standalone-build for changes in control
-rw-r--r-- | debian/patches/standalone-build | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/debian/patches/standalone-build b/debian/patches/standalone-build index e204cb852..5292629ca 100644 --- a/debian/patches/standalone-build +++ b/debian/patches/standalone-build @@ -36,18 +36,16 @@ Last-Update: 2015-04-20 Recommends: lsof, gnupg, -@@ -118,7 +118,9 @@ Suggests: - tahoe-lafs, +@@ -119,7 +119,7 @@ Suggests: libnss-mdns, uftp, + Conflicts: datalad (< 0.9.1) -Description: manage files with git, without checking their contents into git -+Breaks: -+ datalad (<< 0.9.1~), +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 -@@ -136,3 +138,7 @@ Description: manage files with git, with +@@ -137,3 +137,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. |