aboutsummaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorWladimir J. van der Laan <laanwj@gmail.com>2012-01-26 19:00:02 +0100
committerWladimir J. van der Laan <laanwj@gmail.com>2012-01-26 19:00:02 +0100
commit70f55355e29c8e45b607e782c5d76609d23cc858 (patch)
tree3013bee1a1b7dde5b9dfc72508c2716122e84b5d /contrib
parent4c932cca6f579bfb11e0144415c3004d382b8e42 (diff)
parent7d145a0f591dab109eae9adcfaf59303cce0431a (diff)
downloadbitcoin-70f55355e29c8e45b607e782c5d76609d23cc858.tar.xz
Merge pull request #593 (Full URL Support in bitcoin-qt)
Diffstat (limited to 'contrib')
-rw-r--r--contrib/debian/bitcoin-qt.desktop3
-rw-r--r--contrib/debian/bitcoin-qt.install1
-rw-r--r--contrib/debian/bitcoin-qt.protocol11
-rw-r--r--contrib/debian/changelog4
4 files changed, 16 insertions, 3 deletions
diff --git a/contrib/debian/bitcoin-qt.desktop b/contrib/debian/bitcoin-qt.desktop
index d65cc35a3b..ea5a6e4ac4 100644
--- a/contrib/debian/bitcoin-qt.desktop
+++ b/contrib/debian/bitcoin-qt.desktop
@@ -6,6 +6,5 @@ Exec=/usr/bin/bitcoin-qt
Terminal=false
Type=Application
Icon=/usr/share/pixmaps/bitcoin80.xpm
-#For when bitcoin (finally) properly handles bitcoin: URLs
-#MimeType=x-scheme-handler/bitcoin;
+MimeType=x-scheme-handler/bitcoin;
Categories=Office;
diff --git a/contrib/debian/bitcoin-qt.install b/contrib/debian/bitcoin-qt.install
index 7ddc8c1d8f..6a566f515a 100644
--- a/contrib/debian/bitcoin-qt.install
+++ b/contrib/debian/bitcoin-qt.install
@@ -3,3 +3,4 @@ bitcoin-qt usr/lib/bitcoin
share/pixmaps/bitcoin32.xpm usr/share/pixmaps
share/pixmaps/bitcoin80.xpm usr/share/pixmaps
debian/bitcoin-qt.desktop usr/share/applications
+debian/bitcoin-qt.protocol usr/share/kde4/services/
diff --git a/contrib/debian/bitcoin-qt.protocol b/contrib/debian/bitcoin-qt.protocol
new file mode 100644
index 0000000000..014588d536
--- /dev/null
+++ b/contrib/debian/bitcoin-qt.protocol
@@ -0,0 +1,11 @@
+[Protocol]
+exec=bitcoin-qt '%u'
+protocol=bitcoin
+input=none
+output=none
+helper=true
+listing=
+reading=false
+writing=false
+makedir=false
+deleting=false
diff --git a/contrib/debian/changelog b/contrib/debian/changelog
index a26184536d..db5e2682c6 100644
--- a/contrib/debian/changelog
+++ b/contrib/debian/changelog
@@ -4,8 +4,10 @@ bitcoin (0.5.1-natty1) natty; urgency=low
These should never have been there, bitcoin isnt anonymous without
a ton of work that virtually no users will ever be willing and
capable of doing
+ * Add GNOME/KDE support for bitcoin-qt's bitcoin: URI support.
+ Thanks to luke-jr for the KDE .protocol file.
- -- Matt Corallo <matt@bluematt.me> Sat, 7 Jan 2012 13:37:00 -0500
+ -- Matt Corallo <matt@bluematt.me> Fri, 23 Dec 2011 20:25:00 -0500
bitcoin (0.5.1-natty0) natty; urgency=low