From b9a1db8068c1653ea4539c59775a0d87dd88848f Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 8 Feb 2019 15:19:11 -0400 Subject: [PATCH] update copyright metadata for recent changes List all current AGPL files in COPYRIGHT; several that were GPL have had new AGPL code added. In git-annex.cabal, use AGPL-3 as the overall license, since it's not possible to build git-annex without AGPL code anymore. --- COPYRIGHT | 4 ++-- git-annex.cabal | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/COPYRIGHT b/COPYRIGHT index 16626892bd..ceffc4d717 100644 --- a/COPYRIGHT +++ b/COPYRIGHT @@ -10,8 +10,8 @@ Copyright: © 2012-2017 Joey Hess © 2014 Sören Brunk License: AGPL-3+ -Files: Remote/Git.hs Remote/Helper/Ssh.hs Remote/Adb.hs Remote/External.hs Remote/Extermal/Types.hs -Copyright: © 2011-2018 Joey Hess +Files: Annex/AdjustedBranch.hs Annex/AdjustedBranch/Name.hs Annex/CurrentBranch.hs Annex/Version.hs Benchmark.hs Logs/File.hs Logs/Line.hs Logs/Smudge.hs Remote/Git.hs Remote/Helper/Ssh.hs Remote/Adb.hs Remote/External.hs Remote/Extermal/Types.hs Types/AdjustedBranch.hs Types/RepoVersion.hs Upgrade/V6.hs +Copyright: © 2011-2019 Joey Hess License: AGPL-3+ Files: Remote/Ddar.hs diff --git a/git-annex.cabal b/git-annex.cabal index 324ba86a80..77137e2bab 100644 --- a/git-annex.cabal +++ b/git-annex.cabal @@ -1,7 +1,7 @@ Name: git-annex Version: 7.20190129 Cabal-Version: >= 1.8 -License: GPL-3 +License: AGPL-3 Maintainer: Joey Hess Author: Joey Hess Stability: Stable