Merge lp:~alexhenrie24/ubuntu/saucy/lubuntu-default-settings/fix-for-1232578 into lp:ubuntu/saucy/lubuntu-default-settings

Proposed by Alex Henrie on 2013-10-14
Status: Merged
Merge reported by: Martin Pitt
Merged at revision: not available
Proposed branch: lp:~alexhenrie24/ubuntu/saucy/lubuntu-default-settings/fix-for-1232578
Merge into: lp:ubuntu/saucy/lubuntu-default-settings
Diff against target: 39 lines (+9/-7)
3 files modified
debian/changelog (+8/-0)
usr/share/applications/lubuntu-browser.desktop (+0/-6)
usr/share/lxpanel/profile/Lubuntu/panels/panel (+1/-1)
To merge this branch: bzr merge lp:~alexhenrie24/ubuntu/saucy/lubuntu-default-settings/fix-for-1232578
Reviewer Review Type Date Requested Status
Dmitry Shachnev Resubmit on 2013-10-21
Ubuntu branches 2013-10-14 Pending
Review via email: mp+191047@code.launchpad.net
To post a comment you must log in.
Dmitry Shachnev (mitya57) wrote :

Looks good to me, but can you please rebase this against lp:lubuntu-default-settings so that Lubuntu guys could take a look at this?

review: Resubmit

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 2013-09-19 20:12:08 +0000
3+++ debian/changelog 2013-10-14 20:51:41 +0000
4@@ -1,3 +1,11 @@
5+lubuntu-default-settings (0.34ubuntu1) UNRELEASED; urgency=low
6+
7+ * usr/share/lxpanel/profile/Lubuntu/panels/panel
8+ - Replace lubuntu-browser.desktop with lxde-x-www-browser.desktop (LP:
9+ #1232578)
10+
11+ -- Alex Henrie <alexhenrie24@gmail.com> Mon, 14 Oct 2013 14:41:54 -0600
12+
13 lubuntu-default-settings (0.34) saucy; urgency=low
14
15 * etc/xdg/lxsession/*/desktop.conf
16
17=== removed file 'usr/share/applications/lubuntu-browser.desktop'
18--- usr/share/applications/lubuntu-browser.desktop 2012-11-23 23:42:34 +0000
19+++ usr/share/applications/lubuntu-browser.desktop 1970-01-01 00:00:00 +0000
20@@ -1,6 +0,0 @@
21-[Desktop Entry]
22-Name=Internet
23-Comment=Internet
24-Icon=internet-web-browser
25-Exec=x-www-browser
26-NoDisplay=true
27
28=== modified file 'usr/share/lxpanel/profile/Lubuntu/panels/panel'
29--- usr/share/lxpanel/profile/Lubuntu/panels/panel 2013-08-29 00:20:19 +0000
30+++ usr/share/lxpanel/profile/Lubuntu/panels/panel 2013-10-14 20:51:41 +0000
31@@ -47,7 +47,7 @@
32 id=pcmanfm.desktop
33 }
34 Button {
35- id=lubuntu-browser.desktop
36+ id=lxde-x-www-browser.desktop
37 }
38 }
39 }

Subscribers

People subscribed via source and target branches

to all changes: