Merge lp:~mterry/apturl/698181 into lp:apturl

[Michael Terry]

=== added file 'data/apturl.desktop'
--- data/apturl.desktop	1970-01-01 00:00:00 +0000
+++ data/apturl.desktop	2011-01-06 16:53:39 +0000
@@ -0,0 +1,7 @@
+[Desktop Entry]
+Name=AptURL
+Exec=apturl %u
+Type=Application
+NoDisplay=true
+Categories=System;
+MimeType=x-scheme-handler/apt;

=== modified file 'debian/apturl-common.install'
--- debian/apturl-common.install	2010-12-17 14:42:22 +0000
+++ debian/apturl-common.install	2011-01-06 16:53:39 +0000
@@ -5,3 +5,4 @@
 usr/share/kde4/services
 usr/share/locale
 usr/share/omf
+usr/share/applications

=== modified file 'debian/changelog'
--- debian/changelog	2010-12-17 14:42:22 +0000
+++ debian/changelog	2011-01-06 16:53:39 +0000
@@ -1,3 +1,10 @@
+apturl (0.4.2ubuntu4) natty; urgency=low
+
+  * data/apturl.desktop:
+    - Add a desktop file to register mime type.  LP: #698181
+
+ -- Michael Terry <[e-mail]>  Thu, 06 Jan 2011 11:48:26 -0500
+
 apturl (0.4.2ubuntu3) natty; urgency=low
 
   * Don't hardcode python2.6 in the packaging.

=== modified file 'setup.py'
--- setup.py	2010-10-05 15:10:37 +0000
+++ setup.py	2011-01-06 16:53:39 +0000
@@ -34,6 +34,8 @@
                    ["data/apturl.js"]),
                   ('share/kde4/services/',
                    ["data/apt.protocol","data/apt+http.protocol"]),
+                  ('share/applications/',
+                   ["data/apturl.desktop"]),
                  ]+I18NFILES,
       cmdclass = { "build" : build_extra.build_extra,
                    "build_i18n" :  build_i18n.build_i18n,