From 82c6caef85aa66648afc7435bf1b01cc5a937401 Mon Sep 17 00:00:00 2001 From: Jakob Borg Date: Sun, 16 Nov 2014 21:13:20 +0100 Subject: [PATCH] Use more inclusive copyright header --- CONTRIBUTORS => AUTHORS | 3 +++ build.go | 2 +- check-contrib.sh | 4 ++-- cmd/genassets/main.go | 2 +- cmd/stevents/main.go | 2 +- cmd/stindex/main.go | 2 +- cmd/syncthing/debug.go | 2 +- cmd/syncthing/gui.go | 2 +- cmd/syncthing/gui_auth.go | 2 +- cmd/syncthing/gui_csrf.go | 2 +- cmd/syncthing/gui_solaris.go | 2 +- cmd/syncthing/gui_unix.go | 2 +- cmd/syncthing/gui_windows.go | 2 +- cmd/syncthing/heapprof.go | 2 +- cmd/syncthing/limitedreader.go | 2 +- cmd/syncthing/limitedwriter.go | 2 +- cmd/syncthing/main.go | 2 +- cmd/syncthing/main_test.go | 2 +- cmd/syncthing/memsize_darwin.go | 2 +- cmd/syncthing/memsize_linux.go | 2 +- cmd/syncthing/memsize_solaris.go | 2 +- cmd/syncthing/memsize_unimpl.go | 2 +- cmd/syncthing/memsize_windows.go | 2 +- cmd/syncthing/monitor.go | 2 +- cmd/syncthing/openurl_unix.go | 2 +- cmd/syncthing/openurl_windows.go | 2 +- cmd/syncthing/perfstats_unix.go | 2 +- cmd/syncthing/tls.go | 2 +- cmd/syncthing/usage.go | 2 +- cmd/syncthing/usage_report.go | 2 +- cmd/todos/main.go | 2 +- cmd/transifexdl/main.go | 2 +- cmd/translate/main.go | 2 +- gui/app.js | 2 +- gui/index.html | 2 +- gui/modal.html | 2 +- gui/overrides.css | 2 +- internal/auto/auto_test.go | 2 +- internal/auto/doc.go | 2 +- internal/beacon/beacon.go | 2 +- internal/beacon/broadcast.go | 2 +- internal/beacon/broadcast_test.go | 2 +- internal/beacon/debug.go | 2 +- internal/beacon/doc.go | 2 +- internal/beacon/multicast.go | 2 +- internal/config/config.go | 2 +- internal/config/config_test.go | 2 +- internal/config/wrapper.go | 2 +- internal/discover/debug.go | 2 +- internal/discover/discover.go | 2 +- internal/discover/discover_test.go | 2 +- internal/discover/doc.go | 2 +- internal/discover/packets.go | 2 +- internal/events/debug.go | 2 +- internal/events/events.go | 2 +- internal/events/events_test.go | 2 +- internal/files/blockmap.go | 2 +- internal/files/blockmap_test.go | 2 +- internal/files/concurrency_test.go | 15 +++++++++++++++ internal/files/debug.go | 2 +- internal/files/filenames_darwin.go | 2 +- internal/files/filenames_unix.go | 2 +- internal/files/filenames_windows.go | 2 +- internal/files/leveldb.go | 2 +- internal/files/leveldb_test.go | 2 +- internal/files/set.go | 2 +- internal/files/set_test.go | 2 +- internal/fnmatch/fnmatch.go | 2 +- internal/fnmatch/fnmatch_test.go | 2 +- internal/ignore/ignore.go | 2 +- internal/ignore/ignore_test.go | 2 +- internal/lamport/clock.go | 2 +- internal/lamport/clock_test.go | 2 +- internal/luhn/luhn.go | 2 +- internal/luhn/luhn_test.go | 2 +- internal/model/debug.go | 2 +- internal/model/deviceactivity.go | 2 +- internal/model/deviceactivity_test.go | 2 +- internal/model/doc.go | 2 +- internal/model/model.go | 2 +- internal/model/model_test.go | 2 +- internal/model/puller.go | 2 +- internal/model/puller_test.go | 2 +- internal/model/scanner.go | 2 +- internal/model/sharedpullerstate.go | 2 +- internal/model/sharedpullerstate_test.go | 2 +- internal/model/tempname.go | 2 +- internal/model/tempname_windows.go | 2 +- internal/model/util.go | 2 +- internal/osutil/hidden_unix.go | 2 +- internal/osutil/hidden_windows.go | 2 +- internal/osutil/osutil.go | 2 +- internal/osutil/osutil_test.go | 2 +- internal/osutil/replacingwriter.go | 2 +- internal/osutil/replacingwriter_test.go | 2 +- internal/protocol/common_test.go | 2 +- internal/protocol/counting.go | 2 +- internal/protocol/debug.go | 2 +- internal/protocol/deviceid.go | 2 +- internal/protocol/deviceid_test.go | 2 +- internal/protocol/doc.go | 2 +- internal/protocol/header.go | 2 +- internal/protocol/message.go | 2 +- internal/protocol/nativemodel_darwin.go | 2 +- internal/protocol/nativemodel_unix.go | 2 +- internal/protocol/nativemodel_windows.go | 2 +- internal/protocol/protocol.go | 2 +- internal/protocol/protocol_test.go | 2 +- internal/protocol/wireformat.go | 2 +- internal/scanner/blockqueue.go | 2 +- internal/scanner/blocks.go | 2 +- internal/scanner/blocks_test.go | 2 +- internal/scanner/debug.go | 2 +- internal/scanner/doc.go | 2 +- internal/scanner/walk.go | 2 +- internal/scanner/walk_test.go | 2 +- internal/stats/debug.go | 2 +- internal/stats/device.go | 2 +- internal/stats/leveldb.go | 2 +- internal/upgrade/debug.go | 2 +- internal/upgrade/upgrade_common.go | 2 +- internal/upgrade/upgrade_supported.go | 2 +- internal/upgrade/upgrade_test.go | 2 +- internal/upgrade/upgrade_unsupp.go | 2 +- internal/upgrade/upgrade_windows.go | 2 +- internal/upnp/debug.go | 2 +- internal/upnp/upnp.go | 2 +- internal/upnp/upnp_test.go | 2 +- internal/versioner/debug.go | 2 +- internal/versioner/simple.go | 2 +- internal/versioner/staggered.go | 10 +++++----- internal/versioner/versioner.go | 2 +- internal/versioner/versioner_test.go | 2 +- test/common_test.go | 2 +- test/genfiles.go | 2 +- test/http_test.go | 2 +- test/httpstress_test.go | 2 +- test/json.go | 2 +- test/manypeers_test.go | 2 +- test/md5r.go | 2 +- test/reconnect_test.go | 2 +- test/test-delupd.sh | 2 +- test/test-folders.sh | 2 +- test/test-merge.sh | 2 +- test/transfer-bench_test.go | 2 +- 145 files changed, 166 insertions(+), 148 deletions(-) rename CONTRIBUTORS => AUTHORS (91%) diff --git a/CONTRIBUTORS b/AUTHORS similarity index 91% rename from CONTRIBUTORS rename to AUTHORS index ef8a08d0f..1d3b94ff5 100644 --- a/CONTRIBUTORS +++ b/AUTHORS @@ -1,3 +1,5 @@ +# This is the official list of Syncthing authors for copyright purposes. + Aaron Bieber Alexander Graf Andrew Dunham @@ -12,6 +14,7 @@ Emil Hessman Felix Ableitner Felix Unterpaintner Gilli Sigurdsson +Jakob Borg James Patterson Jens Diemer Jochen Voss diff --git a/build.go b/build.go index 51ee5e4ea..6219bfe32 100644 --- a/build.go +++ b/build.go @@ -1,4 +1,4 @@ -// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file). +// Copyright (C) 2014 The Syncthing Authors. // // 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 diff --git a/check-contrib.sh b/check-contrib.sh index 853f15c54..4bab2f12b 100755 --- a/check-contrib.sh +++ b/check-contrib.sh @@ -1,8 +1,8 @@ #!/bin/bash missing-contribs() { - for email in $(git log --format=%ae master | grep -v jakob@nym.se | sort | uniq) ; do - grep -q "$email" CONTRIBUTORS || echo $email + for email in $(git log --format=%ae master | sort | uniq) ; do + grep -q "$email" AUTHORS || echo $email done } diff --git a/cmd/genassets/main.go b/cmd/genassets/main.go index 87a6cf471..71407c497 100644 --- a/cmd/genassets/main.go +++ b/cmd/genassets/main.go @@ -1,4 +1,4 @@ -// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file). +// Copyright (C) 2014 The Syncthing Authors. // // 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 diff --git a/cmd/stevents/main.go b/cmd/stevents/main.go index c20acbf56..ad76ccdc9 100644 --- a/cmd/stevents/main.go +++ b/cmd/stevents/main.go @@ -1,4 +1,4 @@ -// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file). +// Copyright (C) 2014 The Syncthing Authors. // // 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 diff --git a/cmd/stindex/main.go b/cmd/stindex/main.go index 56c99af9b..017150922 100644 --- a/cmd/stindex/main.go +++ b/cmd/stindex/main.go @@ -1,4 +1,4 @@ -// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file). +// Copyright (C) 2014 The Syncthing Authors. // // 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 diff --git a/cmd/syncthing/debug.go b/cmd/syncthing/debug.go index 61598ba51..d663d921e 100644 --- a/cmd/syncthing/debug.go +++ b/cmd/syncthing/debug.go @@ -1,4 +1,4 @@ -// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file). +// Copyright (C) 2014 The Syncthing Authors. // // 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 diff --git a/cmd/syncthing/gui.go b/cmd/syncthing/gui.go index c51e4487e..b324682d5 100644 --- a/cmd/syncthing/gui.go +++ b/cmd/syncthing/gui.go @@ -1,4 +1,4 @@ -// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file). +// Copyright (C) 2014 The Syncthing Authors. // // 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 diff --git a/cmd/syncthing/gui_auth.go b/cmd/syncthing/gui_auth.go index b380c3b33..410516799 100755 --- a/cmd/syncthing/gui_auth.go +++ b/cmd/syncthing/gui_auth.go @@ -1,4 +1,4 @@ -// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file). +// Copyright (C) 2014 The Syncthing Authors. // // 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 diff --git a/cmd/syncthing/gui_csrf.go b/cmd/syncthing/gui_csrf.go index 334f64629..7f32e705c 100644 --- a/cmd/syncthing/gui_csrf.go +++ b/cmd/syncthing/gui_csrf.go @@ -1,4 +1,4 @@ -// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file). +// Copyright (C) 2014 The Syncthing Authors. // // 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 diff --git a/cmd/syncthing/gui_solaris.go b/cmd/syncthing/gui_solaris.go index c65ea9ab1..4248283ed 100644 --- a/cmd/syncthing/gui_solaris.go +++ b/cmd/syncthing/gui_solaris.go @@ -1,4 +1,4 @@ -// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file). +// Copyright (C) 2014 The Syncthing Authors. // // 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 diff --git a/cmd/syncthing/gui_unix.go b/cmd/syncthing/gui_unix.go index d514d4c6b..aeb5847f2 100644 --- a/cmd/syncthing/gui_unix.go +++ b/cmd/syncthing/gui_unix.go @@ -1,4 +1,4 @@ -// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file). +// Copyright (C) 2014 The Syncthing Authors. // // 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 diff --git a/cmd/syncthing/gui_windows.go b/cmd/syncthing/gui_windows.go index 2d8c47c83..8f4e5cb13 100755 --- a/cmd/syncthing/gui_windows.go +++ b/cmd/syncthing/gui_windows.go @@ -1,4 +1,4 @@ -// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file). +// Copyright (C) 2014 The Syncthing Authors. // // 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 diff --git a/cmd/syncthing/heapprof.go b/cmd/syncthing/heapprof.go index 277b136d4..300951d16 100644 --- a/cmd/syncthing/heapprof.go +++ b/cmd/syncthing/heapprof.go @@ -1,4 +1,4 @@ -// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file). +// Copyright (C) 2014 The Syncthing Authors. // // 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 diff --git a/cmd/syncthing/limitedreader.go b/cmd/syncthing/limitedreader.go index fd80dae40..45b514ceb 100644 --- a/cmd/syncthing/limitedreader.go +++ b/cmd/syncthing/limitedreader.go @@ -1,4 +1,4 @@ -// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file). +// Copyright (C) 2014 The Syncthing Authors. // // 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 diff --git a/cmd/syncthing/limitedwriter.go b/cmd/syncthing/limitedwriter.go index d0ba5519b..ee2cde2fb 100644 --- a/cmd/syncthing/limitedwriter.go +++ b/cmd/syncthing/limitedwriter.go @@ -1,4 +1,4 @@ -// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file). +// Copyright (C) 2014 The Syncthing Authors. // // 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 diff --git a/cmd/syncthing/main.go b/cmd/syncthing/main.go index 6618a9b9e..5e15a77b7 100644 --- a/cmd/syncthing/main.go +++ b/cmd/syncthing/main.go @@ -1,4 +1,4 @@ -// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file). +// Copyright (C) 2014 The Syncthing Authors. // // 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 diff --git a/cmd/syncthing/main_test.go b/cmd/syncthing/main_test.go index b3df6da03..3d7a49ca5 100644 --- a/cmd/syncthing/main_test.go +++ b/cmd/syncthing/main_test.go @@ -1,4 +1,4 @@ -// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file). +// Copyright (C) 2014 The Syncthing Authors. // // 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 diff --git a/cmd/syncthing/memsize_darwin.go b/cmd/syncthing/memsize_darwin.go index f0389d870..f9978df9d 100644 --- a/cmd/syncthing/memsize_darwin.go +++ b/cmd/syncthing/memsize_darwin.go @@ -1,4 +1,4 @@ -// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file). +// Copyright (C) 2014 The Syncthing Authors. // // 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 diff --git a/cmd/syncthing/memsize_linux.go b/cmd/syncthing/memsize_linux.go index 70092cc7b..57023d11e 100644 --- a/cmd/syncthing/memsize_linux.go +++ b/cmd/syncthing/memsize_linux.go @@ -1,4 +1,4 @@ -// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file). +// Copyright (C) 2014 The Syncthing Authors. // // 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 diff --git a/cmd/syncthing/memsize_solaris.go b/cmd/syncthing/memsize_solaris.go index 1f494abab..19a24b1e6 100644 --- a/cmd/syncthing/memsize_solaris.go +++ b/cmd/syncthing/memsize_solaris.go @@ -1,4 +1,4 @@ -// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file). +// Copyright (C) 2014 The Syncthing Authors. // // 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 diff --git a/cmd/syncthing/memsize_unimpl.go b/cmd/syncthing/memsize_unimpl.go index 05b0c2d69..556c3c077 100644 --- a/cmd/syncthing/memsize_unimpl.go +++ b/cmd/syncthing/memsize_unimpl.go @@ -1,4 +1,4 @@ -// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file). +// Copyright (C) 2014 The Syncthing Authors. // // 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 diff --git a/cmd/syncthing/memsize_windows.go b/cmd/syncthing/memsize_windows.go index 2277bd7ff..4058e17a0 100644 --- a/cmd/syncthing/memsize_windows.go +++ b/cmd/syncthing/memsize_windows.go @@ -1,4 +1,4 @@ -// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file). +// Copyright (C) 2014 The Syncthing Authors. // // 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 diff --git a/cmd/syncthing/monitor.go b/cmd/syncthing/monitor.go index d48b4506b..7a443e52a 100644 --- a/cmd/syncthing/monitor.go +++ b/cmd/syncthing/monitor.go @@ -1,4 +1,4 @@ -// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file). +// Copyright (C) 2014 The Syncthing Authors. // // 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 diff --git a/cmd/syncthing/openurl_unix.go b/cmd/syncthing/openurl_unix.go index 8f178be79..2c5c26679 100644 --- a/cmd/syncthing/openurl_unix.go +++ b/cmd/syncthing/openurl_unix.go @@ -1,4 +1,4 @@ -// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file). +// Copyright (C) 2014 The Syncthing Authors. // // 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 diff --git a/cmd/syncthing/openurl_windows.go b/cmd/syncthing/openurl_windows.go index d2028fe1c..ba22f67cd 100644 --- a/cmd/syncthing/openurl_windows.go +++ b/cmd/syncthing/openurl_windows.go @@ -1,4 +1,4 @@ -// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file). +// Copyright (C) 2014 The Syncthing Authors. // // 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 diff --git a/cmd/syncthing/perfstats_unix.go b/cmd/syncthing/perfstats_unix.go index 808991b36..12c135b2d 100644 --- a/cmd/syncthing/perfstats_unix.go +++ b/cmd/syncthing/perfstats_unix.go @@ -1,4 +1,4 @@ -// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file). +// Copyright (C) 2014 The Syncthing Authors. // // 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 diff --git a/cmd/syncthing/tls.go b/cmd/syncthing/tls.go index d44cebab0..bd8bb126e 100644 --- a/cmd/syncthing/tls.go +++ b/cmd/syncthing/tls.go @@ -1,4 +1,4 @@ -// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file). +// Copyright (C) 2014 The Syncthing Authors. // // 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 diff --git a/cmd/syncthing/usage.go b/cmd/syncthing/usage.go index 6190e658e..c9916dae7 100644 --- a/cmd/syncthing/usage.go +++ b/cmd/syncthing/usage.go @@ -1,4 +1,4 @@ -// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file). +// Copyright (C) 2014 The Syncthing Authors. // // 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 diff --git a/cmd/syncthing/usage_report.go b/cmd/syncthing/usage_report.go index fbbda1816..63c302ea4 100644 --- a/cmd/syncthing/usage_report.go +++ b/cmd/syncthing/usage_report.go @@ -1,4 +1,4 @@ -// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file). +// Copyright (C) 2014 The Syncthing Authors. // // 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 diff --git a/cmd/todos/main.go b/cmd/todos/main.go index c919f89ce..ec3295bc1 100644 --- a/cmd/todos/main.go +++ b/cmd/todos/main.go @@ -1,4 +1,4 @@ -// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file). +// Copyright (C) 2014 The Syncthing Authors. // // 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 diff --git a/cmd/transifexdl/main.go b/cmd/transifexdl/main.go index b416ee902..51679426a 100644 --- a/cmd/transifexdl/main.go +++ b/cmd/transifexdl/main.go @@ -1,4 +1,4 @@ -// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file). +// Copyright (C) 2014 The Syncthing Authors. // // 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 diff --git a/cmd/translate/main.go b/cmd/translate/main.go index 88000066f..000b750f2 100644 --- a/cmd/translate/main.go +++ b/cmd/translate/main.go @@ -1,4 +1,4 @@ -// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file). +// Copyright (C) 2014 The Syncthing Authors. // // 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 diff --git a/gui/app.js b/gui/app.js index 716f4e0f4..a3329fae9 100644 --- a/gui/app.js +++ b/gui/app.js @@ -1,4 +1,4 @@ -// Copyright (C) 2014 Jakob Borg and Contributors (see the CONTRIBUTORS file). +// Copyright (C) 2014 The Syncthing Authors. // // 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 diff --git a/gui/index.html b/gui/index.html index c654cdff3..b6d0e926f 100644 --- a/gui/index.html +++ b/gui/index.html @@ -1,6 +1,6 @@