From: Ondřej Surý <ondrej@sury.org>
Date: Fri, 14 Feb 2020 08:34:21 +0000 (+0100)
Subject: Don't enforce copyrights on .clang-format
X-Git-Tag: v9.17.1~115^2
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=60d29f69;p=thirdparty%2Fbind9.git

Don't enforce copyrights on .clang-format
---

diff --git a/util/copyrights b/util/copyrights
index eb35aae950b..c8553fc5bd8 100644
--- a/util/copyrights
+++ b/util/copyrights
@@ -1,4 +1,3 @@
-./.clang-format					X	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
@@ -2573,7 +2572,6 @@
 ./util/COPYRIGHT.TOP				X	2018,2019,2020
 ./util/bindkeys.pl				PERL	2009,2010,2011,2012,2014,2016,2017,2018,2019,2020
 ./util/branchsync.sh				SH	2013,2016,2018,2019,2020
-./util/cformat.sh				SH	2020
 ./util/check-ans-prereq.sh			SH	2019,2020
 ./util/check-categories.sh			SH	2015,2016,2017,2018,2019,2020
 ./util/check-changes				PERL	2002,2004,2007,2012,2016,2018,2019,2020
diff --git a/util/merge_copyrights b/util/merge_copyrights
index a1de0652c5a..d00fb9e5aec 100644
--- a/util/merge_copyrights
+++ b/util/merge_copyrights
@@ -36,6 +36,7 @@ while (<CHANGES>) {
 	       /\.git/ |		# git directory
 	       /\.gitignore |   # .gitignore files
 	       /\.gitattributes |   # .gitattributes files
+	       /\.clang-format |   # .clang-format 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