Merge pull request #1621 from luke-jr/WinCOPYING

Replace all occurances of license.txt with COPYING, including naming the file COPYING.txt on Windows

9 files changed, 10 insertions, 10 deletions

diff --git a/contrib/gitian-descriptors/gitian-win32.yml b/contrib/gitian-descriptors/gitian-win32.yml
index 6e2eff15f3..6f0e4e2318 100644
--- a/contrib/gitian-descriptors/gitian-win32.yml
+++ b/contrib/gitian-descriptors/gitian-win32.yml
@@ -47,7 +47,7 @@ script: |
   mkdir -p $OUTDIR/src
   git archive HEAD | tar -x -C $OUTDIR/src
   cp $OUTDIR/src/doc/README_windows.txt $OUTDIR/readme.txt
-  cp $OUTDIR/src/COPYING $OUTDIR/license.txt
+  cp $OUTDIR/src/COPYING $OUTDIR/COPYING.txt
   export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1
   export FAKETIME=$REFERENCE_DATETIME
   export TZ=UTC
diff --git a/contrib/pyminer/pyminer.py b/contrib/pyminer/pyminer.py
index 2887aba591..0a2932d66e 100755
--- a/contrib/pyminer/pyminer.py
+++ b/contrib/pyminer/pyminer.py
@@ -2,7 +2,7 @@
 #
 # Copyright (c) 2011 The Bitcoin developers
 # Distributed under the MIT/X11 software license, see the accompanying
-# file license.txt or http://www.opensource.org/licenses/mit-license.php.
+# file COPYING or http://www.opensource.org/licenses/mit-license.php.
 #
 
 import time
diff --git a/share/setup.nsi b/share/setup.nsi
index c0bc880a56..87cd58a855 100644
--- a/share/setup.nsi
+++ b/share/setup.nsi
@@ -67,7 +67,7 @@ Section -Main SEC0000
     SetOutPath $INSTDIR

     SetOverwrite on

     File ../release/bitcoin-qt.exe

-    File /oname=license.txt ../COPYING

+    File /oname=COPYING.txt ../COPYING

     File /oname=readme.txt ../doc/README_windows.txt

     SetOutPath $INSTDIR\daemon

     File ../src/bitcoind.exe

@@ -120,7 +120,7 @@ done${UNSECTION_ID}:
 # Uninstaller sections

 Section /o -un.Main UNSEC0000

     Delete /REBOOTOK $INSTDIR\bitcoin-qt.exe

-    Delete /REBOOTOK $INSTDIR\license.txt

+    Delete /REBOOTOK $INSTDIR\COPYING.txt

     Delete /REBOOTOK $INSTDIR\readme.txt

     RMDir /r /REBOOTOK $INSTDIR\daemon

     RMDir /r /REBOOTOK $INSTDIR\src

diff --git a/src/makefile.linux-mingw b/src/makefile.linux-mingw
index 6cd464266d..fc22bb76ee 100644
--- a/src/makefile.linux-mingw
+++ b/src/makefile.linux-mingw
@@ -1,6 +1,6 @@
 # Copyright (c) 2009-2010 Satoshi Nakamoto
 # Distributed under the MIT/X11 software license, see the accompanying
-# file license.txt or http://www.opensource.org/licenses/mit-license.php.
+# file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 DEPSDIR:=/usr/i586-mingw32msvc
 
diff --git a/src/makefile.mingw b/src/makefile.mingw
index 3649afd0e9..47637f0bc6 100644
--- a/src/makefile.mingw
+++ b/src/makefile.mingw
@@ -1,6 +1,6 @@
 # Copyright (c) 2009-2010 Satoshi Nakamoto
 # Distributed under the MIT/X11 software license, see the accompanying
-# file license.txt or http://www.opensource.org/licenses/mit-license.php.
+# file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 USE_UPNP:=0
 
diff --git a/src/makefile.osx b/src/makefile.osx
index f9f28267be..d64bed5617 100644
--- a/src/makefile.osx
+++ b/src/makefile.osx
@@ -1,7 +1,7 @@
 # -*- mode: Makefile; -*-
 # Copyright (c) 2011 Bitcoin Developers
 # Distributed under the MIT/X11 software license, see the accompanying
-# file license.txt or http://www.opensource.org/licenses/mit-license.php.
+# file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 # Mac OS X makefile for bitcoin
 # Originally by Laszlo Hanyecz (solar@heliacal.net)
diff --git a/src/makefile.unix b/src/makefile.unix
index a81300329e..857f44531e 100644
--- a/src/makefile.unix
+++ b/src/makefile.unix
@@ -1,6 +1,6 @@
 # Copyright (c) 2009-2010 Satoshi Nakamoto
 # Distributed under the MIT/X11 software license, see the accompanying
-# file license.txt or http://www.opensource.org/licenses/mit-license.php.
+# file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 USE_UPNP:=0
 
diff --git a/src/qt/forms/aboutdialog.ui b/src/qt/forms/aboutdialog.ui
index 21fc7b2019..6632e311d0 100644
--- a/src/qt/forms/aboutdialog.ui
+++ b/src/qt/forms/aboutdialog.ui
@@ -98,7 +98,7 @@
 
 This is experimental software.
 
-Distributed under the MIT/X11 software license, see the accompanying file license.txt or http://www.opensource.org/licenses/mit-license.php.
+Distributed under the MIT/X11 software license, see the accompanying file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit (http://www.openssl.org/) and cryptographic software written by Eric Young (eay@cryptsoft.com) and UPnP software written by Thomas Bernard.</string>
        </property>
diff --git a/src/qt/qtipcserver.cpp b/src/qt/qtipcserver.cpp
index e413c71bc0..ccdfc66bad 100644
--- a/src/qt/qtipcserver.cpp
+++ b/src/qt/qtipcserver.cpp
@@ -1,6 +1,6 @@
 // Copyright (c) 2009-2012 The Bitcoin developers
 // Distributed under the MIT/X11 software license, see the accompanying
-// file license.txt or http://www.opensource.org/licenses/mit-license.php.
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include "qtipcserver.h"
 #include "guiconstants.h"