From 2ffd74c6844036cbc789f578b3eec840fc0ee0e2 Mon Sep 17 00:00:00 2001
From: Joey Hess <joeyh@joeyh.name>
Date: Fri, 10 Mar 2017 15:05:47 -0400
Subject: [PATCH] relicense Utility/GPG.hs BSD as the rest of Utility is

The COPYRIGHT had Utility/DirWatcher* listed as GPL, but they were
actually BSD licensed.

No idea why I put the GPL on Utility/GPG.hs file originally.
I wrote all of it, except for guilhem's small changes to it in
00fc21bfec2e24a9a41d3860ee9ac2fdf3f1a465, which seem too small to be
independently copyrightable. I'm relicencing it BSD.
---
 COPYRIGHT      | 4 ----
 Utility/Gpg.hs | 2 +-
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/COPYRIGHT b/COPYRIGHT
index 8f677610d7..d7a18819f9 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -24,10 +24,6 @@ Files: Utility/*
 Copyright: 2012-2017 Joey Hess <id@joeyh.name>
 License: BSD-2-clause
 
-Files: Utility/Gpg.hs Utility/DirWatcher*
-Copyright: © 2010-2014 Joey Hess <id@joeyh.name>
-License: GPL-3+
-
 Files: doc/logo* */favicon.ico standalone/osx/git-annex.app/Contents/Resources/git-annex.icns standalone/android/icons/*
 Copyright: 2007 Henrik Nyh <http://henrik.nyh.se/>
            2010 Joey Hess <id@joeyh.name>
diff --git a/Utility/Gpg.hs b/Utility/Gpg.hs
index a5d3820832..f6173cdb4f 100644
--- a/Utility/Gpg.hs
+++ b/Utility/Gpg.hs
@@ -2,7 +2,7 @@
  -
  - Copyright 2011 Joey Hess <id@joeyh.name>
  -
- - Licensed under the GNU GPL version 3 or higher.
+ - License: BSD-2-clause
  -}
 
 {-# LANGUAGE CPP #-}