diff options
70 files changed, 100 insertions, 70 deletions
diff --git a/Utility/Applicative.hs b/Utility/Applicative.hs index 64400c801..fd8944b28 100644 --- a/Utility/Applicative.hs +++ b/Utility/Applicative.hs @@ -2,7 +2,7 @@ - - Copyright 2012 Joey Hess <joey@kitenet.net> - - - Licensed under the GNU GPL version 3 or higher. + - License: BSD-2-clause -} module Utility.Applicative where diff --git a/Utility/Base64.hs b/Utility/Base64.hs index 0c6c8677a..3f0c19965 100644 --- a/Utility/Base64.hs +++ b/Utility/Base64.hs @@ -2,7 +2,7 @@ - - Copyright 2011 Joey Hess <joey@kitenet.net> - - - Licensed under the GNU GPL version 3 or higher. + - License: BSD-2-clause -} module Utility.Base64 (toB64, fromB64Maybe, fromB64) where diff --git a/Utility/Batch.hs b/Utility/Batch.hs index 3f21478cf..3f0708180 100644 --- a/Utility/Batch.hs +++ b/Utility/Batch.hs @@ -2,7 +2,7 @@ - - Copyright 2013 Joey Hess <joey@kitenet.net> - - - Licensed under the GNU GPL version 3 or higher. + - License: BSD-2-clause -} {-# LANGUAGE CPP #-} diff --git a/Utility/CoProcess.hs b/Utility/CoProcess.hs index 0c8e95e17..d531f07b7 100644 --- a/Utility/CoProcess.hs +++ b/Utility/CoProcess.hs @@ -3,7 +3,7 @@ - - Copyright 2012-2013 Joey Hess <joey@kitenet.net> - - - Licensed under the GNU GPL version 3 or higher. + - License: BSD-2-clause -} {-# LANGUAGE CPP #-} diff --git a/Utility/CopyFile.hs b/Utility/CopyFile.hs index 4a609fd16..e3ccd0a2b 100644 --- a/Utility/CopyFile.hs +++ b/Utility/CopyFile.hs @@ -2,7 +2,7 @@ - - Copyright 2010-2013 Joey Hess <joey@kitenet.net> - - - Licensed under the GNU GPL version 3 or higher. + - License: BSD-2-clause -} {-# LANGUAGE CPP #-} diff --git a/Utility/DBus.hs b/Utility/DBus.hs index bfcaa4471..29dbc9479 100644 --- a/Utility/DBus.hs +++ b/Utility/DBus.hs @@ -2,7 +2,7 @@ - - Copyright 2012 Joey Hess <joey@kitenet.net> - - - Licensed under the GNU GPL version 3 or higher. + - License: BSD-2-clause -} {-# LANGUAGE OverloadedStrings, ScopedTypeVariables #-} diff --git a/Utility/Daemon.hs b/Utility/Daemon.hs index 5d47be035..2b62382ee 100644 --- a/Utility/Daemon.hs +++ b/Utility/Daemon.hs @@ -2,7 +2,7 @@ - - Copyright 2012-2014 Joey Hess <joey@kitenet.net> - - - Licensed under the GNU GPL version 3 or higher. + - License: BSD-2-clause -} {-# LANGUAGE CPP #-} diff --git a/Utility/Data.hs b/Utility/Data.hs index 359258296..2df12b36d 100644 --- a/Utility/Data.hs +++ b/Utility/Data.hs @@ -2,7 +2,7 @@ - - Copyright 2013 Joey Hess <joey@kitenet.net> - - - Licensed under the GNU GPL version 3 or higher. + - License: BSD-2-clause -} module Utility.Data where diff --git a/Utility/DataUnits.hs b/Utility/DataUnits.hs index 7399809eb..7575af21f 100644 --- a/Utility/DataUnits.hs +++ b/Utility/DataUnits.hs @@ -2,7 +2,7 @@ - - Copyright 2011 Joey Hess <joey@kitenet.net> - - - Licensed under the GNU GPL version 3 or higher. + - License: BSD-2-clause - - - And now a rant: diff --git a/Utility/DirWatcher.hs b/Utility/DirWatcher.hs index 077410575..7e582239d 100644 --- a/Utility/DirWatcher.hs +++ b/Utility/DirWatcher.hs @@ -6,7 +6,7 @@ - - Copyright 2012-2013 Joey Hess <joey@kitenet.net> - - - Licensed under the GNU GPL version 3 or higher. + - License: BSD-2-clause -} {-# LANGUAGE CPP #-} diff --git a/Utility/DirWatcher/FSEvents.hs b/Utility/DirWatcher/FSEvents.hs index 26e1f7671..7d755518f 100644 --- a/Utility/DirWatcher/FSEvents.hs +++ b/Utility/DirWatcher/FSEvents.hs @@ -2,7 +2,7 @@ - - Copyright 2012 Joey Hess <joey@kitenet.net> - - - Licensed under the GNU GPL version 3 or higher. + - License: BSD-2-clause -} module Utility.DirWatcher.FSEvents where diff --git a/Utility/DirWatcher/INotify.hs b/Utility/DirWatcher/INotify.hs index 016858b1b..9400c7940 100644 --- a/Utility/DirWatcher/INotify.hs +++ b/Utility/DirWatcher/INotify.hs @@ -2,7 +2,7 @@ - - Copyright 2012 Joey Hess <joey@kitenet.net> - - - Licensed under the GNU GPL version 3 or higher. + - License: BSD-2-clause -} module Utility.DirWatcher.INotify where diff --git a/Utility/DirWatcher/Kqueue.hs b/Utility/DirWatcher/Kqueue.hs index 3ddef603f..453c8d3f1 100644 --- a/Utility/DirWatcher/Kqueue.hs +++ b/Utility/DirWatcher/Kqueue.hs @@ -2,7 +2,7 @@ - - Copyright 2012 Joey Hess <joey@kitenet.net> - - - Licensed under the GNU GPL version 3 or higher. + - License: BSD-2-clause -} {-# LANGUAGE ForeignFunctionInterface #-} diff --git a/Utility/DirWatcher/Types.hs b/Utility/DirWatcher/Types.hs index 8cfa69d34..2c92d6cd5 100644 --- a/Utility/DirWatcher/Types.hs +++ b/Utility/DirWatcher/Types.hs @@ -2,7 +2,7 @@ - - Copyright 2012 Joey Hess <joey@kitenet.net> - - - Licensed under the GNU GPL version 3 or higher. + - License: BSD-2-clause -} module Utility.DirWatcher.Types where diff --git a/Utility/DirWatcher/Win32Notify.hs b/Utility/DirWatcher/Win32Notify.hs index f095e5d0e..ef4f385c5 100644 --- a/Utility/DirWatcher/Win32Notify.hs +++ b/Utility/DirWatcher/Win32Notify.hs @@ -2,7 +2,7 @@ - - Copyright 2013 Joey Hess <joey@kitenet.net> - - - Licensed under the GNU GPL version 3 or higher. + - License: BSD-2-clause -} module Utility.DirWatcher.Win32Notify where diff --git a/Utility/Directory.hs b/Utility/Directory.hs index c2a50714c..d92327c09 100644 --- a/Utility/Directory.hs +++ b/Utility/Directory.hs @@ -2,7 +2,7 @@ - - Copyright 2011-2014 Joey Hess <joey@kitenet.net> - - - Licensed under the GNU GPL version 3 or higher. + - License: BSD-2-clause -} {-# LANGUAGE CPP #-} diff --git a/Utility/DiskFree.hs b/Utility/DiskFree.hs index 2f296e2cb..af4431e88 100644 --- a/Utility/DiskFree.hs +++ b/Utility/DiskFree.hs @@ -2,7 +2,7 @@ - - Copyright 2012, 2014 Joey Hess <joey@kitenet.net> - - - Licensed under the GNU GPL version 3 or higher. + - License: BSD-2-clause -} {-# LANGUAGE ForeignFunctionInterface, CPP #-} diff --git a/Utility/Dot.hs b/Utility/Dot.hs index e57bf009f..3bea644f7 100644 --- a/Utility/Dot.hs +++ b/Utility/Dot.hs @@ -2,7 +2,7 @@ - - Copyright 2010 Joey Hess <joey@kitenet.net> - - - Licensed under the GNU GPL version 3 or higher. + - License: BSD-2-clause -} module Utility.Dot where -- import qualified diff --git a/Utility/Env.hs b/Utility/Env.hs index 90ed58f6b..6763c24e1 100644 --- a/Utility/Env.hs +++ b/Utility/Env.hs @@ -2,7 +2,7 @@ - - Copyright 2013 Joey Hess <joey@kitenet.net> - - - Licensed under the GNU GPL version 3 or higher. + - License: BSD-2-clause -} {-# LANGUAGE CPP #-} diff --git a/Utility/Exception.hs b/Utility/Exception.hs index 6f3c059f6..1fecf65d5 100644 --- a/Utility/Exception.hs +++ b/Utility/Exception.hs @@ -2,7 +2,7 @@ - - Copyright 2011-2012 Joey Hess <joey@kitenet.net> - - - Licensed under the GNU GPL version 3 or higher. + - License: BSD-2-clause -} {-# LANGUAGE ScopedTypeVariables #-} diff --git a/Utility/ExternalSHA.hs b/Utility/ExternalSHA.hs index adbde795a..8b5ca697c 100644 --- a/Utility/ExternalSHA.hs +++ b/Utility/ExternalSHA.hs @@ -5,7 +5,7 @@ - - Copyright 2011-2013 Joey Hess <joey@kitenet.net> - - - Licensed under the GNU GPL version 3 or higher. + - License: BSD-2-clause -} module Utility.ExternalSHA (externalSHA) where diff --git a/Utility/FileMode.hs b/Utility/FileMode.hs index 9c15da8c4..c2ef683a8 100644 --- a/Utility/FileMode.hs +++ b/Utility/FileMode.hs @@ -2,7 +2,7 @@ - - Copyright 2010-2012 Joey Hess <joey@kitenet.net> - - - Licensed under the GNU GPL version 3 or higher. + - License: BSD-2-clause -} {-# LANGUAGE CPP #-} diff --git a/Utility/FileSystemEncoding.hs b/Utility/FileSystemEncoding.hs index 690942cba..b81fdc532 100644 --- a/Utility/FileSystemEncoding.hs +++ b/Utility/FileSystemEncoding.hs @@ -2,7 +2,7 @@ - - Copyright 2012-2014 Joey Hess <joey@kitenet.net> - - - Licensed under the GNU GPL version 3 or higher. + - License: BSD-2-clause -} {-# LANGUAGE CPP #-} diff --git a/Utility/Format.hs b/Utility/Format.hs index e7a27515e..2a5ae5c34 100644 --- a/Utility/Format.hs +++ b/Utility/Format.hs @@ -2,7 +2,7 @@ - - Copyright 2010, 2011 Joey Hess <joey@kitenet.net> - - - Licensed under the GNU GPL version 3 or higher. + - License: BSD-2-clause -} module Utility.Format ( diff --git a/Utility/FreeDesktop.hs b/Utility/FreeDesktop.hs index da9d7b618..c1f042ce8 100644 --- a/Utility/FreeDesktop.hs +++ b/Utility/FreeDesktop.hs @@ -7,7 +7,7 @@ - - Copyright 2012 Joey Hess <joey@kitenet.net> - - - Licensed under the GNU GPL version 3 or higher. + - License: BSD-2-clause -} module Utility.FreeDesktop ( diff --git a/Utility/Glob.hs b/Utility/Glob.hs index 1a77da7d3..373f3fdbf 100644 --- a/Utility/Glob.hs +++ b/Utility/Glob.hs @@ -5,7 +5,7 @@ - - Copyright 2014 Joey Hess <joey@kitenet.net> - - - Licensed under the GNU GPL version 3 or higher. + - License: BSD-2-clause -} {-# LANGUAGE CPP #-} diff --git a/Utility/HumanNumber.hs b/Utility/HumanNumber.hs index d5f647cd6..8783f8152 100644 --- a/Utility/HumanNumber.hs +++ b/Utility/HumanNumber.hs @@ -2,7 +2,7 @@ - - Copyright 2012-2013 Joey Hess <joey@kitenet.net> - - - Licensed under the GNU GPL version 3 or higher. + - License: BSD-2-clause -} module Utility.HumanNumber where diff --git a/Utility/HumanTime.hs b/Utility/HumanTime.hs index f52fd5b1b..2aef1b09c 100644 --- a/Utility/HumanTime.hs +++ b/Utility/HumanTime.hs @@ -2,7 +2,7 @@ - - Copyright 2012-2013 Joey Hess <joey@kitenet.net> - - - Licensed under the GNU GPL version 3 or higher. + - License: BSD-2-clause -} module Utility.HumanTime ( diff --git a/Utility/InodeCache.hs b/Utility/InodeCache.hs index 46ca87bd9..a24bce546 100644 --- a/Utility/InodeCache.hs +++ b/Utility/InodeCache.hs @@ -2,7 +2,7 @@ - - Copyright 2013 Joey Hess <joey@kitenet.net> - - - Licensed under the GNU GPL version 3 or higher. + - License: BSD-2-clause -} module Utility.InodeCache where diff --git a/Utility/JSONStream.hs b/Utility/JSONStream.hs index f3e93c3da..b28646268 100644 --- a/Utility/JSONStream.hs +++ b/Utility/JSONStream.hs @@ -2,7 +2,7 @@ - - Copyright 2011 Joey Hess <joey@kitenet.net> - - - Licensed under the GNU GPL version 3 or higher. + - License: BSD-2-clause -} module Utility.JSONStream ( diff --git a/Utility/LinuxMkLibs.hs b/Utility/LinuxMkLibs.hs index f4744fcb2..1dc4e1ea3 100644 --- a/Utility/LinuxMkLibs.hs +++ b/Utility/LinuxMkLibs.hs @@ -2,7 +2,7 @@ - - Copyright 2013 Joey Hess <joey@kitenet.net> - - - Licensed under the GNU GPL version 3 or higher. + - License: BSD-2-clause -} module Utility.LinuxMkLibs where diff --git a/Utility/LogFile.hs b/Utility/LogFile.hs index 73fbf820e..e84b72b2e 100644 --- a/Utility/LogFile.hs +++ b/Utility/LogFile.hs @@ -2,7 +2,7 @@ - - Copyright 2012 Joey Hess <joey@kitenet.net> - - - Licensed under the GNU GPL version 3 or higher. + - License: BSD-2-clause -} {-# LANGUAGE CPP #-} diff --git a/Utility/Lsof.hs b/Utility/Lsof.hs index b0d2bc53c..ee4036b16 100644 --- a/Utility/Lsof.hs +++ b/Utility/Lsof.hs @@ -2,7 +2,7 @@ - - Copyright 2012 Joey Hess <joey@kitenet.net> - - - Licensed under the GNU GPL version 3 or higher. + - License: BSD-2-clause -} {-# LANGUAGE CPP #-} diff --git a/Utility/Matcher.hs b/Utility/Matcher.hs index 5647c3e30..1ee224ffc 100644 --- a/Utility/Matcher.hs +++ b/Utility/Matcher.hs @@ -12,7 +12,7 @@ - - Copyright 2011-2013 Joey Hess <joey@kitenet.net> - - - Licensed under the GNU GPL version 3 or higher. + - License: BSD-2-clause -} {-# LANGUAGE Rank2Types, KindSignatures #-} diff --git a/Utility/Metered.hs b/Utility/Metered.hs index 7ad9b1215..0d94c1c5c 100644 --- a/Utility/Metered.hs +++ b/Utility/Metered.hs @@ -2,7 +2,7 @@ - - Copyright 2012, 2013 Joey Hess <joey@kitenet.net> - - - Licensed under the GNU GPL version 3 or higher. + - License: BSD-2-clause -} {-# LANGUAGE TypeSynonymInstances #-} diff --git a/Utility/Misc.hs b/Utility/Misc.hs index 9c19df833..949f41e7b 100644 --- a/Utility/Misc.hs +++ b/Utility/Misc.hs @@ -2,7 +2,7 @@ - - Copyright 2010-2011 Joey Hess <joey@kitenet.net> - - - Licensed under the GNU GPL version 3 or higher. + - License: BSD-2-clause -} {-# LANGUAGE CPP #-} diff --git a/Utility/Monad.hs b/Utility/Monad.hs index 1ba43c5f8..eba3c4283 100644 --- a/Utility/Monad.hs +++ b/Utility/Monad.hs @@ -2,7 +2,7 @@ - - Copyright 2010-2012 Joey Hess <joey@kitenet.net> - - - Licensed under the GNU GPL version 3 or higher. + - License: BSD-2-clause -} module Utility.Monad where diff --git a/Utility/Network.hs b/Utility/Network.hs index 62523c9e9..9c6980261 100644 --- a/Utility/Network.hs +++ b/Utility/Network.hs @@ -2,7 +2,7 @@ - - Copyright 2012 Joey Hess <joey@kitenet.net> - - - Licensed under the GNU GPL version 3 or higher. + - License: BSD-2-clause -} module Utility.Network where diff --git a/Utility/NotificationBroadcaster.hs b/Utility/NotificationBroadcaster.hs index 60353116c..8a6e09f92 100644 --- a/Utility/NotificationBroadcaster.hs +++ b/Utility/NotificationBroadcaster.hs @@ -8,7 +8,7 @@ - - Copyright 2012 Joey Hess <joey@kitenet.net> - - - Licensed under the GNU GPL version 3 or higher. + - License: BSD-2-clause -} module Utility.NotificationBroadcaster ( diff --git a/Utility/OSX.hs b/Utility/OSX.hs index f9d992575..4c930f2f8 100644 --- a/Utility/OSX.hs +++ b/Utility/OSX.hs @@ -2,7 +2,7 @@ - - Copyright 2012 Joey Hess <joey@kitenet.net> - - - Licensed under the GNU GPL version 3 or higher. + - License: BSD-2-clause -} module Utility.OSX where diff --git a/Utility/PID.hs b/Utility/PID.hs index 4867bd6de..a70a4e2a4 100644 --- a/Utility/PID.hs +++ b/Utility/PID.hs @@ -2,7 +2,7 @@ - - Copyright 2014 Joey Hess <joey@kitenet.net> - - - Licensed under the GNU GPL version 3 or higher. + - License: BSD-2-clause -} {-# LANGUAGE CPP #-} diff --git a/Utility/Parallel.hs b/Utility/Parallel.hs index b39880355..239c81e7b 100644 --- a/Utility/Parallel.hs +++ b/Utility/Parallel.hs @@ -2,7 +2,7 @@ - - Copyright 2012 Joey Hess <joey@kitenet.net> - - - Licensed under the GNU GPL version 3 or higher. + - License: BSD-2-clause -} module Utility.Parallel where diff --git a/Utility/Path.hs b/Utility/Path.hs index 570350d61..99c9438bf 100644 --- a/Utility/Path.hs +++ b/Utility/Path.hs @@ -2,7 +2,7 @@ - - Copyright 2010-2014 Joey Hess <joey@kitenet.net> - - - Licensed under the GNU GPL version 3 or higher. + - License: BSD-2-clause -} {-# LANGUAGE PackageImports, CPP #-} diff --git a/Utility/Percentage.hs b/Utility/Percentage.hs index d4b2da429..f2fb45762 100644 --- a/Utility/Percentage.hs +++ b/Utility/Percentage.hs @@ -2,7 +2,7 @@ - - Copyright 2012 Joey Hess <joey@kitenet.net> - - - Licensed under the GNU GPL version 3 or higher. + - License: BSD-2-clause -} module Utility.Percentage ( diff --git a/Utility/PosixFiles.hs b/Utility/PosixFiles.hs index 23edc25c9..5abbb5785 100644 --- a/Utility/PosixFiles.hs +++ b/Utility/PosixFiles.hs @@ -4,7 +4,7 @@ - - Copyright 2014 Joey Hess <joey@kitenet.net> - - - Licensed under the GNU GPL version 3 or higher. + - License: BSD-2-clause -} {-# LANGUAGE CPP #-} diff --git a/Utility/Process.hs b/Utility/Process.hs index 3f93dc2fc..549ae5708 100644 --- a/Utility/Process.hs +++ b/Utility/Process.hs @@ -3,7 +3,7 @@ - - Copyright 2012 Joey Hess <joey@kitenet.net> - - - Licensed under the GNU GPL version 3 or higher. + - License: BSD-2-clause -} {-# LANGUAGE CPP, Rank2Types #-} diff --git a/Utility/QuickCheck.hs b/Utility/QuickCheck.hs index 7f7234c7c..a498ee619 100644 --- a/Utility/QuickCheck.hs +++ b/Utility/QuickCheck.hs @@ -2,7 +2,7 @@ - - Copyright 2012-2014 Joey Hess <joey@kitenet.net> - - - Licensed under the GNU GPL version 3 or higher. + - License: BSD-2-clause -} {-# OPTIONS_GHC -fno-warn-orphans #-} diff --git a/Utility/Quvi.hs b/Utility/Quvi.hs index bb4975cbe..228ff7809 100644 --- a/Utility/Quvi.hs +++ b/Utility/Quvi.hs @@ -2,7 +2,7 @@ - - Copyright 2013 Joey Hess <joey@kitenet.net> - - - Licensed under the GNU GPL version 3 or higher. + - License: BSD-2-clause -} {-# LANGUAGE OverloadedStrings #-} diff --git a/Utility/Rsync.hs b/Utility/Rsync.hs index 82166f645..60381264e 100644 --- a/Utility/Rsync.hs +++ b/Utility/Rsync.hs @@ -2,7 +2,7 @@ - - Copyright 2010-2013 Joey Hess <joey@kitenet.net> - - - Licensed under the GNU GPL version 3 or higher. + - License: BSD-2-clause -} module Utility.Rsync where diff --git a/Utility/SRV.hs b/Utility/SRV.hs index a2ee704f7..f1671758e 100644 --- a/Utility/SRV.hs +++ b/Utility/SRV.hs @@ -5,7 +5,7 @@ - - Copyright 2012 Joey Hess <joey@kitenet.net> - - - Licensed under the GNU GPL version 3 or higher. + - License: BSD-2-clause -} {-# LANGUAGE CPP #-} diff --git a/Utility/SafeCommand.hs b/Utility/SafeCommand.hs index c8318ec2e..04fcf3908 100644 --- a/Utility/SafeCommand.hs +++ b/Utility/SafeCommand.hs @@ -2,7 +2,7 @@ - - Copyright 2010-2013 Joey Hess <joey@kitenet.net> - - - Licensed under the GNU GPL version 3 or higher. + - License: BSD-2-clause -} module Utility.SafeCommand where diff --git a/Utility/Scheduled.hs b/Utility/Scheduled.hs index d3ae06203..305410c54 100644 --- a/Utility/Scheduled.hs +++ b/Utility/Scheduled.hs @@ -2,7 +2,7 @@ - - Copyright 2013-2014 Joey Hess <joey@kitenet.net> - - - Licensed under the GNU GPL version 3 or higher. + - License: BSD-2-clause -} module Utility.Scheduled ( diff --git a/Utility/Shell.hs b/Utility/Shell.hs index 2227dc767..00f60d09f 100644 --- a/Utility/Shell.hs +++ b/Utility/Shell.hs @@ -2,7 +2,7 @@ - - Copyright 2013 Joey Hess <joey@kitenet.net> - - - Licensed under the GNU GPL version 3 or higher. + - License: BSD-2-clause -} {-# LANGUAGE CPP #-} diff --git a/Utility/SimpleProtocol.hs b/Utility/SimpleProtocol.hs index 1119cd986..0ac0be4cc 100644 --- a/Utility/SimpleProtocol.hs +++ b/Utility/SimpleProtocol.hs @@ -2,7 +2,7 @@ - - Copyright 2013-2014 Joey Hess <joey@kitenet.net> - - - Licensed under the GNU GPL version 3 or higher. + - License: BSD-2-clause -} module Utility.SimpleProtocol ( diff --git a/Utility/SshConfig.hs b/Utility/SshConfig.hs index 080f6479f..529e5c990 100644 --- a/Utility/SshConfig.hs +++ b/Utility/SshConfig.hs @@ -2,7 +2,7 @@ - - Copyright 2013 Joey Hess <joey@kitenet.net> - - - Licensed under the GNU GPL version 3 or higher. + - License: BSD-2-clause -} module Utility.SshConfig where diff --git a/Utility/Tense.hs b/Utility/Tense.hs index 60b3fa513..0392ba500 100644 --- a/Utility/Tense.hs +++ b/Utility/Tense.hs @@ -2,7 +2,7 @@ - - Copyright 2012 Joey Hess <joey@kitenet.net> - - - Licensed under the GNU GPL version 3 or higher. + - License: BSD-2-clause -} {-# LANGUAGE OverloadedStrings #-} diff --git a/Utility/ThreadLock.hs b/Utility/ThreadLock.hs index c029a2b0c..548d524e1 100644 --- a/Utility/ThreadLock.hs +++ b/Utility/ThreadLock.hs @@ -2,7 +2,7 @@ - - Copyright 2012 Joey Hess <joey@kitenet.net> - - - Licensed under the GNU GPL version 3 or higher. + - License: BSD-2-clause -} module Utility.ThreadLock where diff --git a/Utility/ThreadScheduler.hs b/Utility/ThreadScheduler.hs index dd88dc879..fc026d7e6 100644 --- a/Utility/ThreadScheduler.hs +++ b/Utility/ThreadScheduler.hs @@ -3,7 +3,7 @@ - Copyright 2012, 2013 Joey Hess <joey@kitenet.net> - Copyright 2011 Bas van Dijk & Roel van Dijk - - - Licensed under the GNU GPL version 3 or higher. + - License: BSD-2-clause -} {-# LANGUAGE CPP #-} diff --git a/Utility/Tmp.hs b/Utility/Tmp.hs index f46e1a5ee..0dc9f2c05 100644 --- a/Utility/Tmp.hs +++ b/Utility/Tmp.hs @@ -2,7 +2,7 @@ - - Copyright 2010-2013 Joey Hess <joey@kitenet.net> - - - Licensed under the GNU GPL version 3 or higher. + - License: BSD-2-clause -} {-# LANGUAGE CPP #-} diff --git a/Utility/Touch.hsc b/Utility/Touch.hsc index 53dd719fb..61276c523 100644 --- a/Utility/Touch.hsc +++ b/Utility/Touch.hsc @@ -2,7 +2,7 @@ - - Copyright 2011 Joey Hess <joey@kitenet.net> - - - Licensed under the GNU GPL version 3 or higher. + - License: BSD-2-clause -} {-# LANGUAGE ForeignFunctionInterface #-} diff --git a/Utility/URI.hs b/Utility/URI.hs index 39c2f2289..30c6be3db 100644 --- a/Utility/URI.hs +++ b/Utility/URI.hs @@ -2,7 +2,7 @@ - - Copyright 2014 Joey Hess <joey@kitenet.net> - - - Licensed under the GNU GPL version 3 or higher. + - License: BSD-2-clause -} {-# LANGUAGE CPP #-} diff --git a/Utility/Url.hs b/Utility/Url.hs index eddcd0a5d..bf2d3859c 100644 --- a/Utility/Url.hs +++ b/Utility/Url.hs @@ -2,7 +2,7 @@ - - Copyright 2011,2013 Joey Hess <joey@kitenet.net> - - - Licensed under the GNU GPL version 3 or higher. + - License: BSD-2-clause -} {-# LANGUAGE CPP #-} diff --git a/Utility/UserInfo.hs b/Utility/UserInfo.hs index 9c3bfd42f..617c3e945 100644 --- a/Utility/UserInfo.hs +++ b/Utility/UserInfo.hs @@ -2,7 +2,7 @@ - - Copyright 2012 Joey Hess <joey@kitenet.net> - - - Licensed under the GNU GPL version 3 or higher. + - License: BSD-2-clause -} {-# LANGUAGE CPP #-} diff --git a/Utility/Verifiable.hs b/Utility/Verifiable.hs index 4f88cb9f2..a62213074 100644 --- a/Utility/Verifiable.hs +++ b/Utility/Verifiable.hs @@ -2,7 +2,7 @@ - - Copyright 2012 Joey Hess <joey@kitenet.net> - - - Licensed under the GNU GPL version 3 or higher. + - License: BSD-2-clause -} module Utility.Verifiable where diff --git a/Utility/WebApp.hs b/Utility/WebApp.hs index 1a7698870..6315e743b 100644 --- a/Utility/WebApp.hs +++ b/Utility/WebApp.hs @@ -2,7 +2,7 @@ - - Copyright 2012-2014 Joey Hess <joey@kitenet.net> - - - Licensed under the GNU GPL version 3 or higher. + - License: BSD-2-clause -} {-# LANGUAGE OverloadedStrings, CPP, RankNTypes #-} diff --git a/Utility/WinLock.hs b/Utility/WinLock.hs index 7b7cf7132..369da6782 100644 --- a/Utility/WinLock.hs +++ b/Utility/WinLock.hs @@ -2,7 +2,7 @@ - - Copyright 2014 Joey Hess <joey@kitenet.net> - - - Licensed under the GNU GPL version 3 or higher. + - License: BSD-2-clause -} module Utility.WinLock ( diff --git a/Utility/WinProcess.hs b/Utility/WinProcess.hs index 7a566dcba..4621b4fa6 100644 --- a/Utility/WinProcess.hs +++ b/Utility/WinProcess.hs @@ -2,7 +2,7 @@ - - Copyright 2014 Joey Hess <joey@kitenet.net> - - - Licensed under the GNU GPL version 3 or higher. + - License: BSD-2-clause -} {-# LANGUAGE ForeignFunctionInterface #-} diff --git a/Utility/libdiskfree.c b/Utility/libdiskfree.c index 8c9ab6145..b531435df 100644 --- a/Utility/libdiskfree.c +++ b/Utility/libdiskfree.c @@ -2,7 +2,7 @@ * * Copyright 2012, 2014 Joey Hess <joey@kitenet.net> * - * Licensed under the GNU GPL version 3 or higher. + * License: BSD-2-clause */ /* Include appropriate headers for the OS, and define what will be used to diff --git a/Utility/libkqueue.c b/Utility/libkqueue.c index a87f65102..8e33d2885 100644 --- a/Utility/libkqueue.c +++ b/Utility/libkqueue.c @@ -2,7 +2,7 @@ * * Copyright 2012 Joey Hess <joey@kitenet.net> * - * Licensed under the GNU GPL version 3 or higher. + * License: BSD-2-clause */ #include <stdio.h> diff --git a/debian/copyright b/debian/copyright index a1b79a49d..273be44d8 100644 --- a/debian/copyright +++ b/debian/copyright @@ -12,7 +12,15 @@ License: AGPL-3+ Files: Utility/ThreadScheduler.hs Copyright: 2011 Bas van Dijk & Roel van Dijk - 2012 Joey Hess <joey@kitenet.net> + 2012, 2013 Joey Hess <joey@kitenet.net> +License: BSD-2-clause + +Files: Utility/* +Copyright: 2012-2014 Joey Hess <joey@kitenet.net> +License: BSD-2-clause + +Files: Utility/Gpg.hs Utility/DirWatcher* +Copyright: © 2010-2014 Joey Hess <joey@kitenet.net> License: GPL-3+ Files: doc/logo* */favicon.ico standalone/osx/git-annex.app/Contents/Resources/git-annex.icns standalone/android/icons/* @@ -122,6 +130,28 @@ License: LGPL-2.1+ in this package's source, or in /usr/share/common-licenses/LGPL-2.1 on Debian systems. +License: BSD-2-clause + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions + are met: + 1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + . + THIS SOFTWARE IS PROVIDED BY AUTHORS AND CONTRIBUTORS ``AS IS'' AND + ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE LIABLE + FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + SUCH DAMAGE. + License: AGPL-3+ GNU AFFERO GENERAL PUBLIC LICENSE Version 3, 19 November 2007 |