(Build-)depend on git >= 2.22 to avoid memory leaked git being bundled or used

Note from Joey:
  git-annex still supports git 2.1, but operates in a degraded fashion.
  It would be better for backports of the debian package to also
  backport a newer git. This dependency is mostly expressing that,
  also that any users who might upgrade git-annex should also upgrade
  git.

  Also worth noting that the i386ancient autobuilder has git 2.1 on it
  (best I have been able to manage there), but luckily the epoch is
  bumped to 2, so the dependencies will still be satisfied.
This commit is contained in:
Yaroslav Halchenko 2019-11-22 09:26:01 -05:00 committed by Joey Hess
parent 1d0dbdf201
commit e296637737
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
2 changed files with 4 additions and 4 deletions

4
debian/control vendored
View file

@ -81,7 +81,7 @@ Build-Depends:
lsof [linux-any], lsof [linux-any],
ikiwiki, ikiwiki,
libimage-magick-perl, libimage-magick-perl,
git (>= 1:2.1), git (>= 1:2.22),
rsync, rsync,
curl, curl,
openssh-client, openssh-client,
@ -98,7 +98,7 @@ Package: git-annex
Architecture: any Architecture: any
Section: utils Section: utils
Depends: ${misc:Depends}, ${shlibs:Depends}, Depends: ${misc:Depends}, ${shlibs:Depends},
git (>= 1:1.8.1), git (>= 1:2.22),
netbase, netbase,
rsync, rsync,
curl, curl,

View file

@ -7,7 +7,7 @@ Last-Update: 2015-04-20
--- a/debian/control --- a/debian/control
+++ b/debian/control +++ b/debian/control
@@ -85,6 +85,7 @@ Build-Depends: @@ -85,6 +85,7 @@ Build-Depends:
git (>= 1:1.8.1), git (>= 1:2.22),
rsync, rsync,
curl, curl,
+ locales, + locales,
@ -23,7 +23,7 @@ Last-Update: 2015-04-20
Architecture: any Architecture: any
Section: utils Section: utils
-Depends: ${misc:Depends}, ${shlibs:Depends}, -Depends: ${misc:Depends}, ${shlibs:Depends},
- git (>= 1:1.8.1), - git (>= 1:2.22),
+Conflicts: git-annex +Conflicts: git-annex
+Provides: git-annex +Provides: git-annex
+Depends: ${misc:Depends}, +Depends: ${misc:Depends},