diff options
| author | Ben Brown <ben.brown@codethink.co.uk> | 2020-07-15 15:58:54 +0000 |
|---|---|---|
| committer | Ben Brown <ben.brown@codethink.co.uk> | 2020-07-15 15:58:54 +0000 |
| commit | 03ae8a519f7d2af7907d7c725c0fdaebce827d19 (patch) | |
| tree | 483fed2d654fd179e42b35e267e32da49c89db3e | |
| parent | a90b02e5e0fbfac1215c4839875552d43cf245fc (diff) | |
| parent | 05f50af6b44ec365bfa59024426c38ba5093883e (diff) | |
| download | lorry-03ae8a519f7d2af7907d7c725c0fdaebce827d19.tar.gz | |
Merge branch 'bwh/fix-copyright-notices' into 'master'
Fix copyright notices
See merge request CodethinkLabs/lorry/lorry!10
36 files changed, 44 insertions, 47 deletions
@@ -1,4 +1,5 @@ -Copyright (C) 2013-2020 Codethink Limited +Copyright 2005-2015 Linus Torvalds and others +Copyright (C) 2011-2020 Codethink Limited This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -12,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. @@ -2,7 +2,7 @@ # # Run test suite for lorry. # -# Copyright (C) 2013 Codethink Limited +# Copyright (C) 2012 Codethink Limited # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# Copyright (C) 2013-2020 Codethink Limited +# Copyright (C) 2011-2020 Codethink Limited # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -1,4 +1,4 @@ -.\" Copyright (C) 2013 Codethink Limited +.\" Copyright (C) 2011 Codethink Limited .\" .\" This program is free software; you can redistribute it and/or modify .\" it under the terms of the GNU General Public License as published by diff --git a/lorry.gzip-importer b/lorry.gzip-importer index d3d78b4..5c0c6d0 100755 --- a/lorry.gzip-importer +++ b/lorry.gzip-importer @@ -1,5 +1,7 @@ #!/usr/bin/env python3 +## Copyright 2015, 2019-2020 Codethink Limited + # gzip archive frontend for git-fast-import from gzip import GzipFile diff --git a/lorry.tar-importer b/lorry.tar-importer index 2a7c746..e25db99 100755 --- a/lorry.tar-importer +++ b/lorry.tar-importer @@ -1,7 +1,9 @@ #!/usr/bin/perl -## Note: Modified for Baserock lorry. - +## Copyright 2005-2012 Linus Torvalds and others +## Copyright 2012, 2015, 2018 Codethink Limited +## +## 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 dfb73eb..5e035ce 100755 --- a/lorry.zip-importer +++ b/lorry.zip-importer @@ -1,6 +1,9 @@ #!/usr/bin/env python3 -## Note: Modified for Baserock lorry. +## Copyright 2005-2015 Linus Torvalds and others +## Copyright 2015, 2019, 2020 Codethink Limited +## +## Based on git's contrib/fast-import/import-zips.py; modified for Lorry. ## zip archive frontend for git-fast-import ## @@ -1,4 +1,4 @@ -# Copyright (C) 2013 Codethink Limited +# Copyright (C) 2012-2015, 2019 Codethink Limited # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/bzr-single-commit.script b/tests/bzr-single-commit.script index 7de3d0a..9b38552 100755 --- a/tests/bzr-single-commit.script +++ b/tests/bzr-single-commit.script @@ -2,7 +2,7 @@ # # Tests converting a simple bzr repository to git. # -# Copyright (C) 2013 Codethink Limited +# Copyright (C) 2012 Codethink Limited # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/bzr-single-commit.setup b/tests/bzr-single-commit.setup index 0c28df2..a2d8d79 100755 --- a/tests/bzr-single-commit.setup +++ b/tests/bzr-single-commit.setup @@ -2,7 +2,7 @@ # # Creates a bzr repository with a single file and a single commit. # -# Copyright (C) 2013 Codethink Limited +# Copyright (C) 2011-2012, 2020 Codethink Limited # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/cvs-single-commit.script b/tests/cvs-single-commit.script index 56dd280..4ce2587 100755 --- a/tests/cvs-single-commit.script +++ b/tests/cvs-single-commit.script @@ -2,7 +2,7 @@ # # Tests converting a simple CVS repository to git. # -# Copyright (C) 2013 Codethink Limited +# Copyright (C) 2012 Codethink Limited # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/cvs-single-commit.setup b/tests/cvs-single-commit.setup index 0fb4d3a..537de81 100755 --- a/tests/cvs-single-commit.setup +++ b/tests/cvs-single-commit.setup @@ -2,7 +2,7 @@ # # Creates a CVS repository with a single file and a single commit. # -# Copyright (C) 2013 Codethink Limited +# Copyright (C) 2012 Codethink Limited # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/extended-headers-ignored.script b/tests/extended-headers-ignored.script index ecc8ef2..6f49ae4 100755 --- a/tests/extended-headers-ignored.script +++ b/tests/extended-headers-ignored.script @@ -9,7 +9,7 @@ # See http://www.gnu.org/software/tar/manual/html_node/Standard.html # for more details # -# Copyright © 2015 Codethink Limited +# Copyright © 2012, 2015 Codethink Limited # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/extended-headers-ignored.setup b/tests/extended-headers-ignored.setup index e8162ff..5cab83c 100755 --- a/tests/extended-headers-ignored.setup +++ b/tests/extended-headers-ignored.setup @@ -2,7 +2,7 @@ # # Creates a git repo from a bsd tarball we made earlier # -# Copyright © 2015 Codethink Limited +# Copyright © 2012, 2015 Codethink Limited # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/git-backup-on-error-multiple-backups.script b/tests/git-backup-on-error-multiple-backups.script index af67879..a7e5148 100755 --- a/tests/git-backup-on-error-multiple-backups.script +++ b/tests/git-backup-on-error-multiple-backups.script @@ -2,7 +2,7 @@ # # Tests when a git mirror fails that it keeps the backups around # -# Copyright (C) 2013 Codethink Limited +# Copyright (C) 2012-2013 Codethink Limited # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/git-backup-on-error-multiple-backups.setup b/tests/git-backup-on-error-multiple-backups.setup index 692223a..9e46306 100755 --- a/tests/git-backup-on-error-multiple-backups.setup +++ b/tests/git-backup-on-error-multiple-backups.setup @@ -2,7 +2,7 @@ # # Creates a git repository with a single file and a single commit. # -# Copyright (C) 2013 Codethink Limited +# Copyright (C) 2012-2013 Codethink Limited # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/git-backup-on-error-multiple-backups.teardown b/tests/git-backup-on-error-multiple-backups.teardown index 7627f88..8b5bef3 100755 --- a/tests/git-backup-on-error-multiple-backups.teardown +++ b/tests/git-backup-on-error-multiple-backups.teardown @@ -2,7 +2,7 @@ # # Tests when a git mirror fails that it keeps the backups around # -# Copyright (C) 2013 Codethink Limited +# Copyright (C) 2012-2013 Codethink Limited # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/git-backup-on-error-single-backup-is-removed-if-exists.script b/tests/git-backup-on-error-single-backup-is-removed-if-exists.script index 61e1535..1c53e67 100755 --- a/tests/git-backup-on-error-single-backup-is-removed-if-exists.script +++ b/tests/git-backup-on-error-single-backup-is-removed-if-exists.script @@ -2,7 +2,7 @@ # # Tests when a git mirror fails that it keeps the backups around # -# Copyright (C) 2013 Codethink Limited +# Copyright (C) 2012-2013 Codethink Limited # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/git-backup-on-error-single-backup-is-removed-if-exists.setup b/tests/git-backup-on-error-single-backup-is-removed-if-exists.setup index fa312c3..30bd6b2 100755 --- a/tests/git-backup-on-error-single-backup-is-removed-if-exists.setup +++ b/tests/git-backup-on-error-single-backup-is-removed-if-exists.setup @@ -2,7 +2,7 @@ # # Creates a git repository with a single file and a single commit. # -# Copyright (C) 2013 Codethink Limited +# Copyright (C) 2012-2013 Codethink Limited # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/git-backup-on-error-single-backup-is-removed-if-exists.teardown b/tests/git-backup-on-error-single-backup-is-removed-if-exists.teardown index 7627f88..8b5bef3 100755 --- a/tests/git-backup-on-error-single-backup-is-removed-if-exists.teardown +++ b/tests/git-backup-on-error-single-backup-is-removed-if-exists.teardown @@ -2,7 +2,7 @@ # # Tests when a git mirror fails that it keeps the backups around # -# Copyright (C) 2013 Codethink Limited +# Copyright (C) 2012-2013 Codethink Limited # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/git-backup-on-error-single-backup.script b/tests/git-backup-on-error-single-backup.script index 40ec12a..b69f612 100755 --- a/tests/git-backup-on-error-single-backup.script +++ b/tests/git-backup-on-error-single-backup.script @@ -2,7 +2,7 @@ # # Tests when a git mirror fails that it keeps the backups around # -# Copyright (C) 2013 Codethink Limited +# Copyright (C) 2012-2013, 2020 Codethink Limited # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/git-backup-on-error-single-backup.setup b/tests/git-backup-on-error-single-backup.setup index fa312c3..30bd6b2 100755 --- a/tests/git-backup-on-error-single-backup.setup +++ b/tests/git-backup-on-error-single-backup.setup @@ -2,7 +2,7 @@ # # Creates a git repository with a single file and a single commit. # -# Copyright (C) 2013 Codethink Limited +# Copyright (C) 2012-2013 Codethink Limited # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/git-backup-on-error-single-backup.teardown b/tests/git-backup-on-error-single-backup.teardown index 7627f88..8b5bef3 100755 --- a/tests/git-backup-on-error-single-backup.teardown +++ b/tests/git-backup-on-error-single-backup.teardown @@ -2,7 +2,7 @@ # # Tests when a git mirror fails that it keeps the backups around # -# Copyright (C) 2013 Codethink Limited +# Copyright (C) 2012-2013 Codethink Limited # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/git-single-commit.script b/tests/git-single-commit.script index 87a66a7..7a980b2 100755 --- a/tests/git-single-commit.script +++ b/tests/git-single-commit.script @@ -2,7 +2,7 @@ # # Tests converting a simple git repository to git. # -# Copyright (C) 2013 Codethink Limited +# Copyright (C) 2012 Codethink Limited # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/git-single-commit.setup b/tests/git-single-commit.setup index e2bb255..f93884d 100755 --- a/tests/git-single-commit.setup +++ b/tests/git-single-commit.setup @@ -2,7 +2,7 @@ # # Creates a git repository with a single file and a single commit. # -# Copyright (C) 2013 Codethink Limited +# Copyright (C) 2012 Codethink Limited # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/hg-single-commit.script b/tests/hg-single-commit.script index 1ce3919..e9814b9 100755 --- a/tests/hg-single-commit.script +++ b/tests/hg-single-commit.script @@ -2,7 +2,7 @@ # # Tests converting a simple hg repository to hg. # -# Copyright (C) 2013 Codethink Limited +# Copyright (C) 2012 Codethink Limited # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/hg-single-commit.setup b/tests/hg-single-commit.setup index eb8ce7f..a50284f 100755 --- a/tests/hg-single-commit.setup +++ b/tests/hg-single-commit.setup @@ -2,7 +2,7 @@ # # Creates a hg repository with a single file and a single commit. # -# Copyright (C) 2013 Codethink Limited +# Copyright (C) 2012 Codethink Limited # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/make-tarball.script b/tests/make-tarball.script index 3c462ae..2576447 100755 --- a/tests/make-tarball.script +++ b/tests/make-tarball.script @@ -2,7 +2,7 @@ # # Test that we can create a tarball of the git trees. # -# Copyright (C) 2013 Codethink Limited +# Copyright (C) 2012 Codethink Limited # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/make-tarball.setup b/tests/make-tarball.setup index 4da691d..3c0f466 100755 --- a/tests/make-tarball.setup +++ b/tests/make-tarball.setup @@ -2,7 +2,7 @@ # # Creates gzip/bzip2/lzma tarballs, each with a single file. # -# Copyright (C) 2013 Codethink Limited +# Copyright (C) 2012, 2015 Codethink Limited # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/no-pushspec-pushall.script b/tests/no-pushspec-pushall.script index a1956ce..a649122 100755 --- a/tests/no-pushspec-pushall.script +++ b/tests/no-pushspec-pushall.script @@ -2,7 +2,7 @@ # # Tests that all refs are pushed if no push-refspecs are given # -# Copyright (C) 2013 Codethink Limited +# Copyright (C) 2012 Codethink Limited # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/pushspecs-only.script b/tests/pushspecs-only.script index 989a936..80aa8de 100755 --- a/tests/pushspecs-only.script +++ b/tests/pushspecs-only.script @@ -2,7 +2,7 @@ # # Tests that only the specified refs are pushed # -# Copyright (C) 2013 Codethink Limited +# Copyright (C) 2012 Codethink Limited # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/setup_once b/tests/setup_once index d2605ad..ec039b7 100755 --- a/tests/setup_once +++ b/tests/setup_once @@ -2,7 +2,7 @@ # # Create an upstream git repository with multiple branches and tags # -# Copyright (C) 2013 Codethink Limited +# Copyright (C) 2012 Codethink Limited # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/svn-single-commit.script b/tests/svn-single-commit.script index 89da06d..32a9cca 100755 --- a/tests/svn-single-commit.script +++ b/tests/svn-single-commit.script @@ -2,7 +2,7 @@ # # Tests converting a simple SVN repository to git. # -# Copyright (C) 2013 Codethink Limited +# Copyright (C) 2012 Codethink Limited # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/svn-single-commit.setup b/tests/svn-single-commit.setup index 00c1838..182f0e5 100755 --- a/tests/svn-single-commit.setup +++ b/tests/svn-single-commit.setup @@ -2,7 +2,7 @@ # # Creates an SVN repository with a single file and a single commit. # -# Copyright (C) 2013 Codethink Limited +# Copyright (C) 2012 Codethink Limited # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/tar-single-commit.script b/tests/tar-single-commit.script index 098a1a5..1562446 100755 --- a/tests/tar-single-commit.script +++ b/tests/tar-single-commit.script @@ -2,7 +2,7 @@ # # Tests converting tarballs into to git repositories. # -# Copyright (C) 2013 Codethink Limited +# Copyright (C) 2012 Codethink Limited # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/tar-single-commit.setup b/tests/tar-single-commit.setup index a68eb92..3338368 100755 --- a/tests/tar-single-commit.setup +++ b/tests/tar-single-commit.setup @@ -2,7 +2,7 @@ # # Creates gzip/bzip2/lzma tarballs, each with a single file. # -# Copyright (C) 2013 Codethink Limited +# Copyright (C) 2012, 2015 Codethink Limited # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by |