Hello community,

here is the log from the commit of package glib2-branding-openSUSE for 
openSUSE:Factory checked in at 2014-07-17 06:57:49
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/glib2-branding-openSUSE (Old)
 and      /work/SRC/openSUSE:Factory/.glib2-branding-openSUSE.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "glib2-branding-openSUSE"

Changes:
--------
--- 
/work/SRC/openSUSE:Factory/glib2-branding-openSUSE/glib2-branding-openSUSE.changes
  2013-11-13 10:17:00.000000000 +0100
+++ 
/work/SRC/openSUSE:Factory/.glib2-branding-openSUSE.new/glib2-branding-openSUSE.changes
     2014-07-17 06:57:57.000000000 +0200
@@ -1,0 +2,13 @@
+Thu Jul  3 15:09:07 UTC 2014 - [email protected]
+
+- Merge SLE12 specific changes (not enabled on openSUSE):
+  + Enable back audible-bell on SLE12 [bnc#871584]
+  + Change Favorites on gnome-shell:
+    * Remove rhythmbox
+    * Replace Libreoffice Writer with Libreoffice Start Center
+    * Add Yelp
+  + Change the default action of pressing power button to
+    'shutdown'.
+  + Lock the screensaver after 300 seconds.
+
+-------------------------------------------------------------------

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ glib2-branding-openSUSE.spec ++++++
--- /var/tmp/diff_new_pack.8dhWr0/_old  2014-07-17 06:57:58.000000000 +0200
+++ /var/tmp/diff_new_pack.8dhWr0/_new  2014-07-17 06:57:58.000000000 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package glib2-branding-openSUSE
 #
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed

++++++ glib2-branding.gschema.override.in ++++++
--- /var/tmp/diff_new_pack.8dhWr0/_old  2014-07-17 06:57:58.000000000 +0200
+++ /var/tmp/diff_new_pack.8dhWr0/_new  2014-07-17 06:57:58.000000000 +0200
@@ -20,6 +20,7 @@
 picture-options = "stretched"
 primary-color = "#258c06"
 secondary-color = "#258c06"
+@@IF_SLE@@lock-delay = 300
 
 [org.gnome.login-screen]
 ## Logo in the gdm login dialog
@@ -36,8 +37,8 @@
 @@IF_SLE@@theme-name = "novell"
 
 [org.gnome.desktop.wm.preferences]
-## Audible bell is more annoying than useful
-audible-bell = false
+@@IF_openSUSE@@# Audible bell is more annoying than useful
+@@IF_openSUSE@@audible-bell = false
 ### For the theme, we stay with the defaults
 # titlebar-uses-system-font = false
 # titlebar-font = ""
@@ -65,6 +66,7 @@
 # sleep-inactive-ac-timeout = 1200
 # sleep-inactive-battery = true
 # sleep-inactive-battery-timeout = 1200
+button-power = "shutdown"
 
 [org.gnome.settings-daemon.plugins.xsettings]
 ## the PackageKit gtk+ module is too spammy, fdo#23917
@@ -75,7 +77,8 @@
 
 [org.gnome.shell]
 ## Default apps shown in the gnome-shell dash
-favorite-apps = [ 'firefox.desktop', 'evolution.desktop', 'empathy.desktop', 
'rhythmbox.desktop', 'shotwell.desktop', 'writer.desktop', 'nautilus.desktop', 
'gnome-documents.desktop' ]
+@@IF_openSUSE@@favorite-apps = [ 'firefox.desktop', 'evolution.desktop', 
'empathy.desktop', 'rhythmbox.desktop', 'shotwell.desktop', 'writer.desktop', 
'nautilus.desktop', 'gnome-documents.desktop' ]
+@@IF_SLE@@favorite-apps = [ 'firefox.desktop', 'evolution.desktop', 
'empathy.desktop', 'shotwell.desktop', 'startcenter.desktop', 
'nautilus.desktop', 'gnome-documents.desktop', 'yelp.desktop' ]
 ## Default extensions that are enabled
 enabled-extensions = [ 
'alternative-status-m...@gnome-shell-extensions.gcampax.github.com' ]
 

-- 
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to