Merge branch '0.5.x' into 0.6.0.x

Conflicts:
	src/qt/locale/bitcoin_pt_BR.ts

2 files changed, 6 insertions, 7 deletions

diff --git a/contrib/debian/control b/contrib/debian/control
index b81c02ec1a..d0a2d57c9e 100644
--- a/contrib/debian/control
+++ b/contrib/debian/control
@@ -43,7 +43,7 @@ Description: peer-to-peer network based digital currency - daemon
 Package: bitcoin-qt
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: peer-to-peer network based digital currency - QT GUI
+Description: peer-to-peer network based digital currency - Qt GUI
  Bitcoin is a free open source peer-to-peer electronic cash system that
  is completely decentralized, without the need for a central server or
  trusted parties.  Users hold the crypto keys to their own money and
@@ -55,4 +55,4 @@ Description: peer-to-peer network based digital currency - QT GUI
  Full transaction history is stored locally at each client.  This
  requires 2+ GB of space, slowly growing.
  .
- This package provides bitcoin-qt, a GUI for Bitcoin based on QT.
+ This package provides Bitcoin-Qt, a GUI for Bitcoin based on Qt.
diff --git a/contrib/debian/copyright b/contrib/debian/copyright
index 71fa77cf6c..b99604913c 100644
--- a/contrib/debian/copyright
+++ b/contrib/debian/copyright
@@ -6,7 +6,7 @@ Source: http://sourceforge.net/projects/bitcoin/files/
  https://github.com/bitcoin/bitcoin
 
 Files: *
-Copyright: 2009-2011, Bitcoin Developers
+Copyright: 2009-2012, Bitcoin Developers
 License: Expat
 Comment: The Bitcoin Developers encompasses the current developers listed on bitcoin.org,
          as well as the numerous contributors to the project.
@@ -55,9 +55,8 @@ Comment: Icon Pack: Human-O2
 
 Files: src/qt/res/icons/transaction*.png
 Copyright: md2k7
-License: You are free to do with these icons as you wish, including selling,
- copying, modifying etc.
-Comment: Site: https://forum.bitcoin.org/index.php?topic=15276.0
+License: Expat
+Comment: Site: https://bitcointalk.org/index.php?topic=15276.0
 
 Files: src/qt/res/icons/configure.png, src/qt/res/icons/quit.png,
       src/qt/res/icons/editcopy.png, src/qt/res/icons/editpaste.png,
@@ -70,7 +69,7 @@ Comment: Icon Pack: Crystal SVG
 Files: src/qt/res/icons/bitcoin.png, src/qt/res/icons/toolbar.png
 Copyright: Bitboy (optimized for 16x16 by Wladimir van der Laan)
 License: PUB-DOM
-Comment: Site: http://forum.bitcoin.org/?topic=1756.0
+Comment: Site: https://bitcointalk.org/?topic=1756.0
 
 Files:  scripts/img/reload.xcf, src/qt/res/movies/update_spinner.mng
 Copyright: Everaldo (Everaldo Coelho)