From 917b1d03cf3afa6939113e2fb0bf89dbfd9db2d7 Mon Sep 17 00:00:00 2001
From: Luke Dashjr <luke-jr+git@utopios.org>
Date: Tue, 22 Dec 2015 12:29:13 +0000
Subject: Set copyright holders displayed in notices separately from the
 package name

This helps avoid accidental removal of upstream copyright names
---
 src/util.cpp | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'src/util.cpp')

diff --git a/src/util.cpp b/src/util.cpp
index e8514a2ef..66dd45dc8 100644
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -834,3 +834,10 @@ int GetNumCores()
 #endif
 }
 
+std::string CopyrightHolders()
+{
+    std::string strCopyrightHolders = _(COPYRIGHT_HOLDERS);
+    if (strCopyrightHolders.find("%s") == strCopyrightHolders.npos)
+        return strCopyrightHolders;
+    return strprintf(strCopyrightHolders, _(PACKAGE_NAME));
+}
-- 
cgit v1.2.3


From 3cae14056a1cd8f01dc4943fa0b78315734d741a Mon Sep 17 00:00:00 2001
From: Luke Dashjr <luke-jr+git@utopios.org>
Date: Tue, 19 Jan 2016 08:42:05 +0000
Subject: Bugfix: Actually use _COPYRIGHT_HOLDERS_SUBSTITUTION everywhere

---
 src/util.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/util.cpp')

diff --git a/src/util.cpp b/src/util.cpp
index 66dd45dc8..0439ead47 100644
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -839,5 +839,5 @@ std::string CopyrightHolders()
     std::string strCopyrightHolders = _(COPYRIGHT_HOLDERS);
     if (strCopyrightHolders.find("%s") == strCopyrightHolders.npos)
         return strCopyrightHolders;
-    return strprintf(strCopyrightHolders, _(PACKAGE_NAME));
+    return strprintf(strCopyrightHolders, _(COPYRIGHT_HOLDERS_SUBSTITUTION));
 }
-- 
cgit v1.2.3


From 027fdb83b41ae9e9125cf61f6460c03ab34e5961 Mon Sep 17 00:00:00 2001
From: Luke Dashjr <luke-jr+git@utopios.org>
Date: Wed, 3 Feb 2016 05:38:27 +0000
Subject: When/if the copyright line does not mention Bitcoin Core developers,
 add a second line to copyrights in -version, About dialog, and splash screen

---
 src/util.cpp | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

(limited to 'src/util.cpp')

diff --git a/src/util.cpp b/src/util.cpp
index 0439ead47..1f6b84119 100644
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -834,10 +834,14 @@ int GetNumCores()
 #endif
 }
 
-std::string CopyrightHolders()
+std::string CopyrightHolders(const std::string& strPrefix)
 {
-    std::string strCopyrightHolders = _(COPYRIGHT_HOLDERS);
-    if (strCopyrightHolders.find("%s") == strCopyrightHolders.npos)
-        return strCopyrightHolders;
-    return strprintf(strCopyrightHolders, _(COPYRIGHT_HOLDERS_SUBSTITUTION));
+    std::string strCopyrightHolders = strPrefix + _(COPYRIGHT_HOLDERS);
+    if (strCopyrightHolders.find("%s") != strCopyrightHolders.npos) {
+        strCopyrightHolders = strprintf(strCopyrightHolders, _(COPYRIGHT_HOLDERS_SUBSTITUTION));
+    }
+    if (strCopyrightHolders.find("Bitcoin Core developers") == strCopyrightHolders.npos) {
+        strCopyrightHolders += "\n" + strPrefix + "The Bitcoin Core developers";
+    }
+    return strCopyrightHolders;
 }
-- 
cgit v1.2.3