From 3c8f3b98de78d3af85b2ea3542df2eb3fdac4c6a Mon Sep 17 00:00:00 2001 From: Lars Wirzenius Date: Sun, 13 Apr 2014 16:39:38 +0100 Subject: More copyright nitpick fixes --- README | 2 +- _obnammodule.c | 2 +- check | 2 +- crash-test | 2 +- create-reference-repo | 2 +- find-all-obnam-errors | 18 ++++++++++++++++++ lock-and-increment | 2 +- manual/Makefile | 18 ++++++++++++++++++ manual/format-de-html | 17 +++++++++++++++++ manual/format-de-pdf | 17 +++++++++++++++++ manual/format-html | 16 ++++++++++++++++ manual/format-pdf | 16 ++++++++++++++++ meliae-show | 16 ++++++++++++++++ metadata-speed | 2 +- mkfunnyfarm | 2 +- mksparse | 2 +- obnam | 2 +- obnam-viewprof | 2 +- obnam-viewprof.1 | 2 +- obnam.1.in | 2 +- obnamlib/__init__.py | 2 +- obnamlib/app.py | 2 +- obnamlib/encryption.py | 2 +- obnamlib/encryption_tests.py | 2 +- obnamlib/fmt_6/__init__.py | 18 ++++++++++++++++++ obnamlib/fmt_6/checksumtree.py | 2 +- obnamlib/fmt_6/checksumtree_tests.py | 2 +- obnamlib/fmt_6/chunklist.py | 2 +- obnamlib/fmt_6/chunklist_tests.py | 2 +- obnamlib/fmt_6/clientlist.py | 2 +- obnamlib/fmt_6/clientlist_tests.py | 2 +- obnamlib/fmt_6/clientmetadatatree.py | 2 +- obnamlib/fmt_6/clientmetadatatree_tests.py | 2 +- obnamlib/fmt_6/repo_fmt_6.py | 2 +- obnamlib/fmt_6/repo_fmt_6_tests.py | 2 +- obnamlib/fmt_6/repo_tree.py | 2 +- obnamlib/forget_policy.py | 2 +- obnamlib/forget_policy_tests.py | 2 +- obnamlib/pluginbase_tests.py | 2 +- setup.py | 7 +++++++ 40 files changed, 174 insertions(+), 31 deletions(-) diff --git a/README b/README index 11be4c31..9bf17518 100644 --- a/README +++ b/README @@ -149,7 +149,7 @@ so that can change.) This entire work is covered by the GNU General Public License, version 3 or later. -> Copyright 2010-2013 Lars Wirzenius +> Copyright 2010-2014 Lars Wirzenius > > 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/_obnammodule.c b/_obnammodule.c index 94dea0fc..0d281f67 100644 --- a/_obnammodule.c +++ b/_obnammodule.c @@ -1,7 +1,7 @@ /* * _obnammodule.c -- Python extensions for Obna * - * Copyright (C) 2008, 2009 Lars Wirzenius + * Copyright (C) 2008-2014 Lars Wirzenius * * 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/check b/check index ba21fd55..708ac0f8 100755 --- a/check +++ b/check @@ -1,5 +1,5 @@ #!/bin/sh -# Copyright 2011 Lars Wirzenius +# Copyright 2011-2014 Lars Wirzenius # # 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/crash-test b/crash-test index 85ad6c6f..119752a2 100755 --- a/crash-test +++ b/crash-test @@ -1,5 +1,5 @@ #!/bin/sh -# Copyright 2012 Lars Wirzenius +# Copyright 2012-2014 Lars Wirzenius # # 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/create-reference-repo b/create-reference-repo index 7e3d6165..af93b376 100755 --- a/create-reference-repo +++ b/create-reference-repo @@ -1,5 +1,5 @@ #!/usr/bin/env python -# Copyright 2013 Lars Wirzenius +# Copyright 2013-2014 Lars Wirzenius # # 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/find-all-obnam-errors b/find-all-obnam-errors index 375a4311..59bf8177 100644 --- a/find-all-obnam-errors +++ b/find-all-obnam-errors @@ -1,3 +1,21 @@ +# Copyright 2014 Lars Wirzenius +# +# 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 +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# 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, see . +# +# =*= License: GPL-3+ =*= + + import collections import inspect diff --git a/lock-and-increment b/lock-and-increment index ba2bf9e9..1e27f06d 100755 --- a/lock-and-increment +++ b/lock-and-increment @@ -1,5 +1,5 @@ #!/usr/bin/env python -# Copyright 2012 Lars Wirzenius +# Copyright 2012-2014 Lars Wirzenius # # 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/manual/Makefile b/manual/Makefile index b5acca1d..0a0008b2 100644 --- a/manual/Makefile +++ b/manual/Makefile @@ -1,3 +1,21 @@ +# Copyright 2014 Lars Wirzenius +# +# 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 +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# 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, see . +# +# =*= License: GPL-3+ =*= + + TITLE_EN = Backups with Obnam TITLE_DE = Backups mit Obnam TRANS_DE = Übersetzung: Jan Niggemann (jn@hz6.de) diff --git a/manual/format-de-html b/manual/format-de-html index 4e3fb394..5411942c 100755 --- a/manual/format-de-html +++ b/manual/format-de-html @@ -1,4 +1,21 @@ #!/bin/sh +# Copyright 2014 Lars Wirzenius +# Copyright 2014 Jan Niggemann +# +# 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 +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# 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, see . +# +# =*= License: GPL-3+ =*= set -eu diff --git a/manual/format-de-pdf b/manual/format-de-pdf index d4c1fa39..2d0316d9 100755 --- a/manual/format-de-pdf +++ b/manual/format-de-pdf @@ -1,4 +1,21 @@ #!/bin/sh +# Copyright 2014 Lars Wirzenius +# Copyright 2014 Jan Niggemann +# +# 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 +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# 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, see . +# +# =*= License: GPL-3+ =*= set -eu diff --git a/manual/format-html b/manual/format-html index 836ad990..14bc3750 100755 --- a/manual/format-html +++ b/manual/format-html @@ -1,4 +1,20 @@ #!/bin/sh +# Copyright 2014 Lars Wirzenius +# +# 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 +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# 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, see . +# +# =*= License: GPL-3+ =*= set -eu diff --git a/manual/format-pdf b/manual/format-pdf index 17305404..bba45c6e 100755 --- a/manual/format-pdf +++ b/manual/format-pdf @@ -1,4 +1,20 @@ #!/bin/sh +# Copyright 2014 Lars Wirzenius +# +# 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 +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# 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, see . +# +# =*= License: GPL-3+ =*= set -eu diff --git a/meliae-show b/meliae-show index 7dc98a17..4d29aadd 100755 --- a/meliae-show +++ b/meliae-show @@ -1,4 +1,20 @@ #!/usr/bin/env python +# Copyright 2014 Lars Wirzenius +# +# 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 +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# 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, see . +# +# =*= License: GPL-3+ =*= from meliae import loader diff --git a/metadata-speed b/metadata-speed index f152614b..c821bf46 100755 --- a/metadata-speed +++ b/metadata-speed @@ -1,5 +1,5 @@ #!/usr/bin/env python -# Copyright 2010 Lars Wirzenius +# Copyright 2010-2014 Lars Wirzenius # # 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/mkfunnyfarm b/mkfunnyfarm index 4508a9d3..99c111e2 100755 --- a/mkfunnyfarm +++ b/mkfunnyfarm @@ -1,5 +1,5 @@ #!/usr/bin/env python -# Copyright 2013 Lars Wirzenius +# Copyright 2013-2014 Lars Wirzenius # # 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/mksparse b/mksparse index f56dd856..126b27d1 100755 --- a/mksparse +++ b/mksparse @@ -1,5 +1,5 @@ #!/usr/bin/env python -# Copyright 2013 Lars Wirzenius +# Copyright 2013-2014 Lars Wirzenius # # 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/obnam b/obnam index 282e31ba..83367b64 100755 --- a/obnam +++ b/obnam @@ -1,5 +1,5 @@ #!/usr/bin/env python -# Copyright (C) 2009 Lars Wirzenius +# Copyright (C) 2009-2014 Lars Wirzenius # # 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/obnam-viewprof b/obnam-viewprof index a98e258f..cf532d76 100755 --- a/obnam-viewprof +++ b/obnam-viewprof @@ -1,5 +1,5 @@ #!/usr/bin/env python -# Copyright 2010 Lars Wirzenius +# Copyright 2010-2014 Lars Wirzenius # # 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/obnam-viewprof.1 b/obnam-viewprof.1 index d94807f9..3cf0c54d 100644 --- a/obnam-viewprof.1 +++ b/obnam-viewprof.1 @@ -1,4 +1,4 @@ -.\" Copyright 2012 Lars Wirzenius +.\" Copyright 2012-2014 Lars Wirzenius .\" .\" 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/obnam.1.in b/obnam.1.in index 3ca77096..3b2ed386 100644 --- a/obnam.1.in +++ b/obnam.1.in @@ -1,4 +1,4 @@ -.\" Copyright 2010-2013 Lars Wirzenius +.\" Copyright 2010-2014 Lars Wirzenius .\" .\" 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/obnamlib/__init__.py b/obnamlib/__init__.py index 0671cd24..2298d2e9 100644 --- a/obnamlib/__init__.py +++ b/obnamlib/__init__.py @@ -1,4 +1,4 @@ -# Copyright (C) 2009-2011 Lars Wirzenius +# Copyright (C) 2009-2014 Lars Wirzenius # # 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/obnamlib/app.py b/obnamlib/app.py index f8232941..65e936be 100644 --- a/obnamlib/app.py +++ b/obnamlib/app.py @@ -1,4 +1,4 @@ -# Copyright (C) 2009, 2011 Lars Wirzenius +# Copyright (C) 2009-2014 Lars Wirzenius # # 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/obnamlib/encryption.py b/obnamlib/encryption.py index 527c71af..775e008a 100644 --- a/obnamlib/encryption.py +++ b/obnamlib/encryption.py @@ -1,4 +1,4 @@ -# Copyright 2011 Lars Wirzenius +# Copyright 2011-2014 Lars Wirzenius # # 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/obnamlib/encryption_tests.py b/obnamlib/encryption_tests.py index ba412d75..0cf58394 100644 --- a/obnamlib/encryption_tests.py +++ b/obnamlib/encryption_tests.py @@ -1,4 +1,4 @@ -# Copyright 2011 Lars Wirzenius +# Copyright 2011-2014 Lars Wirzenius # # 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/obnamlib/fmt_6/__init__.py b/obnamlib/fmt_6/__init__.py index bfad0228..7f18e5bc 100644 --- a/obnamlib/fmt_6/__init__.py +++ b/obnamlib/fmt_6/__init__.py @@ -1 +1,19 @@ +# Copyright 2014 Lars Wirzenius +# +# 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 +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# 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, see . +# +# =*= License: GPL-3+ =*= + + import metadata_codec diff --git a/obnamlib/fmt_6/checksumtree.py b/obnamlib/fmt_6/checksumtree.py index 3fdc0ac5..e89f7dc1 100644 --- a/obnamlib/fmt_6/checksumtree.py +++ b/obnamlib/fmt_6/checksumtree.py @@ -1,4 +1,4 @@ -# Copyright 2010 Lars Wirzenius +# Copyright 2010-2014 Lars Wirzenius # # 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/obnamlib/fmt_6/checksumtree_tests.py b/obnamlib/fmt_6/checksumtree_tests.py index 01736ea7..95e0e4bd 100644 --- a/obnamlib/fmt_6/checksumtree_tests.py +++ b/obnamlib/fmt_6/checksumtree_tests.py @@ -1,4 +1,4 @@ -# Copyright 2010 Lars Wirzenius +# Copyright 2010-2014 Lars Wirzenius # # 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/obnamlib/fmt_6/chunklist.py b/obnamlib/fmt_6/chunklist.py index 5e1daf77..f648d5bb 100644 --- a/obnamlib/fmt_6/chunklist.py +++ b/obnamlib/fmt_6/chunklist.py @@ -1,4 +1,4 @@ -# Copyright 2010 Lars Wirzenius +# Copyright 2010-2014 Lars Wirzenius # # 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/obnamlib/fmt_6/chunklist_tests.py b/obnamlib/fmt_6/chunklist_tests.py index 99cb72e7..1f83ddc8 100644 --- a/obnamlib/fmt_6/chunklist_tests.py +++ b/obnamlib/fmt_6/chunklist_tests.py @@ -1,4 +1,4 @@ -# Copyright 2010 Lars Wirzenius +# Copyright 2010-2014 Lars Wirzenius # # 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/obnamlib/fmt_6/clientlist.py b/obnamlib/fmt_6/clientlist.py index 69ff1708..d4ba87a1 100644 --- a/obnamlib/fmt_6/clientlist.py +++ b/obnamlib/fmt_6/clientlist.py @@ -1,4 +1,4 @@ -# Copyright 2010 Lars Wirzenius +# Copyright 2010-2014 Lars Wirzenius # # 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/obnamlib/fmt_6/clientlist_tests.py b/obnamlib/fmt_6/clientlist_tests.py index ff1d1e04..9e14f290 100644 --- a/obnamlib/fmt_6/clientlist_tests.py +++ b/obnamlib/fmt_6/clientlist_tests.py @@ -1,4 +1,4 @@ -# Copyright 2010 Lars Wirzenius +# Copyright 2010-2014 Lars Wirzenius # # 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/obnamlib/fmt_6/clientmetadatatree.py b/obnamlib/fmt_6/clientmetadatatree.py index 375ec8f0..dbc8288a 100644 --- a/obnamlib/fmt_6/clientmetadatatree.py +++ b/obnamlib/fmt_6/clientmetadatatree.py @@ -1,4 +1,4 @@ -# Copyright 2010 Lars Wirzenius +# Copyright 2010-2014 Lars Wirzenius # # 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/obnamlib/fmt_6/clientmetadatatree_tests.py b/obnamlib/fmt_6/clientmetadatatree_tests.py index 4fc67a90..60e75c89 100644 --- a/obnamlib/fmt_6/clientmetadatatree_tests.py +++ b/obnamlib/fmt_6/clientmetadatatree_tests.py @@ -1,4 +1,4 @@ -# Copyright 2010 Lars Wirzenius +# Copyright 2010-2014 Lars Wirzenius # # 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/obnamlib/fmt_6/repo_fmt_6.py b/obnamlib/fmt_6/repo_fmt_6.py index 39050aa6..85a86461 100644 --- a/obnamlib/fmt_6/repo_fmt_6.py +++ b/obnamlib/fmt_6/repo_fmt_6.py @@ -1,4 +1,4 @@ -# Copyright (C) 2009-2013 Lars Wirzenius +# Copyright (C) 2009-2014 Lars Wirzenius # # 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/obnamlib/fmt_6/repo_fmt_6_tests.py b/obnamlib/fmt_6/repo_fmt_6_tests.py index 74146c31..b333280e 100644 --- a/obnamlib/fmt_6/repo_fmt_6_tests.py +++ b/obnamlib/fmt_6/repo_fmt_6_tests.py @@ -1,4 +1,4 @@ -# Copyright (C) 2013 Lars Wirzenius +# Copyright (C) 2013-2014 Lars Wirzenius # # 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/obnamlib/fmt_6/repo_tree.py b/obnamlib/fmt_6/repo_tree.py index a538ee7b..64302f5a 100644 --- a/obnamlib/fmt_6/repo_tree.py +++ b/obnamlib/fmt_6/repo_tree.py @@ -1,4 +1,4 @@ -# Copyright 2010 Lars Wirzenius +# Copyright 2010-2014 Lars Wirzenius # # 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/obnamlib/forget_policy.py b/obnamlib/forget_policy.py index 482a49c0..3c61939f 100644 --- a/obnamlib/forget_policy.py +++ b/obnamlib/forget_policy.py @@ -1,4 +1,4 @@ -# Copyright (C) 2010 Lars Wirzenius +# Copyright (C) 2010-2014 Lars Wirzenius # # 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/obnamlib/forget_policy_tests.py b/obnamlib/forget_policy_tests.py index 24eb0134..0e450a93 100644 --- a/obnamlib/forget_policy_tests.py +++ b/obnamlib/forget_policy_tests.py @@ -1,4 +1,4 @@ -# Copyright (C) 2010 Lars Wirzenius +# Copyright (C) 2010-2014 Lars Wirzenius # # 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/obnamlib/pluginbase_tests.py b/obnamlib/pluginbase_tests.py index 7e99a053..2b23769f 100644 --- a/obnamlib/pluginbase_tests.py +++ b/obnamlib/pluginbase_tests.py @@ -1,4 +1,4 @@ -# Copyright (C) 2009 Lars Wirzenius +# Copyright (C) 2009-2014 Lars Wirzenius # # 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/setup.py b/setup.py index 018ed464..73545492 100644 --- a/setup.py +++ b/setup.py @@ -218,8 +218,15 @@ class Check(Command): r'\.yarn$', r'\.mdwn$', r'\.css$', + r'\.conf$', r'^without-tests$', r'^test-plugins/.*\.py$', + r'^debian/', + r'^README\.', + r'^NEWS$', + r'^COPYING$', + r'^CC-BY-SA-4\.0\.txt$', + r'^\.gitignore$', ] pats = [re.compile(x) for x in exclude] -- cgit v1.2.1