Revert use of new lxsession options until it manages the transition better

(case when autostart is a system file, and desktop.conf a user file).

debian/changelog

@@ -3,8 +3,6 @@ lubuntu-default-settings (0.31) UNRELEASED; urgency=low
   * Add a new Lubuntu-Nexus7 session.
   * debian/lubuntu-default-settings:
    - Exclude nexus7 specific items.
-  * etc/xdg/lxsession :
-   - Use new lxsession features instead of autostart commands.
   * etc/xdg/lubuntu/libfm
    - Use 16px for pcmanfm sidebar.
   * etc/xdg/lubuntu/menus:

etc/xdg/lxsession/Lubuntu-Netbook/autostart

@@ -1 +1,6 @@
 @lxlauncher
+@lxpanel --profile Lubuntu
+@xscreensaver -no-splash
+@xfce4-power-manager
+@pcmanfm --desktop
+@/usr/lib/policykit-1-gnome/polkit-gnome-authentication-agent-1

etc/xdg/lxsession/Lubuntu-Netbook/desktop.conf

@@ -1,20 +1,5 @@
 [Session]
 window_manager=openbox-lubuntu
-panel/program=lxpanel
-panel/session=Lubuntu
-screensaver/program=xscreensaver
-power-manager/program=xfce4-power-manager
-file-manager/program=pcmanfm
-file-manager/session=lubuntu
-file-manager/extras=
-polkit=gnome
-
-[Dbus]
-lxde=true
-gnome=true
-
-[Security]
-keyring=gnome-all
 
 [GTK]
 sNet/ThemeName=Lubuntu-default

etc/xdg/lxsession/Lubuntu-Nexus7/autostart

@@ -1,3 +1,6 @@
 xrotate
 @lxlauncher
+@lxpanel --profile Lubuntu-Nexus7
+@xfce4-power-manager
+@/usr/lib/policykit-1-gnome/polkit-gnome-authentication-agent-1
 @onboard

etc/xdg/lxsession/Lubuntu-Nexus7/desktop.conf

@@ -1,24 +1,5 @@
 [Session]
 window_manager=openbox-lubuntu
-panel/program=lxpanel
-panel/session=Lubuntu-Nexus7
-screensaver/program=xscreensaver
-power-manager/program=xfce4-power-manager
-file-manager/program=pcmanfm
-file-manager/session=lubuntu
-file-manager/extras=
-polkit=gnome
-
-[Dbus]
-lxde=true
-gnome=true
-
-[Security]
-keyring=gnome-all
-
-[a11y]
-activate=yes
-type=gnome
 
 [GTK]
 sNet/ThemeName=Lubuntu-default

etc/xdg/lxsession/Lubuntu/autostart

@@ -0,0 +1,5 @@
+@lxpanel --profile Lubuntu
+@xscreensaver -no-splash
+@xfce4-power-manager
+@pcmanfm --desktop --profile lubuntu
+@/usr/lib/policykit-1-gnome/polkit-gnome-authentication-agent-1

etc/xdg/lxsession/Lubuntu/desktop.conf

@@ -1,20 +1,5 @@
 [Session]
 window_manager=openbox-lubuntu
-panel/program=lxpanel
-panel/session=Lubuntu
-screensaver/program=xscreensaver
-power-manager/program=xfce4-power-manager
-file-manager/program=pcmanfm
-file-manager/session=lubuntu
-file-manager/extras=
-polkit=gnome
-
-[Dbus]
-lxde=true
-gnome=true
-
-[Security]
-keyring=gnome-all
 
 [GTK]
 sNet/ThemeName=Lubuntu-default