From 9df8a6eb9405dde4464d27133c04f5ee539a85de Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 2 Jan 2020 12:34:10 -0400 Subject: merge from git-annex and relicense accordingly Merge git library and utility from git-annex. The former is now relicensed AGPL, so git-repair as a whole becomes AGPL. For simplicity, I am relicensing the remainder of the code in git-repair AGPL as well, per the header changes in this commit. While that code is also technically available under the GPL license, as it's been released under that license before, changes going forward will be only released by me under the AGPL. --- CHANGELOG | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'CHANGELOG') diff --git a/CHANGELOG b/CHANGELOG index 9c8889d..50f9332 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,8 +1,12 @@ -git-repair (1.20170627) UNRELEASED; urgency=medium +git-repair (1.20200102) unstable; urgency=medium + * Relicensed AGPL. * Merge from git-annex. + * Removed the network-uri build flag. + * Increased required version of several dependencies. + * Added dependencies on deepseq, attoparsec and filepath-bytestring. - -- Joey Hess Thu, 14 Dec 2017 12:55:44 -0400 + -- Joey Hess Thu, 02 Jan 2020 12:39:13 -0400 git-repair (1.20170626) unstable; urgency=medium -- cgit v1.2.3