summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Hutchings <ben.hutchings@codethink.co.uk>2020-07-15 16:12:52 +0100
committerBen Hutchings <ben.hutchings@codethink.co.uk>2020-07-15 16:18:27 +0100
commitf89016a47f8ba7f9a3b5e359ed62a474c744b0d5 (patch)
tree318ca0f5a64d36501fe967c95d5809def8be921c
parentd474a2db1c90ec6bd593f5bdaff0b6ca8a7eecdb (diff)
downloadlorry-f89016a47f8ba7f9a3b5e359ed62a474c744b0d5.tar.gz
Move references to original git scripts from LICENSE to derived scripts
This seems like a more obvious to look for such information, and it's also where the GPL says we should mention changes.
-rw-r--r--LICENSE11
-rwxr-xr-xlorry.tar-importer3
-rwxr-xr-xlorry.zip-importer2
3 files changed, 2 insertions, 14 deletions
diff --git a/LICENSE b/LICENSE
index bdce0ea..36f598d 100644
--- a/LICENSE
+++ b/LICENSE
@@ -13,14 +13,3 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License along
with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-We carry 2 slightly modified git-fast-import frontends:
-
-lorry.tar-importer which is based on
-https://github.com/git/git/blob/master/contrib/fast-import/import-tars.perl
-
-and lorry.zip-importer, which is based on
-https://github.com/git/git/blob/master/contrib/fast-import/import-zips.py
-
-all parts of git are under a GPLv2 compatible license,
-see the git source code for more details.
diff --git a/lorry.tar-importer b/lorry.tar-importer
index 581ecc1..e25db99 100755
--- a/lorry.tar-importer
+++ b/lorry.tar-importer
@@ -3,8 +3,7 @@
## Copyright 2005-2012 Linus Torvalds and others
## Copyright 2012, 2015, 2018 Codethink Limited
##
-## Note: Modified for Baserock lorry.
-
+## Based on git's contrib/fast-import/import-tars.perl; modified for Lorry.
## tar archive frontend for git-fast-import
##
diff --git a/lorry.zip-importer b/lorry.zip-importer
index da0b34f..5e035ce 100755
--- a/lorry.zip-importer
+++ b/lorry.zip-importer
@@ -3,7 +3,7 @@
## Copyright 2005-2015 Linus Torvalds and others
## Copyright 2015, 2019, 2020 Codethink Limited
##
-## Note: Modified for Baserock lorry.
+## Based on git's contrib/fast-import/import-zips.py; modified for Lorry.
## zip archive frontend for git-fast-import
##