diff -Nru ubuntu-netbook-remix-default-settings-0.6.7/debian/20_une-gconf-mandatory ubuntu-netbook-remix-default-settings-0.6.8/debian/20_une-gconf-mandatory --- ubuntu-netbook-remix-default-settings-0.6.7/debian/20_une-gconf-mandatory 1970-01-01 01:00:00.000000000 +0100 +++ ubuntu-netbook-remix-default-settings-0.6.8/debian/20_une-gconf-mandatory 2009-10-19 14:13:04.000000000 +0200 @@ -0,0 +1,95 @@ +/desktop/gnome/applications/window_manager/default /usr/bin/metacity +/desktop/gnome/applications/window_manager/current /usr/bin/metacity +/apps/metacity/general/num_workspaces 1 +/desktop/gnome/background/picture_options stretched +/desktop/gnome/interface/gtk_theme Dust +/desktop/gnome/interface/icon_theme Humanity-Dark +/desktop/gnome/lockdown/disable_user_switching true +/desktop/gnome/url-handlers/cdda/command rhythmbox %s +/apps/maximus/exclude_class [Empathy,Totem,Gwibber,Gnome-language-selector,Gtk-recordMyDesktop] +/apps/evolution/shell/view_defaults/buttons_style icons +/apps/evolution/shell/view_defaults/folder_bar/width 266 +/apps/gnome-screensaver/user_switch_enabled false +/apps/nautilus/preferences/show_desktop false +/apps/nautilus/preferences/exit_with_last_window false +/apps/panel/general/toplevel_id_list [top_panel] +/apps/panel/general/applet_id_list [applet_0,applet_1,applet_2,applet_3,applet_4,applet_5,applet_6] +/apps/panel/general/toplevels/top_panel/background/color #000000 +/apps/panel/general/toplevels/top_panel/background/opacity 37672 +/apps/panel/general/toplevels/top_panel/background/type color +/apps/panel/applets/applet_0/bonobo_iid OAFIID:GNOME_GoHome +/apps/panel/applets/applet_0/locked true +/apps/panel/applets/applet_0/position 0 +/apps/panel/applets/applet_0/object_type bonobo-applet +/apps/panel/applets/applet_0/toplevel_id top_panel +/apps/panel/applets/applet_1/bonobo_iid OAFIID:GNOME_WindowPicker +/apps/panel/applets/applet_1/locked true +/apps/panel/applets/applet_1/position 2 +/apps/panel/applets/applet_1/object_type bonobo-applet +/apps/panel/applets/applet_1/toplevel_id top_panel +/apps/panel/applets/applet_2/bonobo_iid OAFIID:GNOME_IndicatorApplet +/apps/panel/applets/applet_2/locked true +/apps/panel/applets/applet_2/position 7 +/apps/panel/applets/applet_2/object_type bonobo-applet +/apps/panel/applets/applet_2/panel_right_stick true +/apps/panel/applets/applet_2/toplevel_id top_panel +/apps/panel/applets/applet_3/bonobo_iid OAFIID:GNOME_NotificationAreaApplet +/apps/panel/applets/applet_3/locked true +/apps/panel/applets/applet_3/position 6 +/apps/panel/applets/applet_3/object_type bonobo-applet +/apps/panel/applets/applet_3/panel_right_stick true +/apps/panel/applets/applet_3/toplevel_id top_panel +/apps/panel/applets/applet_4/bonobo_iid OAFIID:GNOME_MixerApplet +/apps/panel/applets/applet_4/locked true +/apps/panel/applets/applet_4/position 5 +/apps/panel/applets/applet_4/object_type bonobo-applet +/apps/panel/applets/applet_4/panel_right_stick true +/apps/panel/applets/applet_4/toplevel_id top_panel +/apps/panel/applets/applet_5/bonobo_iid OAFIID:GNOME_ClockApplet +/apps/panel/applets/applet_5/locked true +/apps/panel/applets/applet_5/position 4 +/apps/panel/applets/applet_5/object_type bonobo-applet +/apps/panel/applets/applet_5/panel_right_stick true +/apps/panel/applets/applet_5/toplevel_id top_panel +/apps/panel/applets/applet_6/bonobo_iid OAFIID:GNOME_FastUserSwitchApplet +/apps/panel/applets/applet_6/locked true +/apps/panel/applets/applet_6/position 3 +/apps/panel/applets/applet_6/object_type bonobo-applet +/apps/panel/applets/applet_6/panel_right_stick true +/apps/panel/applets/applet_6/toplevel_id top_panel +/apps/panel/toplevels/disable_movement true +/apps/gnome-power-manager/buttons/lid_ac suspend +/apps/gnome-power-manager/buttons/lid_battery suspend +/apps/gnome-power-manager/buttons/power interactive +/apps/gnome-power-manager/buttons/suspend suspend +/apps/gnome-power-manager/actions/critical_battery suspend +/apps/gnome-power-manager/actions/sleep_type_ac suspend +/apps/gnome-power-manager/actions/sleep_type_battery suspend +/apps/gnome-power-manager/timeout/sleep_computer_ac 0 +/apps/gnome-power-manager/timeout/sleep_display_ac 1200 +/apps/gnome-power-manager/timeout/sleep_computer_battery 1200 +/apps/gnome-power-manager/timeout/sleep_display_battery 300 +/apps/gnome-power-manager/backlight/battery_reduce true +/apps/gnome-power-manager/ui/enable_sound false +/apps/gnome-power-manager/ui/icon_policy always +/apps/gnome-power-manager/lock/use_screensaver_settings true +/apps/gnome-power-manager/general/use_time_for_policy false +/apps/gnome-power-manager/notify/sleep_failed false +/apps/metacity/general/audible_bell false +/apps/f-spot/ui/maximized true +/apps/gnome-do/preferences/Do/CorePreferences/QuietStart true +/apps/netbook-launcher/favorites/favorites_list [firefox,evolution,cheese,empathy,yelp,ubuntuone-client-applet,ubuntu-software-center] +/apps/netbook-launcher/favorites/firefox/type application +/apps/netbook-launcher/favorites/firefox/desktop_file /usr/share/applications/firefox.desktop +/apps/netbook-launcher/favorites/evolution/type application +/apps/netbook-launcher/favorites/evolution/desktop_file /usr/share/applications/evolution.desktop +/apps/netbook-launcher/favorites/cheese/type application +/apps/netbook-launcher/favorites/cheese/desktop_file /usr/share/applications/cheese.desktop +/apps/netbook-launcher/favorites/empathy/type application +/apps/netbook-launcher/favorites/empathy/desktop_file /usr/share/applications/empathy.desktop +/apps/netbook-launcher/favorites/yelp/type application +/apps/netbook-launcher/favorites/yelp/desktop_file /usr/share/applications/yelp.desktop +/apps/netbook-launcher/favorites/ubuntuone-client-applet/type application +/apps/netbook-launcher/favorites/ubuntuone-client-applet/desktop_file /usr/share/applications/ubuntuone-client-applet.desktop +/apps/netbook-launcher/favorites/ubuntu-software-center/type application +/apps/netbook-launcher/favorites/ubuntu-software-center/desktop_file /usr/share/applications/ubuntu-software-center.desktop diff -Nru ubuntu-netbook-remix-default-settings-0.6.7/debian/changelog ubuntu-netbook-remix-default-settings-0.6.8/debian/changelog --- ubuntu-netbook-remix-default-settings-0.6.7/debian/changelog 2009-10-19 14:13:42.000000000 +0200 +++ ubuntu-netbook-remix-default-settings-0.6.8/debian/changelog 2009-12-13 21:57:07.000000000 +0100 @@ -1,3 +1,21 @@ +ubuntu-netbook-remix-default-settings (0.6.8) lucid; urgency=low + + * shape une session and enable ubuntu GNOME installation on the same + system: (LP: #496301) + - add une.mandatory.path to include the new une session mandatory path + in gconf + - rename debian/gconf.default to debian/20_une-gconf-mandatory to + avoid dh_gconf taking it into account + - add une.desktop (use no more gnome.desktop file) + - add those three previous files to debian/install + - remove dh_gconf specific call in debian/rules + - add debian/{postinst;postrm}: + + register and remove gconf une mandatory value in non standard path + + call gdm-set-default-session to add une as default session only if + no other previous default session and remove if default + + -- Didier Roche Sun, 13 Dec 2009 21:56:50 +0100 + ubuntu-netbook-remix-default-settings (0.6.7) karmic; urgency=low * Add Gtk-recordMyDesktop to maximus maximize blacklist; LP: #455395. diff -Nru ubuntu-netbook-remix-default-settings-0.6.7/debian/gconf-defaults ubuntu-netbook-remix-default-settings-0.6.8/debian/gconf-defaults --- ubuntu-netbook-remix-default-settings-0.6.7/debian/gconf-defaults 2009-10-19 14:13:04.000000000 +0200 +++ ubuntu-netbook-remix-default-settings-0.6.8/debian/gconf-defaults 1970-01-01 01:00:00.000000000 +0100 @@ -1,95 +0,0 @@ -/desktop/gnome/applications/window_manager/default /usr/bin/metacity -/desktop/gnome/applications/window_manager/current /usr/bin/metacity -/apps/metacity/general/num_workspaces 1 -/desktop/gnome/background/picture_options stretched -/desktop/gnome/interface/gtk_theme Dust -/desktop/gnome/interface/icon_theme Humanity-Dark -/desktop/gnome/lockdown/disable_user_switching true -/desktop/gnome/url-handlers/cdda/command rhythmbox %s -/apps/maximus/exclude_class [Empathy,Totem,Gwibber,Gnome-language-selector,Gtk-recordMyDesktop] -/apps/evolution/shell/view_defaults/buttons_style icons -/apps/evolution/shell/view_defaults/folder_bar/width 266 -/apps/gnome-screensaver/user_switch_enabled false -/apps/nautilus/preferences/show_desktop false -/apps/nautilus/preferences/exit_with_last_window false -/apps/panel/general/toplevel_id_list [top_panel] -/apps/panel/general/applet_id_list [applet_0,applet_1,applet_2,applet_3,applet_4,applet_5,applet_6] -/apps/panel/general/toplevels/top_panel/background/color #000000 -/apps/panel/general/toplevels/top_panel/background/opacity 37672 -/apps/panel/general/toplevels/top_panel/background/type color -/apps/panel/applets/applet_0/bonobo_iid OAFIID:GNOME_GoHome -/apps/panel/applets/applet_0/locked true -/apps/panel/applets/applet_0/position 0 -/apps/panel/applets/applet_0/object_type bonobo-applet -/apps/panel/applets/applet_0/toplevel_id top_panel -/apps/panel/applets/applet_1/bonobo_iid OAFIID:GNOME_WindowPicker -/apps/panel/applets/applet_1/locked true -/apps/panel/applets/applet_1/position 2 -/apps/panel/applets/applet_1/object_type bonobo-applet -/apps/panel/applets/applet_1/toplevel_id top_panel -/apps/panel/applets/applet_2/bonobo_iid OAFIID:GNOME_IndicatorApplet -/apps/panel/applets/applet_2/locked true -/apps/panel/applets/applet_2/position 7 -/apps/panel/applets/applet_2/object_type bonobo-applet -/apps/panel/applets/applet_2/panel_right_stick true -/apps/panel/applets/applet_2/toplevel_id top_panel -/apps/panel/applets/applet_3/bonobo_iid OAFIID:GNOME_NotificationAreaApplet -/apps/panel/applets/applet_3/locked true -/apps/panel/applets/applet_3/position 6 -/apps/panel/applets/applet_3/object_type bonobo-applet -/apps/panel/applets/applet_3/panel_right_stick true -/apps/panel/applets/applet_3/toplevel_id top_panel -/apps/panel/applets/applet_4/bonobo_iid OAFIID:GNOME_MixerApplet -/apps/panel/applets/applet_4/locked true -/apps/panel/applets/applet_4/position 5 -/apps/panel/applets/applet_4/object_type bonobo-applet -/apps/panel/applets/applet_4/panel_right_stick true -/apps/panel/applets/applet_4/toplevel_id top_panel -/apps/panel/applets/applet_5/bonobo_iid OAFIID:GNOME_ClockApplet -/apps/panel/applets/applet_5/locked true -/apps/panel/applets/applet_5/position 4 -/apps/panel/applets/applet_5/object_type bonobo-applet -/apps/panel/applets/applet_5/panel_right_stick true -/apps/panel/applets/applet_5/toplevel_id top_panel -/apps/panel/applets/applet_6/bonobo_iid OAFIID:GNOME_FastUserSwitchApplet -/apps/panel/applets/applet_6/locked true -/apps/panel/applets/applet_6/position 3 -/apps/panel/applets/applet_6/object_type bonobo-applet -/apps/panel/applets/applet_6/panel_right_stick true -/apps/panel/applets/applet_6/toplevel_id top_panel -/apps/panel/toplevels/disable_movement true -/apps/gnome-power-manager/buttons/lid_ac suspend -/apps/gnome-power-manager/buttons/lid_battery suspend -/apps/gnome-power-manager/buttons/power interactive -/apps/gnome-power-manager/buttons/suspend suspend -/apps/gnome-power-manager/actions/critical_battery suspend -/apps/gnome-power-manager/actions/sleep_type_ac suspend -/apps/gnome-power-manager/actions/sleep_type_battery suspend -/apps/gnome-power-manager/timeout/sleep_computer_ac 0 -/apps/gnome-power-manager/timeout/sleep_display_ac 1200 -/apps/gnome-power-manager/timeout/sleep_computer_battery 1200 -/apps/gnome-power-manager/timeout/sleep_display_battery 300 -/apps/gnome-power-manager/backlight/battery_reduce true -/apps/gnome-power-manager/ui/enable_sound false -/apps/gnome-power-manager/ui/icon_policy always -/apps/gnome-power-manager/lock/use_screensaver_settings true -/apps/gnome-power-manager/general/use_time_for_policy false -/apps/gnome-power-manager/notify/sleep_failed false -/apps/metacity/general/audible_bell false -/apps/f-spot/ui/maximized true -/apps/gnome-do/preferences/Do/CorePreferences/QuietStart true -/apps/netbook-launcher/favorites/favorites_list [firefox,evolution,cheese,empathy,yelp,ubuntuone-client-applet,ubuntu-software-center] -/apps/netbook-launcher/favorites/firefox/type application -/apps/netbook-launcher/favorites/firefox/desktop_file /usr/share/applications/firefox.desktop -/apps/netbook-launcher/favorites/evolution/type application -/apps/netbook-launcher/favorites/evolution/desktop_file /usr/share/applications/evolution.desktop -/apps/netbook-launcher/favorites/cheese/type application -/apps/netbook-launcher/favorites/cheese/desktop_file /usr/share/applications/cheese.desktop -/apps/netbook-launcher/favorites/empathy/type application -/apps/netbook-launcher/favorites/empathy/desktop_file /usr/share/applications/empathy.desktop -/apps/netbook-launcher/favorites/yelp/type application -/apps/netbook-launcher/favorites/yelp/desktop_file /usr/share/applications/yelp.desktop -/apps/netbook-launcher/favorites/ubuntuone-client-applet/type application -/apps/netbook-launcher/favorites/ubuntuone-client-applet/desktop_file /usr/share/applications/ubuntuone-client-applet.desktop -/apps/netbook-launcher/favorites/ubuntu-software-center/type application -/apps/netbook-launcher/favorites/ubuntu-software-center/desktop_file /usr/share/applications/ubuntu-software-center.desktop diff -Nru ubuntu-netbook-remix-default-settings-0.6.7/debian/install ubuntu-netbook-remix-default-settings-0.6.8/debian/install --- ubuntu-netbook-remix-default-settings-0.6.7/debian/install 2009-07-27 12:00:26.000000000 +0200 +++ ubuntu-netbook-remix-default-settings-0.6.8/debian/install 2009-12-13 22:32:36.000000000 +0100 @@ -1 +1,4 @@ debian/unr.py /usr/share/apport/general-hooks +une.mandatory.path /usr/share/gconf +une.desktop /usr/share/xsessions +debian/20_une-gconf-mandatory /usr/share/gconf/une/mandatory diff -Nru ubuntu-netbook-remix-default-settings-0.6.7/debian/postinst ubuntu-netbook-remix-default-settings-0.6.8/debian/postinst --- ubuntu-netbook-remix-default-settings-0.6.7/debian/postinst 1970-01-01 01:00:00.000000000 +0100 +++ ubuntu-netbook-remix-default-settings-0.6.8/debian/postinst 2009-12-13 22:32:22.000000000 +0100 @@ -0,0 +1,17 @@ +#!/bin/sh +set -e + +case "$1" in + configure|upgrade) + if [ -x /usr/lib/gdm/gdm-set-default-session ] ; then + /usr/lib/gdm/gdm-set-default-session --keep-old une || true + fi + if which update-gconf-defaults >/dev/null 2>&1 ; then + mkdir -p /var/lib/gconf/une.mandatory + update-gconf-defaults --source /usr/share/gconf/une/mandatory \ + --destination /var/lib/gconf/une.mandatory + fi + ;; +esac + +#DEBHELPER# diff -Nru ubuntu-netbook-remix-default-settings-0.6.7/debian/postrm ubuntu-netbook-remix-default-settings-0.6.8/debian/postrm --- ubuntu-netbook-remix-default-settings-0.6.7/debian/postrm 1970-01-01 01:00:00.000000000 +0100 +++ ubuntu-netbook-remix-default-settings-0.6.8/debian/postrm 2009-12-13 22:32:06.000000000 +0100 @@ -0,0 +1,19 @@ +#!/bin/sh +set -e + +case "$1" in + remove|purge) + if which update-gconf-defaults >/dev/null 2>&1 && [ -d /usr/share/gconf/mandatory/une ]; then + update-gconf-defaults --source /usr/share/gconf/une/mandatory \ + --destination /var/lib/gconf/une.mandatory + fi + if [ ! -d /var/lib/gconf/une.mandatory ]; then + rm -rf /var/lib/gconf/une.mandatory + fi + if [ -x /usr/lib/gdm/gdm-set-default-session ] ; then + /usr/lib/gdm/gdm-set-default-session --remove une || true + fi + ;; +esac + +#DEBHELPER# diff -Nru ubuntu-netbook-remix-default-settings-0.6.7/debian/rules ubuntu-netbook-remix-default-settings-0.6.8/debian/rules --- ubuntu-netbook-remix-default-settings-0.6.7/debian/rules 2009-10-05 10:15:58.000000000 +0200 +++ ubuntu-netbook-remix-default-settings-0.6.8/debian/rules 2009-12-13 13:03:46.000000000 +0100 @@ -16,9 +16,7 @@ dh binary-arch binary-indep: install - dh binary-indep --before dh_gconf - dh_gconf --priority 30 - dh binary-indep --remaining + dh binary-indep binary: binary-arch binary-indep diff -Nru ubuntu-netbook-remix-default-settings-0.6.7/une.desktop ubuntu-netbook-remix-default-settings-0.6.8/une.desktop --- ubuntu-netbook-remix-default-settings-0.6.7/une.desktop 1970-01-01 01:00:00.000000000 +0100 +++ ubuntu-netbook-remix-default-settings-0.6.8/une.desktop 2009-12-13 14:44:45.000000000 +0100 @@ -0,0 +1,8 @@ +[Desktop Entry] +Name=Ubuntu Netbook Edition +Comment=This session logs you into Ubuntu Netbook Edition +Exec=gnome-session +TryExec=gnome-session +Icon= +Type=Application +X-Ubuntu-Gettext-Domain=une-session diff -Nru ubuntu-netbook-remix-default-settings-0.6.7/une.mandatory.path ubuntu-netbook-remix-default-settings-0.6.8/une.mandatory.path --- ubuntu-netbook-remix-default-settings-0.6.7/une.mandatory.path 1970-01-01 01:00:00.000000000 +0100 +++ ubuntu-netbook-remix-default-settings-0.6.8/une.mandatory.path 2009-12-13 12:57:46.000000000 +0100 @@ -0,0 +1,3 @@ +# Additional mandatory path for une experience +xml:readonly:/var/lib/gconf/une.mandatory +