Browse Source

Merge pull request #1621 from luke-jr/WinCOPYING

Replace all occurances of license.txt with COPYING, including naming the file COPYING.txt on Windows
0.8
Gavin Andresen 13 years ago
parent
commit
0bf30d2b33
  1. 2
      contrib/gitian-descriptors/gitian-win32.yml
  2. 2
      contrib/pyminer/pyminer.py
  3. 4
      share/setup.nsi
  4. 2
      src/makefile.linux-mingw
  5. 2
      src/makefile.mingw
  6. 2
      src/makefile.osx
  7. 2
      src/makefile.unix
  8. 2
      src/qt/forms/aboutdialog.ui
  9. 2
      src/qt/qtipcserver.cpp

2
contrib/gitian-descriptors/gitian-win32.yml

@ -47,7 +47,7 @@ script: |
mkdir -p $OUTDIR/src mkdir -p $OUTDIR/src
git archive HEAD | tar -x -C $OUTDIR/src git archive HEAD | tar -x -C $OUTDIR/src
cp $OUTDIR/src/doc/README_windows.txt $OUTDIR/readme.txt 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 LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1
export FAKETIME=$REFERENCE_DATETIME export FAKETIME=$REFERENCE_DATETIME
export TZ=UTC export TZ=UTC

2
contrib/pyminer/pyminer.py

@ -2,7 +2,7 @@
# #
# Copyright (c) 2011 The Bitcoin developers # Copyright (c) 2011 The Bitcoin developers
# Distributed under the MIT/X11 software license, see the accompanying # 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 import time

4
share/setup.nsi

@ -67,7 +67,7 @@ Section -Main SEC0000
SetOutPath $INSTDIR SetOutPath $INSTDIR
SetOverwrite on SetOverwrite on
File ../release/bitcoin-qt.exe File ../release/bitcoin-qt.exe
File /oname=license.txt ../COPYING File /oname=COPYING.txt ../COPYING
File /oname=readme.txt ../doc/README_windows.txt File /oname=readme.txt ../doc/README_windows.txt
SetOutPath $INSTDIR\daemon SetOutPath $INSTDIR\daemon
File ../src/bitcoind.exe File ../src/bitcoind.exe
@ -120,7 +120,7 @@ done${UNSECTION_ID}:
# Uninstaller sections # Uninstaller sections
Section /o -un.Main UNSEC0000 Section /o -un.Main UNSEC0000
Delete /REBOOTOK $INSTDIR\bitcoin-qt.exe Delete /REBOOTOK $INSTDIR\bitcoin-qt.exe
Delete /REBOOTOK $INSTDIR\license.txt Delete /REBOOTOK $INSTDIR\COPYING.txt
Delete /REBOOTOK $INSTDIR\readme.txt Delete /REBOOTOK $INSTDIR\readme.txt
RMDir /r /REBOOTOK $INSTDIR\daemon RMDir /r /REBOOTOK $INSTDIR\daemon
RMDir /r /REBOOTOK $INSTDIR\src RMDir /r /REBOOTOK $INSTDIR\src

2
src/makefile.linux-mingw

@ -1,6 +1,6 @@
# Copyright (c) 2009-2010 Satoshi Nakamoto # Copyright (c) 2009-2010 Satoshi Nakamoto
# Distributed under the MIT/X11 software license, see the accompanying # 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 DEPSDIR:=/usr/i586-mingw32msvc

2
src/makefile.mingw

@ -1,6 +1,6 @@
# Copyright (c) 2009-2010 Satoshi Nakamoto # Copyright (c) 2009-2010 Satoshi Nakamoto
# Distributed under the MIT/X11 software license, see the accompanying # 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 USE_UPNP:=0

2
src/makefile.osx vendored

@ -1,7 +1,7 @@
# -*- mode: Makefile; -*- # -*- mode: Makefile; -*-
# Copyright (c) 2011 Bitcoin Developers # Copyright (c) 2011 Bitcoin Developers
# Distributed under the MIT/X11 software license, see the accompanying # 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 # Mac OS X makefile for bitcoin
# Originally by Laszlo Hanyecz (solar@heliacal.net) # Originally by Laszlo Hanyecz (solar@heliacal.net)

2
src/makefile.unix

@ -1,6 +1,6 @@
# Copyright (c) 2009-2010 Satoshi Nakamoto # Copyright (c) 2009-2010 Satoshi Nakamoto
# Distributed under the MIT/X11 software license, see the accompanying # 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 USE_UPNP:=0

2
src/qt/forms/aboutdialog.ui

@ -98,7 +98,7 @@
This is experimental software. 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> 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> </property>

2
src/qt/qtipcserver.cpp

@ -1,6 +1,6 @@
// Copyright (c) 2009-2012 The Bitcoin developers // Copyright (c) 2009-2012 The Bitcoin developers
// Distributed under the MIT/X11 software license, see the accompanying // 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 "qtipcserver.h"
#include "guiconstants.h" #include "guiconstants.h"

Loading…
Cancel
Save