From 91296f177577fbcf106ead4f5d1b0f3b801745f3 Mon Sep 17 00:00:00 2001
From: Ryan Tucker <rtucker@gmail.com>
Date: Sun, 2 Oct 2011 11:36:20 -0400
Subject: [PATCH] Clarifying license stuff.

---
 BackupPC_archiveHost_s3 | 20 ++++++++++++++++++++
 COPYRIGHT               |  6 ++++++
 backup-manager.py       | 22 +++++++++++++++++++++-
 3 files changed, 47 insertions(+), 1 deletion(-)

diff --git a/BackupPC_archiveHost_s3 b/BackupPC_archiveHost_s3
index 3b79901..3c65e02 100755
--- a/BackupPC_archiveHost_s3
+++ b/BackupPC_archiveHost_s3
@@ -11,6 +11,26 @@
 # accesskey = 'amazon aws access key'
 # sharedkey = 'amazon aws shared key'
 # gpgsymmetrickey = 'gpg symmetric key -- make it good, but do not lose it'
+#
+# Copyright (c) 2009-2011 Ryan S. Tucker
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
 
 import glob
 import hashlib
diff --git a/COPYRIGHT b/COPYRIGHT
index 29a90c6..69392cc 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,3 +1,9 @@
+Portions of this package are derived from BackupPC source, and are
+under its license (GNU GPL v2).  See source file headers for more
+information.
+
+For the remainder,
+
 Copyright (c) 2009-2011 Ryan S. Tucker
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
diff --git a/backup-manager.py b/backup-manager.py
index e0a1a55..274ac27 100755
--- a/backup-manager.py
+++ b/backup-manager.py
@@ -1,6 +1,26 @@
 #!/usr/bin/python -W ignore::DeprecationWarning
-
+#
 # Script to manage S3-stored backups
+#
+# Copyright (c) 2009-2011 Ryan S. Tucker
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
 
 import optparse
 import os