aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Yaroslav Halchenko <debian@onerussian.com>2018-02-20 13:52:13 -0500
committerGravatar Joey Hess <joeyh@joeyh.name>2018-02-20 16:15:00 -0400
commit21a0acd5d9c2ad3d22bcfaa692269222922276f3 (patch)
tree192169e5a0116910c969764cb5306184662e6767
parente6331172017c27c409e8707ecacacc74e677f8d6 (diff)
Updated patch for standalone
-rw-r--r--debian/patches/standalone-build10
1 files changed, 5 insertions, 5 deletions
diff --git a/debian/patches/standalone-build b/debian/patches/standalone-build
index 5292629ca..7a25313b6 100644
--- a/debian/patches/standalone-build
+++ b/debian/patches/standalone-build
@@ -6,7 +6,7 @@ Last-Update: 2015-04-20
--- a/debian/control
+++ b/debian/control
-@@ -84,6 +84,7 @@ Build-Depends:
+@@ -85,6 +85,7 @@ Build-Depends:
rsync,
wget,
curl,
@@ -14,7 +14,7 @@ Last-Update: 2015-04-20
openssh-client,
git-remote-gcrypt (>= 0.20130908-6),
chrpath,
-@@ -93,15 +94,14 @@ Vcs-Git: git://git.kitenet.net/git-annex
+@@ -96,15 +97,14 @@ Vcs-Git: git://git.kitenet.net/git-annex
Homepage: http://git-annex.branchable.com/
XS-Testsuite: autopkgtest
@@ -36,16 +36,16 @@ Last-Update: 2015-04-20
Recommends:
lsof,
gnupg,
-@@ -119,7 +119,7 @@ Suggests:
+@@ -122,7 +122,7 @@ Suggests:
libnss-mdns,
uftp,
- Conflicts: datalad (< 0.9.1)
+ Breaks: datalad (< 0.9.1)
-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
-@@ -137,3 +137,7 @@ Description: manage files with git, with
+@@ -140,3 +140,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.