mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

BF: fix standalone-build patch to not strip away netbase from Depends

Browse source 
Also refreshed the patch altogether
This commit is contained in:
Yaroslav Halchenko 2018-11-15 07:34:05 -05:00 • committed by Joey Hess
parent d6fb123318
commit c17f4ca88f
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
1 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

16
debian/patches/standalone-build vendored
View file

@ -6,7 +6,7 @@ Last-Update: 2015-04-20
--- a/debian/control --- a/debian/control
+++ b/debian/control +++ b/debian/control
@@ -84,6 +84,7 @@ Build-Depends: @@ -85,6 +85,7 @@ Build-Depends:
git (>= 1:1.8.1), git (>= 1:1.8.1),
rsync, rsync,
curl, curl,
@ -14,7 +14,7 @@ Last-Update: 2015-04-20
openssh-client, openssh-client,
git-remote-gcrypt (>= 0.20130908-6), git-remote-gcrypt (>= 0.20130908-6),
gnupg, gnupg,
@@ -94,15 +95,14 @@ Vcs-Git: git://git.kitenet.net/git-annex @@ -95,15 +96,15 @@ Vcs-Git: git://git.kitenet.net/git-annex
Homepage: http://git-annex.branchable.com/ Homepage: http://git-annex.branchable.com/
XS-Testsuite: autopkgtest XS-Testsuite: autopkgtest
@ -24,19 +24,19 @@ Last-Update: 2015-04-20
Section: utils Section: utils
-Depends: ${misc:Depends}, ${shlibs:Depends}, -Depends: ${misc:Depends}, ${shlibs:Depends},
- git (>= 1:1.8.1), - git (>= 1:1.8.1),
- netbase,
- rsync,
- curl,
- openssh-client (>= 1:5.6p1)
+Conflicts: git-annex +Conflicts: git-annex
+Provides: git-annex +Provides: git-annex
+Depends: ${misc:Depends}, +Depends: ${misc:Depends},
+ git, + git,
netbase,
- rsync,
- curl,
- openssh-client (>= 1:5.6p1)
+ openssh-client + openssh-client
Recommends: Recommends:
lsof, lsof,
gnupg, gnupg,
@@ -121,7 +121,7 @@ Suggests: @@ -122,7 +123,7 @@ Suggests:
libnss-mdns, libnss-mdns,
uftp, uftp,
Breaks: datalad (< 0.11.1~) Breaks: datalad (< 0.11.1~)
@ -45,7 +45,7 @@ Last-Update: 2015-04-20
git-annex allows managing files with git, without checking the file git-annex allows managing files with git, without checking the file
contents into git. While that may seem paradoxical, it is useful when contents into git. While that may seem paradoxical, it is useful when
dealing with files larger than git can currently easily handle, whether due dealing with files larger than git can currently easily handle, whether due
@@ -139,3 +139,7 @@ Description: manage files with git, with @@ -140,3 +141,7 @@ Description: manage files with git, with
noticing when files are changed, and automatically committing them noticing when files are changed, and automatically committing them
to git and transferring them to other computers. The git-annex webapp to git and transferring them to other computers. The git-annex webapp
makes it easy to set up and use git-annex this way. makes it easy to set up and use git-annex this way.