--- lxde-common-0.99.1/startlxde.in.orig 2016-05-31 14:26:06.619549856 +0200 +++ lxde-common-0.99.1/startlxde.in 2016-05-31 14:27:21.578173144 +0200 @@ -36,5 +36,75 @@ # Provide a solution for bug mga#14622 setxkbmap +## Migration from previous versions of Mageia +#if [ ! -f "$XDG_CONFIG_HOME/.mga_lxde_migration" ]; then +# touch "$XDG_CONFIG_HOME/.mga_lxde_migration" +# # 1. Solution for the problem of empty menu +# if [ -f "$XDG_CONFIG_HOME/lxsession/LXDE/desktop.conf" ]; then +# wrong=$(grep -- "^menu_prefix=lxde-$" "$XDG_CONFIG_HOME/lxsession/LXDE/desktop.conf") +# if [ -n "$wrong" ]; then +# sed -i "s/^\(menu_prefix=\)lxde-$/\1/" "$XDG_CONFIG_HOME/lxsession/LXDE/desktop.conf" +# fi +# fi +# # 2. Prevent having two trash icons on the desktop (mga#14210) +# if [ -f "$XDG_CONFIG_HOME/pcmanfm/LXDE/desktop-items-0.conf" ]; then +# wrong=$(grep "^show_trash=0$" "$XDG_CONFIG_HOME/pcmanfm/LXDE/desktop-items-0.conf") +# wrong2="" +# if [ -f "$XDG_DESKTOP_DIR/trash.desktop" ]; then +# wrong2=$(grep "^OnlyShowIn=LXDE\;$" "$XDG_DESKTOP_DIR/trash.desktop") +# fi +# if [ -n "$wrong" -a \( -f "$XDG_DESKTOP_DIR/org.lxde.trash.desktop" -o -n "$wrong2" \) ]; then +# sed -i "s/^\(show_trash=\)0$/\11/" "$XDG_CONFIG_HOME/pcmanfm/LXDE/desktop-items-0.conf" +# if [ -f "$XDG_DESKTOP_DIR/org.lxde.trash.desktop" ]; then +# rm -f "$XDG_DESKTOP_DIR/org.lxde.trash.desktop" +# wrong=$(grep "^\[org.lxde.trash.desktop]$" "$XDG_CONFIG_HOME/pcmanfm/LXDE/desktop-items-0.conf") +# if [ -n "$wrong" ]; then +# sed -i "s/^\[org.lxde.trash.desktop]$/\[trash:\/\/\/]/" "$XDG_CONFIG_HOME/pcmanfm/LXDE/desktop-items-0.conf" +# fi +# fi +# if [ -n "$wrong2" ]; then +# rm -f "$XDG_DESKTOP_DIR/trash.desktop" +# wrong=$(grep "^\[trash.desktop]$" "$XDG_CONFIG_HOME/pcmanfm/LXDE/desktop-items-0.conf") +# if [ -n "$wrong" ]; then +# sed -i "s/^\[trash.desktop]$/\[trash:\/\/\/]/" "$XDG_CONFIG_HOME/pcmanfm/LXDE/desktop-items-0.conf" +# fi +# fi +# fi +# fi +# # 3. Make sure the "Home" icon on the desktop is the good one +# if [ -f "$XDG_DESKTOP_DIR/home.desktop" ]; then +# wrong=$(grep "^OnlyShowIn=LXDE\;$" "$XDG_DESKTOP_DIR/home.desktop") +# if [ -n "$wrong" ]; then +# rm -f "$XDG_DESKTOP_DIR/home.desktop" +# xdg-desktop-icon install --novendor @localstatedir@/lib/mageia/lxde-profiles/Desktop-icons/org.lxde.home.desktop +# wrong=$(grep "^\[home.desktop]$" "$XDG_CONFIG_HOME/pcmanfm/LXDE/desktop-items-0.conf") +# if [ -n "$wrong" ]; then +# sed -i "s/^\[\(home.desktop]\)$/\[org.lxde.\1/" "$XDG_CONFIG_HOME/pcmanfm/LXDE/desktop-items-0.conf" +# fi +# fi +# fi +# # 4. Use the new icon for the menu (mga#18579) +# if [ -f "$XDG_CONFIG_HOME/lxpanel/LXDE/panels/panel" ]; then +# wrong=$(grep "/usr/share/icons/mageia.png" "$XDG_CONFIG_HOME/lxpanel/LXDE/panels/panel") +# if [ -n "$wrong" ]; then +# sed -i "s/\(\/usr\/share\/icons\/\)mageia.png/\1hicolor\/scalable\/apps\/mageia-menu.svg/" "$XDG_CONFIG_HOME/lxpanel/LXDE/panels/panel" +# fi +# fi +# # 5. Set the default font size to 11 on desktop (mga#17905) +# if [ -f "$XDG_CONFIG_HOME/pcmanfm/LXDE/desktop-items-0.conf" ]; then +# wrong=$(grep "^desktop_font=Sans 12$" "$XDG_CONFIG_HOME/pcmanfm/LXDE/desktop-items-0.conf") +# if [ -n "$wrong" ]; then +# sed -i "s/^\(desktop_font=Sans 1\)2$/\11/" "$XDG_CONFIG_HOME/pcmanfm/LXDE/desktop-items-0.conf" +# fi +# fi +# # 6. The plugin volumealsa is replaced by volume +# if [ -f "$XDG_CONFIG_HOME/lxpanel/LXDE/panels/panel" ]; then +# wrong=$(grep "/usr/share/icons/mageia.png" "$XDG_CONFIG_HOME/lxpanel/LXDE/panels/panel") +# if [ -n "$wrong" ]; then +# sed -i "s/\(type=volume\)alsa$/\1/" "$XDG_CONFIG_HOME/lxpanel/LXDE/panels/panel" +# fi +# fi +#fi +# # Start the LXDE session exec @prefix@/bin/lxsession -s LXDE -e LXDE
