Merge lp:~ken-vandine/ubuntu/maverick/rhythmbox-ubuntuone-music-store/gconf into lp:ubuntu/maverick/rhythmbox-ubuntuone-music-store

Proposed by Ken VanDine
Status: Needs review
Proposed branch: lp:~ken-vandine/ubuntu/maverick/rhythmbox-ubuntuone-music-store/gconf
Merge into: lp:ubuntu/maverick/rhythmbox-ubuntuone-music-store
Diff against target: 25 lines (+10/-2)
2 files modified
debian/changelog (+8/-0)
debian/rhythmbox-ubuntuone-music-store.gconf-defaults (+2/-2)
To merge this branch: bzr merge lp:~ken-vandine/ubuntu/maverick/rhythmbox-ubuntuone-music-store/gconf
Reviewer Review Type Date Requested Status
Rodrigo Moya (community) Approve
Review via email: mp+36147@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Rodrigo Moya (rodrigo-moya) :
review: Approve

Unmerged revisions

52. By Ken VanDine

* debian/rhythmbox-ubuntuone-music-store.gconf-defaults
  - Fixed a typo, the gconf key is url-handlers
  - url is u1ms:// not xu1ms://

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2010-09-20 18:02:02 +0000
3+++ debian/changelog 2010-09-21 14:02:41 +0000
4@@ -1,3 +1,11 @@
5+rhythmbox-ubuntuone-music-store (0.1.6-0ubuntu2) UNRELEASED; urgency=low
6+
7+ * debian/rhythmbox-ubuntuone-music-store.gconf-defaults
8+ - Fixed a typo, the gconf key is url-handlers
9+ - url is u1ms:// not xu1ms://
10+
11+ -- Ken VanDine <ken.vandine@canonical.com> Tue, 21 Sep 2010 09:48:36 -0400
12+
13 rhythmbox-ubuntuone-music-store (0.1.6-0ubuntu1) maverick; urgency=low
14
15 * New upstream release:
16
17=== modified file 'debian/rhythmbox-ubuntuone-music-store.gconf-defaults'
18--- debian/rhythmbox-ubuntuone-music-store.gconf-defaults 2010-09-20 18:02:02 +0000
19+++ debian/rhythmbox-ubuntuone-music-store.gconf-defaults 2010-09-21 14:02:41 +0000
20@@ -1,3 +1,3 @@
21 /apps/rhythmbox/plugins/umusicstore/active true
22-/desktop/gnome/url_handlers/xu1ms/command rhythmbox "%s"
23-/desktop/gnome/url-handlers/xu1ms/enabled true
24+/desktop/gnome/url-handlers/u1ms/command rhythmbox "%s"
25+/desktop/gnome/url-handlers/u1ms/enabled true

Subscribers

People subscribed via source and target branches

to all changes: