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

[Alex Henrie]

[Dmitry Shachnev (mitya57)]

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: Needs Resubmitting

[Martin Pitt (pitti)]

This was done in http://bazaar.launchpad.net/~lubuntu-dev/lubuntu-default-settings/trunk/revision/263

=== modified file 'debian/changelog'
--- debian/changelog	2013-09-19 20:12:08 +0000
+++ debian/changelog	2013-10-14 20:51:41 +0000
@@ -1,3 +1,11 @@
+lubuntu-default-settings (0.34ubuntu1) UNRELEASED; urgency=low
+
+  * usr/share/lxpanel/profile/Lubuntu/panels/panel
+    - Replace lubuntu-browser.desktop with lxde-x-www-browser.desktop (LP:
+      #1232578)
+
+ -- Alex Henrie <[e-mail]>  Mon, 14 Oct 2013 14:41:54 -0600
+
 lubuntu-default-settings (0.34) saucy; urgency=low
 
   * etc/xdg/lxsession/*/desktop.conf

=== removed file 'usr/share/applications/lubuntu-browser.desktop'
--- usr/share/applications/lubuntu-browser.desktop	2012-11-23 23:42:34 +0000
+++ usr/share/applications/lubuntu-browser.desktop	1970-01-01 00:00:00 +0000
@@ -1,6 +0,0 @@
-[Desktop Entry]
-Name=Internet
-Comment=Internet
-Icon=internet-web-browser
-Exec=x-www-browser
-NoDisplay=true

=== modified file 'usr/share/lxpanel/profile/Lubuntu/panels/panel'
--- usr/share/lxpanel/profile/Lubuntu/panels/panel	2013-08-29 00:20:19 +0000
+++ usr/share/lxpanel/profile/Lubuntu/panels/panel	2013-10-14 20:51:41 +0000
@@ -47,7 +47,7 @@
             id=pcmanfm.desktop
         }
         Button {
-            id=lubuntu-browser.desktop
+            id=lxde-x-www-browser.desktop
         }
     }
 }