[meego-commits] 8454: Changes to MeeGo:1.1:Netbook:Testing/gnome-control-center-netbook
Thomas Wood
no_reply at build.meego.com
Thu Oct 14 14:45:25 UTC 2010
Hi,
I have made the following changes to gnome-control-center-netbook in project MeeGo:1.1:Netbook:Testing. Please review and accept ASAP.
Thank You,
Thomas Wood
[This message was auto-generated]
---
Request #8454:
submit: home:thomas:branches:MeeGo:1.1:Netbook:Testing/gnome-control-center-netbook(r3)(cleanup) -> MeeGo:1.1:Netbook:Testing/gnome-control-center-netbook
Message:
* Thu Oct 14 2010 Thomas Wood <thomas.wood at intel.com> - 2.30.1
- Fix MeeGo bugs: BMC#3302 BMC#8341 BMC#6884
State: new 2010-10-14T07:45:24 thomas
Comment: None
changes files:
--------------
--- gnome-control-center-netbook.changes
+++ gnome-control-center-netbook.changes
@@ -0,0 +1,3 @@
+* Thu Oct 14 2010 Thomas Wood <thomas.wood at intel.com> - 2.30.1
+- Fix MeeGo bugs: BMC#3302 BMC#8341 BMC#6884
+
new:
----
0013-appearance-Don-t-show-slide-show-backgrounds.patch
meego-translations.tar.bz2
spec files:
-----------
--- gnome-control-center-netbook.spec
+++ gnome-control-center-netbook.spec
@@ -1,6 +1,6 @@
#
-# Do not Edit! Generated by:
-# spectacle version 0.18
+# Do NOT Edit the Auto-generated Part!
+# Generated by: spectacle version 0.20
#
# >> macros
# << macros
@@ -12,12 +12,13 @@
Group: System/Desktop
License: GPLv2+ and GFDL
URL: http://www.gnome.org
-Source0: http://download.gnome.org/sources/gnome-control-center/2.29/gnome-control-center-%{version}.tar.bz2
-Source1: gnome-appearance-properties.desktop
-Source2: gnome-network-properties.desktop
-Source3: gnome-settings-mouse.desktop
-Source4: keyboard.desktop
-Source5: gnome-control-center.desktop
+Source0: http://download.gnome.org/sources/gnome-control-center/2.30/gnome-control-center-%{version}.tar.bz2
+Source1: meego-translations.tar.bz2
+Source2: gnome-appearance-properties.desktop
+Source3: gnome-network-properties.desktop
+Source4: gnome-settings-mouse.desktop
+Source5: keyboard.desktop
+Source6: gnome-control-center.desktop
Source100: gnome-control-center-netbook.yaml
Patch0: 0001-Add-new-shell-and-libgnome-control-center-extension.patch
Patch1: 0002-Add-Appearance-settings-panel.patch
@@ -31,6 +32,7 @@
Patch9: 0010-Add-Power-settings-panel.patch
Patch10: 0011-shell-Don-t-include-both-Personal-and-Look-Feel.patch
Patch11: 0012-Don-t-build-capplets-not-used-by-MeeGo.patch
+Patch12: 0013-appearance-Don-t-show-slide-show-backgrounds.patch
Requires: gnome-settings-daemon
Requires: gnome-icon-theme
Requires: gnome-menus
@@ -98,7 +100,7 @@
%prep
-%setup -q -n gnome-control-center-%{version}
+%setup -a1 -n gnome-control-center-%{version}
# 0001-Add-new-shell-and-libgnome-control-center-extension.patch
%patch0 -p1
@@ -124,6 +126,8 @@
%patch10 -p1
# 0012-Don-t-build-capplets-not-used-by-MeeGo.patch
%patch11 -p1
+# 0013-appearance-Don-t-show-slide-show-backgrounds.patch
+%patch12 -p1
# >> setup
# << setup
@@ -150,11 +154,11 @@
%make_install
# >> install post
-install -m 0644 %{SOURCE1} %{buildroot}/%{_datadir}/applications
install -m 0644 %{SOURCE2} %{buildroot}/%{_datadir}/applications
install -m 0644 %{SOURCE3} %{buildroot}/%{_datadir}/applications
install -m 0644 %{SOURCE4} %{buildroot}/%{_datadir}/applications
install -m 0644 %{SOURCE5} %{buildroot}/%{_datadir}/applications
+install -m 0644 %{SOURCE6} %{buildroot}/%{_datadir}/applications
# << install post
%find_lang gnome-control-center-2.0
other changes:
--------------
++++++ 0001-Add-new-shell-and-libgnome-control-center-extension.patch
--- 0001-Add-new-shell-and-libgnome-control-center-extension.patch
+++ 0001-Add-new-shell-and-libgnome-control-center-extension.patch
@@ -1,7 +1,7 @@
From bf8770fc84696207fad6f60f38123c7b258b4bca Mon Sep 17 00:00:00 2001
From: Thomas Wood <thomas.wood at intel.com>
Date: Fri, 3 Sep 2010 11:43:21 +0100
-Subject: [PATCH 01/12] Add new shell and libgnome-control-center-extension
+Subject: [PATCH 01/13] Add new shell and libgnome-control-center-extension
---
Makefile.am | 6 -
@@ -5856,5 +5856,5 @@
+ </object>
+</interface>
--
-1.7.2.2
+1.7.2.3
++++++ 0002-Add-Appearance-settings-panel.patch
--- 0002-Add-Appearance-settings-panel.patch
+++ 0002-Add-Appearance-settings-panel.patch
@@ -1,7 +1,7 @@
From 9120f7693c74ea1ddb773a16be740381a4f51df4 Mon Sep 17 00:00:00 2001
From: Thomas Wood <thomas.wood at intel.com>
Date: Thu, 26 Aug 2010 15:34:15 +0100
-Subject: [PATCH 02/12] Add Appearance settings panel
+Subject: [PATCH 02/13] Add Appearance settings panel
---
capplets/appearance/Makefile.am | 50 ++++++++-
@@ -613,5 +613,5 @@
capplets/appearance/data/gnome-theme-installer.desktop.in.in
capplets/appearance/data/gnome-theme-package.xml.in
--
-1.7.2.2
+1.7.2.3
++++++ 0003-Add-Date-and-Time-panel.patch
--- 0003-Add-Date-and-Time-panel.patch
+++ 0003-Add-Date-and-Time-panel.patch
@@ -1,7 +1,7 @@
From e970560ed87ec521b715a3a0d7c23614eb1e37de Mon Sep 17 00:00:00 2001
From: Thomas Wood <thomas.wood at intel.com>
Date: Thu, 26 Aug 2010 14:50:20 +0100
-Subject: [PATCH 03/12] Add Date and Time panel
+Subject: [PATCH 03/13] Add Date and Time panel
---
capplets/Makefile.am | 4 +-
@@ -351,5 +351,5 @@
font-viewer/gnome-font-viewer.desktop.in
help/Makefile
--
-1.7.2.2
+1.7.2.3
++++++ 0004-Add-Language-settings-panel.patch
--- 0004-Add-Language-settings-panel.patch
+++ 0004-Add-Language-settings-panel.patch
@@ -1,7 +1,7 @@
From d7c48cdbecc0b38ab853b97d46d594fe152dbbe1 Mon Sep 17 00:00:00 2001
From: Thomas Wood <thomas.wood at intel.com>
Date: Thu, 26 Aug 2010 14:54:07 +0100
-Subject: [PATCH 04/12] Add Language settings panel
+Subject: [PATCH 04/13] Add Language settings panel
---
capplets/Makefile.am | 2 +
@@ -334,5 +334,5 @@
font-viewer/gnome-font-viewer.desktop.in
help/Makefile
--
-1.7.2.2
+1.7.2.3
++++++ 0005-Add-minimal-display-capplet.patch
--- 0005-Add-minimal-display-capplet.patch
+++ 0005-Add-minimal-display-capplet.patch
@@ -1,7 +1,7 @@
From c3f0d824ef0f80be4b945786ae5390405c1d3ed2 Mon Sep 17 00:00:00 2001
From: Thomas Wood <thomas.wood at intel.com>
Date: Thu, 26 Aug 2010 16:04:37 +0100
-Subject: [PATCH 05/12] Add minimal display capplet
+Subject: [PATCH 05/13] Add minimal display capplet
---
capplets/display/Makefile.am | 33 ++-
@@ -1417,5 +1417,5 @@
capplets/display/display-properties.desktop.in.in
capplets/display/xrandr-capplet.c
--
-1.7.2.2
+1.7.2.3
++++++ 0006-Add-Keyboard-and-Shortcuts-settings-panel.patch
--- 0006-Add-Keyboard-and-Shortcuts-settings-panel.patch
+++ 0006-Add-Keyboard-and-Shortcuts-settings-panel.patch
@@ -1,7 +1,7 @@
From b11ceeb0876509f938cb00729409c9980ac13e43 Mon Sep 17 00:00:00 2001
From: Thomas Wood <thomas.wood at intel.com>
Date: Thu, 26 Aug 2010 15:36:35 +0100
-Subject: [PATCH 06/12] Add Keyboard and Shortcuts settings panel
+Subject: [PATCH 06/13] Add Keyboard and Shortcuts settings panel
---
capplets/keyboard/00-multimedia-key.xml.in | 35 +
@@ -5376,5 +5376,5 @@
[type: gettext/glade]capplets/keyboard/gnome-keyboard-properties-a11y-notifications.ui
[type: gettext/glade]capplets/keyboard/gnome-keyboard-properties-dialog.ui
--
-1.7.2.2
+1.7.2.3
++++++ 0007-Add-Pointer-settings-panel.patch
--- 0007-Add-Pointer-settings-panel.patch
+++ 0007-Add-Pointer-settings-panel.patch
@@ -1,7 +1,7 @@
From 6709c4494c22be75348a976ea06c568f51666f07 Mon Sep 17 00:00:00 2001
From: Thomas Wood <thomas.wood at intel.com>
Date: Thu, 26 Aug 2010 15:37:15 +0100
-Subject: [PATCH 07/12] Add Pointer settings panel
+Subject: [PATCH 07/13] Add Pointer settings panel
---
capplets/mouse/Makefile.am | 50 ++++++++-
@@ -593,5 +593,5 @@
capplets/mouse/gnome-mouse-properties.c
[type: gettext/glade]capplets/mouse/gnome-mouse-properties.ui
--
-1.7.2.2
+1.7.2.3
++++++ 0008-Add-Network-settings-panel.patch
--- 0008-Add-Network-settings-panel.patch
+++ 0008-Add-Network-settings-panel.patch
@@ -1,7 +1,7 @@
From 12ea2baf14485cc4bb762e61bb61bec2fc40ed09 Mon Sep 17 00:00:00 2001
From: Thomas Wood <thomas.wood at intel.com>
Date: Thu, 26 Aug 2010 15:37:55 +0100
-Subject: [PATCH 08/12] Add Network settings panel
+Subject: [PATCH 08/13] Add Network settings panel
---
capplets/network/Makefile.am | 49 +-
@@ -1770,5 +1770,5 @@
capplets/network/gnome-network-properties.desktop.in.in
[type: gettext/glade]capplets/network/gnome-network-properties.ui
--
-1.7.2.2
+1.7.2.3
++++++ 0009-Add-Security-settings-panel.patch
--- 0009-Add-Security-settings-panel.patch
+++ 0009-Add-Security-settings-panel.patch
@@ -1,7 +1,7 @@
-From 60fa308ed2203a3fa3fecd5f8b9d1db45ab2e216 Mon Sep 17 00:00:00 2001
+From 5794d6bdbc54c1792ac24fda79177de36a662845 Mon Sep 17 00:00:00 2001
From: Thomas Wood <thomas.wood at intel.com>
-Date: Thu, 26 Aug 2010 15:39:36 +0100
-Subject: [PATCH 09/12] Add Security settings panel
+Date: Tue, 12 Oct 2010 13:04:09 +0100
+Subject: [PATCH 09/13] Add Security settings panel
---
capplets/Makefile.am | 5 +
@@ -1631,13 +1631,13 @@
+}
diff --git a/capplets/security/security.desktop.in.in b/capplets/security/security.desktop.in.in
new file mode 100644
-index 0000000..6e03350
+index 0000000..05aebcc
--- /dev/null
+++ b/capplets/security/security.desktop.in.in
@@ -0,0 +1,9 @@
+[Desktop Entry]
+_Name=Security and passwords
-+Icon=moblin-security
++Icon=netbook-security
+Exec=gnome-control-center security.desktop
+Terminal=false
+Type=Application
@@ -1930,5 +1930,5 @@
capplets/windows/window-properties.desktop.in
font-viewer/gnome-font-viewer.desktop.in
--
-1.7.2.2
+1.7.2.3
++++++ 0010-Add-Power-settings-panel.patch
--- 0010-Add-Power-settings-panel.patch
+++ 0010-Add-Power-settings-panel.patch
@@ -1,7 +1,7 @@
-From c1017d6fe3d8688a4a819b709f67b78f45d82233 Mon Sep 17 00:00:00 2001
-From: Rob Staudinger <robsta at linux.intel.com>
-Date: Thu, 26 Aug 2010 17:07:50 +0200
-Subject: [PATCH 10/12] Add Power settings panel
+From 7dcb4c627185bee4779376dbe04db3b9a11916c0 Mon Sep 17 00:00:00 2001
+From: Thomas Wood <thomas.wood at intel.com>
+Date: Tue, 12 Oct 2010 13:12:25 +0100
+Subject: [PATCH 10/13] Add Power settings panel
---
capplets/Makefile.am | 2 +
@@ -12,7 +12,9 @@
capplets/power/power-properties.desktop.in.in | 9 +
capplets/power/power.ui | 177 +++++++++
configure.ac | 2 +
- 8 files changed, 851 insertions(+), 0 deletions(-)
+ po/POTFILES.in | 3 +
+ po/POTFILES.skip | 1 +
+ 10 files changed, 855 insertions(+), 0 deletions(-)
create mode 100644 capplets/power/Makefile.am
create mode 100644 capplets/power/cc-power-panel.c
create mode 100644 capplets/power/cc-power-panel.h
@@ -727,13 +729,13 @@
+}
diff --git a/capplets/power/power-properties.desktop.in.in b/capplets/power/power-properties.desktop.in.in
new file mode 100644
-index 0000000..46e5436
+index 0000000..f04c4e2
--- /dev/null
+++ b/capplets/power/power-properties.desktop.in.in
@@ -0,0 +1,9 @@
+[Desktop Entry]
+_Name=Power and brightness
-+Icon=moblin-power
++Icon=netbook-power
+Exec=gnome-control-center power.desktop
+Terminal=false
+Type=Application
@@ -936,6 +938,32 @@
capplets/windows/Makefile
capplets/windows/window-properties.desktop.in
capplets/security/Makefile
+diff --git a/po/POTFILES.in b/po/POTFILES.in
+index d3d9039..a10cacf 100644
+--- a/po/POTFILES.in
++++ b/po/POTFILES.in
+@@ -82,6 +82,9 @@ capplets/network/cc-network-panel.c
+ capplets/network/gnome-network-properties.c
+ capplets/network/gnome-network-properties.desktop.in.in
+ [type: gettext/glade]capplets/network/gnome-network-properties.ui
++capplets/power/cc-power-panel.c
++capplets/power/power-properties.desktop.in.in
++[type: gettext/glade]capplets/power/power.ui
+ capplets/security/cc-security-panel.c
+ capplets/security/run-passwd.c
+ capplets/security/security.desktop.in.in
+diff --git a/po/POTFILES.skip b/po/POTFILES.skip
+index 0f60f42..077e574 100644
+--- a/po/POTFILES.skip
++++ b/po/POTFILES.skip
+@@ -12,6 +12,7 @@ capplets/keyboard/keyboard.desktop.in
+ capplets/localization/localization.desktop.in
+ capplets/mouse/gnome-settings-mouse.desktop.in
+ capplets/network/gnome-network-properties.desktop.in
++capplets/power/power-properties.desktop.in
+ capplets/security/security.desktop.in
+ capplets/sound/gnome-settings-sound.desktop.in
+ capplets/windows/window-properties.desktop.in
--
-1.7.2.2
+1.7.2.3
++++++ 0011-shell-Don-t-include-both-Personal-and-Look-Feel.patch
--- 0011-shell-Don-t-include-both-Personal-and-Look-Feel.patch
+++ 0011-shell-Don-t-include-both-Personal-and-Look-Feel.patch
@@ -1,7 +1,7 @@
-From aae9eea23aeabd22ba6b9be80bdafc4e3ec7ff5e Mon Sep 17 00:00:00 2001
+From 4eee4c4ee670fd977e77683ddd5d29fc06a34811 Mon Sep 17 00:00:00 2001
From: William Jon McCann <jmccann at redhat.com>
Date: Sat, 16 Jan 2010 21:17:35 -0500
-Subject: [PATCH 11/12] shell: Don't include both Personal and Look & Feel
+Subject: [PATCH 11/13] shell: Don't include both Personal and Look & Feel
It isn't really clear what the distinction is.
---
@@ -43,5 +43,5 @@
<!-- Internet and Network category -->
<Menu>
--
-1.7.2.2
+1.7.2.3
++++++ 0012-Don-t-build-capplets-not-used-by-MeeGo.patch
--- 0012-Don-t-build-capplets-not-used-by-MeeGo.patch
+++ 0012-Don-t-build-capplets-not-used-by-MeeGo.patch
@@ -1,7 +1,7 @@
-From 9becf7d1731110a0e1c25c149525a01cbb46b835 Mon Sep 17 00:00:00 2001
+From 525f66294291456a84d2c0a63c772b302868314f Mon Sep 17 00:00:00 2001
From: Thomas Wood <thomas.wood at intel.com>
Date: Fri, 27 Aug 2010 15:26:08 +0100
-Subject: [PATCH 12/12] Don't build capplets not used by MeeGo
+Subject: [PATCH 12/13] Don't build capplets not used by MeeGo
---
capplets/Makefile.am | 6 +-----
@@ -30,5 +30,5 @@
DIST_SUBDIRS = \
--
-1.7.2.2
+1.7.2.3
++++++ 0013-appearance-Don-t-show-slide-show-backgrounds.patch (new)
--- 0013-appearance-Don-t-show-slide-show-backgrounds.patch
+++ 0013-appearance-Don-t-show-slide-show-backgrounds.patch
+From 3d621e9c761ed1ec057439f64655a69266b3890e Mon Sep 17 00:00:00 2001
+From: Thomas Wood <thomas.wood at intel.com>
+Date: Fri, 17 Sep 2010 17:45:52 +0100
+Subject: [PATCH 13/13] appearance: Don't show "slide show" backgrounds
+
+Mutter currently does not support slide show backgrounds, so make sure they
+cannot be selected from the list of backgrounds.
+---
+ capplets/appearance/appearance-desktop.c | 3 +++
+ capplets/appearance/gnome-wp-item.c | 3 +++
+ 2 files changed, 6 insertions(+), 0 deletions(-)
+
+diff --git a/capplets/appearance/appearance-desktop.c b/capplets/appearance/appearance-desktop.c
+index 3c5e82e..5eeb865 100644
+--- a/capplets/appearance/appearance-desktop.c
++++ b/capplets/appearance/appearance-desktop.c
+@@ -184,6 +184,9 @@ wp_add_image (AppearanceData *data,
+
+ if (item != NULL)
+ {
++ if (gnome_bg_changes_with_time (item->bg))
++ return NULL;
++
+ if (item->deleted)
+ {
+ item->deleted = FALSE;
+diff --git a/capplets/appearance/gnome-wp-item.c b/capplets/appearance/gnome-wp-item.c
+index 2cf8c3c..dcc32f7 100644
+--- a/capplets/appearance/gnome-wp-item.c
++++ b/capplets/appearance/gnome-wp-item.c
+@@ -73,6 +73,9 @@ static void set_bg_properties (GnomeWPItem *item)
+
+ gnome_bg_set_color (item->bg, item->shade_type, item->pcolor, item->scolor);
+ gnome_bg_set_placement (item->bg, item->options);
++
++ if (item && gnome_bg_changes_with_time (item->bg))
++ item->deleted = TRUE;
+ }
+
+ void gnome_wp_item_ensure_gnome_bg (GnomeWPItem *item)
+--
+1.7.2.3
+
++++++ gnome-control-center-netbook.yaml
--- gnome-control-center-netbook.yaml
+++ gnome-control-center-netbook.yaml
@@ -6,7 +6,8 @@
License: GPLv2+ and GFDL
URL: http://www.gnome.org
Sources:
- - http://download.gnome.org/sources/gnome-control-center/2.29/gnome-control-center-%{version}.tar.bz2
+ - http://download.gnome.org/sources/gnome-control-center/2.30/gnome-control-center-%{version}.tar.bz2
+ - meego-translations.tar.bz2
- gnome-appearance-properties.desktop
- gnome-network-properties.desktop
- gnome-settings-mouse.desktop
@@ -25,12 +26,14 @@
- 0010-Add-Power-settings-panel.patch
- 0011-shell-Don-t-include-both-Personal-and-Look-Feel.patch
- 0012-Don-t-build-capplets-not-used-by-MeeGo.patch
+ - 0013-appearance-Don-t-show-slide-show-backgrounds.patch
Description: |
The GNOME control-center provides a number of extension points
for applications. This package contains directories where applications
can install configuration files that are picked up by the control-center
utilities.
+SetupOptions: -a1 -n gnome-control-center-%{version}
NoDesktop: True
Provides:
- gnome-control-center
++++++ meego-translations.tar.bz2 (new)
More information about the MeeGo-commits
mailing list