diff --git a/debian/control b/debian/control index f1808631f7..c26f747ac0 100644 --- a/debian/control +++ b/debian/control @@ -81,7 +81,7 @@ Build-Depends: lsof [linux-any], ikiwiki, libimage-magick-perl, - git (>= 1:2.1), + git (>= 1:2.22), rsync, curl, openssh-client, @@ -98,7 +98,7 @@ Package: git-annex Architecture: any Section: utils Depends: ${misc:Depends}, ${shlibs:Depends}, - git (>= 1:1.8.1), + git (>= 1:2.22), netbase, rsync, curl, diff --git a/debian/patches/standalone-build b/debian/patches/standalone-build index bd2942db02..8e8e5f19c9 100644 --- a/debian/patches/standalone-build +++ b/debian/patches/standalone-build @@ -7,7 +7,7 @@ Last-Update: 2015-04-20 --- a/debian/control +++ b/debian/control @@ -85,6 +85,7 @@ Build-Depends: - git (>= 1:1.8.1), + git (>= 1:2.22), rsync, curl, + locales, @@ -23,7 +23,7 @@ Last-Update: 2015-04-20 Architecture: any Section: utils -Depends: ${misc:Depends}, ${shlibs:Depends}, -- git (>= 1:1.8.1), +- git (>= 1:2.22), +Conflicts: git-annex +Provides: git-annex +Depends: ${misc:Depends},