Merge lp:~jbicha/ubuntu/saucy/casper/ubuntu-gnome-fix-disabling-lockscreen into lp:ubuntu/saucy/casper

[Jeremy Bícha]

- gnome-shell handles the lockscreen itself and gsettings-desktop-schemas provides the schema, not gnome-screensaver

[lp:~jbicha/ubuntu/saucy/casper/ubuntu-gnome-fix-disabling-lockscreen]

1126. By Jeremy Bícha on 2013-06-25

fix typo, thanks darkxst

[Luke Yelavich (themuso)]

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2013-06-24 10:08:47 +0000
+++ debian/changelog	2013-06-25 02:21:26 +0000
@@ -1,3 +1,13 @@
+casper (1.335) UNRELEASED; urgency=low
+
+  * 22desktop_settings:
+    - Don't require gnome-screensaver to disable the lock screen since
+      Ubuntu GNOME no longer includes gnome-screensaver
+    - Don't override the gnome-shell favorites since that's already
+      handled in ubuntu-gnome-default-settings
+
+ -- Jeremy Bicha <[e-mail]>  Mon, 24 Jun 2013 21:57:59 -0400
+
 casper (1.334) saucy; urgency=low
 
   * Use spaces instead of hyphens for the Name field of ubiquity's .desktop
 
=== modified file 'scripts/casper-bottom/22desktop_settings'
--- scripts/casper-bottom/22desktop_settings	2012-10-03 21:44:46 +0000
+++ scripts/casper-bottom/22desktop_settings	2013-06-25 02:21:26 +0000
@@ -26,23 +26,10 @@
     rm /root/usr/share/glib-2.0/schemas/casper.gschema.override
 fi
 
-gnome_screensaver_version=$(chroot /root dpkg-query -W --showformat='${Version}' gnome-screensaver 2>/dev/null) || gnome_screensaver_version=""
-if [ -n "$gnome_screensaver_version" ]; then
+schemas_version=$(chroot /root /usr/bin/dpkg-query -W --showformat='${Version}' gsettings-desktop-schemas 2>/dev/null) || schemas_version=""
+if [ -n "$schemas_version" ]; then
+    printf "[org.gnome.desktop.lockdown]\ndisable-lock-screen=true\n" >> /root/usr/share/glib-2.0/schemas/casper.gschema.override
     printf "[org.gnome.desktop.screensaver]\nlock-enabled=false\n" >> /root/usr/share/glib-2.0/schemas/casper.gschema.override
-fi
-
-panel_version=$(chroot /root /usr/bin/dpkg-query -W --showformat='${Version}' gsettings-desktop-schemas 2>/dev/null) || panel_version=""
-if [ -n "$panel_version" ]; then
-    printf "[org.gnome.desktop.lockdown]\ndisable-lock-screen=true\n" >> /root/usr/share/glib-2.0/schemas/casper.gschema.override
-fi
-
-if [ -f /root/usr/share/glib-2.0/schemas/10_gnome-shell.gschema.override ]; then
-    sed -i "s/\[ 'epiphany.desktop',/\[ 'ubiquity-gtkui.desktop', 'epiphany.desktop',/" /root/usr/share/glib-2.0/schemas/10_gnome-shell.gschema.override
-fi
-
-if [ -n "$gnome_screensaver_version" ] || [ -n "$panel_version" ] || \
-    [ -f /root/usr/share/glib-2.0/schemas/10_gnome-shell.gschema.override ]
-then
     chroot /root glib-compile-schemas /usr/share/glib-2.0/schemas/
 fi