From 01fafe55a1ab20870749dae01b437049ad4ce6e6 Mon Sep 17 00:00:00 2001
From: Hennadii Stepanov <32963518+hebasto@users.noreply.github.com>
Date: Sat, 29 Jun 2019 18:35:45 +0300
Subject: [PATCH 1/3] Include Objective-C source files

The copyright_header.py script will process Objective-C source files
(*.mm) as other ones.
---
 contrib/devtools/copyright_header.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contrib/devtools/copyright_header.py b/contrib/devtools/copyright_header.py
index f2987f226..29d1ed87f 100755
--- a/contrib/devtools/copyright_header.py
+++ b/contrib/devtools/copyright_header.py
@@ -34,7 +34,7 @@ EXCLUDE_DIRS = [
     "src/univalue/",
 ]
 
-INCLUDE = ['*.h', '*.cpp', '*.cc', '*.c', '*.py']
+INCLUDE = ['*.h', '*.cpp', '*.cc', '*.c', '*.mm', '*.py']
 INCLUDE_COMPILED = re.compile('|'.join([fnmatch.translate(m) for m in INCLUDE]))
 
 def applies_to_file(filename):

From 621463d7df0c644f4bf45550d3a75e134876480a Mon Sep 17 00:00:00 2001
From: Hennadii Stepanov <32963518+hebasto@users.noreply.github.com>
Date: Sat, 29 Jun 2019 18:50:39 +0300
Subject: [PATCH 2/3] Drop no-longer-relevant copyright holder name

---
 contrib/devtools/copyright_header.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/contrib/devtools/copyright_header.py b/contrib/devtools/copyright_header.py
index 29d1ed87f..147dba20c 100755
--- a/contrib/devtools/copyright_header.py
+++ b/contrib/devtools/copyright_header.py
@@ -97,7 +97,6 @@ EXPECTED_HOLDER_NAMES = [
     "Wladimir J. van der Laan\n",
     "Jeff Garzik\n",
     "Jan-Klaas Kollhof\n",
-    "Sam Rushing\n",
     "ArtForz -- public domain half-a-node\n",
     "Intel Corporation",
     "The Zcash developers",

From ca11606858a787c133983dcb1e0fea2ac54fc530 Mon Sep 17 00:00:00 2001
From: Hennadii Stepanov <32963518+hebasto@users.noreply.github.com>
Date: Sat, 29 Jun 2019 18:58:52 +0300
Subject: [PATCH 3/3] Fix: "Bitcoin Core" -> "The Bitcoin Core"

---
 contrib/devtools/copyright_header.py | 1 -
 contrib/devtools/github-merge.py     | 3 +--
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/contrib/devtools/copyright_header.py b/contrib/devtools/copyright_header.py
index 147dba20c..fc01e570a 100755
--- a/contrib/devtools/copyright_header.py
+++ b/contrib/devtools/copyright_header.py
@@ -90,7 +90,6 @@ def compile_copyright_regex(copyright_style, year_style, name):
 EXPECTED_HOLDER_NAMES = [
     "Satoshi Nakamoto\n",
     "The Bitcoin Core developers\n",
-    "Bitcoin Core Developers\n",
     "BitPay Inc\.\n",
     "University of Illinois at Urbana-Champaign\.\n",
     "Pieter Wuille\n",
diff --git a/contrib/devtools/github-merge.py b/contrib/devtools/github-merge.py
index cd7a271e8..78ac671bf 100755
--- a/contrib/devtools/github-merge.py
+++ b/contrib/devtools/github-merge.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env python3
-# Copyright (c) 2016-2017 Bitcoin Core Developers
+# Copyright (c) 2016-2017 The Bitcoin Core developers
 # Distributed under the MIT software license, see the accompanying
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
@@ -411,4 +411,3 @@ def main():
 
 if __name__ == '__main__':
     main()
-