Update copyrights

diff --git a/util/copyrights b/util/copyrights
index 9bc531efb7ea372bbd8837e1c3fd0423c7a0f455..a675fce20b64dfc994c14f02b5a554ae740f043f 100644 (file)
--- a/util/copyrights
+++ b/util/copyrights
@@ -1,4 +1,3 @@
-./.gitattributes                               X       2015,2017,2018,2019,2020
 ./.gitlab-ci.yml                               X       2018,2019,2020
 ./.uncrustify.cfg                              X       2018,2019,2020
 ./CHANGES                                      X       2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018,2019,2020
@@ -444,7 +443,6 @@
 ./bin/tests/system/checkzone/clean.sh          SH      2011,2012,2013,2014,2016,2018,2019,2020
 ./bin/tests/system/checkzone/setup.sh          SH      2014,2016,2018,2019,2020
 ./bin/tests/system/checkzone/tests.sh          SH      2011,2012,2013,2014,2015,2016,2017,2018,2019,2020
-./bin/tests/system/checkzone/zones/.gitattributes      X       2015,2018,2019,2020
 ./bin/tests/system/checkzone/zones/bad-badclass.raw    X       2015,2018,2019,2020
 ./bin/tests/system/cleanall.sh                 SH      2000,2001,2004,2007,2012,2014,2015,2016,2017,2018,2019,2020
 ./bin/tests/system/cleanpkcs11.sh              SH      2010,2012,2014,2016,2018,2019,2020

diff --git a/util/merge_copyrights b/util/merge_copyrights
index b986c6cebc66c17319dd39924deb4a3f0d625fc9..a1de0652c5ab35a7fed3d68cb8c21fa3f1ff8b5c 100644 (file)
--- a/util/merge_copyrights
+++ b/util/merge_copyrights
@@ -35,6 +35,7 @@ while (<CHANGES>) {
               /CVS/ |          # CVS directory
               /\.git/ |                # git directory
               /\.gitignore |   # .gitignore files
+              /\.gitattributes |   # .gitattributes files
               Makefile.in  |   # build system doesn't need to have copyright
               /m4/ |           # build system doesn't need to have copyright
               /configure   |   # build system doesn't need to have copyright