Relicense 5 source files that are not part of the webapp from AGPL to GPL.

Building w/o the webapp is not supposed to pull in any AGPLed files.

I appear to have written all the code in these files;
the only commit by anyone else is 64e844e1fefca513d143e3f74a54dfc6d526a2ff
and is a spelling fix that is not copyrightable.

diff --git a/Assistant/Fsck.hs b/Assistant/Fsck.hs
index 067c7d1a102d03793aefbae6273afc9056278a3d..9d8848ba983c89ea8ce11939c89a5e37220370c9 100644 (file)
--- a/Assistant/Fsck.hs
+++ b/Assistant/Fsck.hs
@@ -2,7 +2,7 @@
  -
  - Copyright 2013 Joey Hess <id@joeyh.name>
  -
- - Licensed under the GNU AGPL version 3 or higher.
+ - Licensed under the GNU GPL version 3 or higher.
  -}
 
 module Assistant.Fsck where

diff --git a/Assistant/Gpg.hs b/Assistant/Gpg.hs
index 8910e8385419fe08630386f32715e0f402127a1b..34d00a3842e4523e18b76f0acc1baea3686444c9 100644 (file)
--- a/Assistant/Gpg.hs
+++ b/Assistant/Gpg.hs
@@ -2,7 +2,7 @@
  -
  - Copyright 2013 Joey Hess <id@joeyh.name>
  -
- - Licensed under the GNU AGPL version 3 or higher.
+ - Licensed under the GNU GPL version 3 or higher.
  -}
 
 module Assistant.Gpg where

diff --git a/Assistant/Repair.hs b/Assistant/Repair.hs
index 97c9f7f94a48e8eb9a56a81de2cbaaa4a8d6e7a9..29bdc44f1c49fbfd795d408cbae3a84184ecef59 100644 (file)
--- a/Assistant/Repair.hs
+++ b/Assistant/Repair.hs
@@ -2,7 +2,7 @@
  -
  - Copyright 2013 Joey Hess <id@joeyh.name>
  -
- - Licensed under the GNU AGPL version 3 or higher.
+ - Licensed under the GNU GPL version 3 or higher.
  -}
 
 {-# LANGUAGE CPP #-}

diff --git a/Assistant/Restart.hs b/Assistant/Restart.hs
index e9d152ab7f1402db2957c7bb34ba04598d071ea6..be1b213929562fd20181ad344c2b59a6eb95875b 100644 (file)
--- a/Assistant/Restart.hs
+++ b/Assistant/Restart.hs
@@ -2,7 +2,7 @@
  -
  - Copyright 2013 Joey Hess <id@joeyh.name>
  -
- - Licensed under the GNU AGPL version 3 or higher.
+ - Licensed under the GNU GPL version 3 or higher.
  -}
 
 {-# LANGUAGE CPP #-}

diff --git a/Assistant/Upgrade.hs b/Assistant/Upgrade.hs
index 28b838dc2b7dd3bd7ce4eb9817c4074b3a24adb6..afbb61924a2fe50db620e0c557eaa69d33388440 100644 (file)
--- a/Assistant/Upgrade.hs
+++ b/Assistant/Upgrade.hs
@@ -2,7 +2,7 @@
  -
  - Copyright 2013 Joey Hess <id@joeyh.name>
  -
- - Licensed under the GNU AGPL version 3 or higher.
+ - Licensed under the GNU GPL version 3 or higher.
  -}
 
 {-# LANGUAGE CPP #-}

diff --git a/CHANGELOG b/CHANGELOG
index de1a16fb7dcb62ef5ce0fb0d9fc4a1b072d19c3e..1e108d4a0b11a77975b62041fb8636dd3c37bcb5 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -3,6 +3,7 @@ git-annex (6.20161119) UNRELEASED; urgency=medium
   * addurl: Fix bug in checking annex.largefiles expressions using
     largerthan, mimetype, and smallerthan; the first two always failed
     to match, and the latter always matched.
+  * Relicense 5 source files that are not part of the webapp from AGPL to GPL.
 
  -- Joey Hess <id@joeyh.name>  Mon, 21 Nov 2016 11:27:50 -0400