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

Proposed by Michael Terry on 2011-01-06
Status: Merged
Merged at revision: 106
Proposed branch: lp:~mterry/apturl/698181
Merge into: lp:apturl
Diff against target: 48 lines (+17/-0)
4 files modified
data/apturl.desktop (+7/-0)
debian/apturl-common.install (+1/-0)
debian/changelog (+7/-0)
setup.py (+2/-0)
To merge this branch: bzr merge lp:~mterry/apturl/698181
Reviewer Review Type Date Requested Status
Ubuntu Core Development Team 2011-01-06 Pending
Review via email: mp+45413@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added file 'data/apturl.desktop'
2--- data/apturl.desktop 1970-01-01 00:00:00 +0000
3+++ data/apturl.desktop 2011-01-06 16:53:39 +0000
4@@ -0,0 +1,7 @@
5+[Desktop Entry]
6+Name=AptURL
7+Exec=apturl %u
8+Type=Application
9+NoDisplay=true
10+Categories=System;
11+MimeType=x-scheme-handler/apt;
12
13=== modified file 'debian/apturl-common.install'
14--- debian/apturl-common.install 2010-12-17 14:42:22 +0000
15+++ debian/apturl-common.install 2011-01-06 16:53:39 +0000
16@@ -5,3 +5,4 @@
17 usr/share/kde4/services
18 usr/share/locale
19 usr/share/omf
20+usr/share/applications
21
22=== modified file 'debian/changelog'
23--- debian/changelog 2010-12-17 14:42:22 +0000
24+++ debian/changelog 2011-01-06 16:53:39 +0000
25@@ -1,3 +1,10 @@
26+apturl (0.4.2ubuntu4) natty; urgency=low
27+
28+ * data/apturl.desktop:
29+ - Add a desktop file to register mime type. LP: #698181
30+
31+ -- Michael Terry <mterry@ubuntu.com> Thu, 06 Jan 2011 11:48:26 -0500
32+
33 apturl (0.4.2ubuntu3) natty; urgency=low
34
35 * Don't hardcode python2.6 in the packaging.
36
37=== modified file 'setup.py'
38--- setup.py 2010-10-05 15:10:37 +0000
39+++ setup.py 2011-01-06 16:53:39 +0000
40@@ -34,6 +34,8 @@
41 ["data/apturl.js"]),
42 ('share/kde4/services/',
43 ["data/apt.protocol","data/apt+http.protocol"]),
44+ ('share/applications/',
45+ ["data/apturl.desktop"]),
46 ]+I18NFILES,
47 cmdclass = { "build" : build_extra.build_extra,
48 "build_i18n" : build_i18n.build_i18n,

Subscribers

People subscribed via source and target branches