[meego-packaging] 4968: Changes to Trunk:Netbook/gnome-control-center-netbook
Priya Vijayan
priya.vijayan at intel.com
Mon Jun 28 17:23:23 PDT 2010
Hi,
I have made the following changes to gnome-control-center-netbook in project Trunk:Netbook. Please review and accept ASAP.
Thank You,
Priya Vijayan
[This message was auto-generated]
---
Request #4968:
submit: home:priya:branches:Trunk:Netbook/gnome-control-center-netbook(r2)(cleanup) -> Trunk:Netbook/gnome-control-center-netbook
Message:
Sync with MeeGo 1.0 changes
State: new 2010-06-28T12:19:58 priya
Comment: None
changes files:
--------------
--- gnome-control-center-netbook.changes
+++ gnome-control-center-netbook.changes
@@ -0,0 +1,18 @@
+* Mon Jun 28 2010 Priya Vijayan <priya.vijayan at intel.com> - 2.29.16
+- Sync with MeeGo 1.0 changes
+
+* Thu Jun 24 2010 Ross Burton <ross at linux.intel.com> - 2.29.16
+- Fix the resolution combo in the Display capplet (BMC#2721)
+
+* Tue Jun 22 2010 Zhang Qiang <qiang.z.zhang at intel.com> - 2.29.16
+- Update po file from translate.moblin.org, fix BMC#3342
+
+* Tue Jun 08 2010 Thomas Wood <thomas.wood at intel.com> - 2.29.16
+- Fix BMC#1156 (Can't change the keyboard layout)
+
+* Fri May 14 2010 Thomas Wood <thomas.wood at intel.com> - 2.29.15
+- Fix BMC#1973
+
+* Thu May 13 2010 Thomas Wood <thomas.wood at intel.com> - 2.29.14
+- Fix BMC#1873
+
@@ -2 +20 @@
-- Add a patch to delete Button 'Help' for network setting,
+- Add a patch to delete Button 'Help' for network setting,
@@ -3,0 +22,7 @@
+
+* Wed May 05 2010 Ross Burton <ross at linux.intel.com> - 2.29.13
+- Enable i18n in the shell (MBC#1253)
+
+* Fri Apr 30 2010 Thomas Wood <thomas.wood at intel.com> - 2.29.13
+- Fix BMC#742 BMC#1149
+- Updated translations
old:
----
gnome-control-center-2.29.12.tar.bz2
new:
----
Update-Po-2010-06-21.patch
display-apply.patch
gnome-control-center-2.29.16.tar.bz2
spec files:
-----------
--- gnome-control-center-netbook.spec
+++ gnome-control-center-netbook.spec
@@ -1,13 +1,13 @@
#
# Do not Edit! Generated by:
-# spectacle version 0.16
+# spectacle version 0.17
#
# >> macros
# << macros
Name: gnome-control-center-netbook
Summary: Utilities to configure the netbook desktop
-Version: 2.29.12
+Version: 2.29.16
Release: 1
Group: System/Desktop
License: GPLv2+ and GFDL
@@ -19,6 +19,8 @@
Source4: keyboard.desktop
Source100: gnome-control-center-netbook.yaml
Patch0: MeeGo-patch-out-help-button-for-network.patch
+Patch1: Update-Po-2010-06-21.patch
+Patch2: display-apply.patch
Requires: gnome-settings-daemon
Requires: gnome-icon-theme
Requires: gnome-menus
@@ -28,8 +30,8 @@
Requires(pre): GConf2
Requires(preun): GConf2
Requires(post): /sbin/ldconfig
-Requires(post): /bin/touch
Requires(post): GConf2
+Requires(post): /bin/touch
Requires(postun): /sbin/ldconfig
BuildRequires: pkgconfig(gconf-2.0)
BuildRequires: pkgconfig(gtk+-2.0)
@@ -60,6 +62,7 @@
BuildRequires: gnome-common
Provides: gnome-control-center
+
%description
The GNOME control-center provides a number of extension points
for applications. This package contains directories where applications
@@ -88,6 +91,10 @@
# MeeGo-patch-out-help-button-for-network.patch
%patch0 -p1
+# Update-Po-2010-06-21.patch
+%patch1 -p1
+# display-apply.patch
+%patch2 -p1
# >> setup
# << setup
other changes:
--------------
++++++ Update-Po-2010-06-21.patch (new)
--- Update-Po-2010-06-21.patch
+++ Update-Po-2010-06-21.patch
+diff -uNr gnome-control-center-2.29.16/po/ast.po gnome-control-center-2.29.16.new/po/ast.po
+--- gnome-control-center-2.29.16/po/ast.po 2010-06-09 00:21:42.000000000 +0800
++++ gnome-control-center-2.29.16.new/po/ast.po 2010-06-22 09:34:15.573567082 +0800
+@@ -9,8 +9,8 @@
+ msgstr ""
+ "Project-Id-Version: control-center-2.0\n"
+ "Report-Msgid-Bugs-To: \n"
+-"POT-Creation-Date: 2010-05-19 09:22+0000\n"
+-"PO-Revision-Date: 2010-05-19 20:29+0100\n"
++"POT-Creation-Date: 2010-06-16 09:25+0000\n"
++"PO-Revision-Date: 2010-06-17 13:32+0100\n"
+ "Last-Translator: astur <malditoastur at gmail.com>\n"
+ "Language-Team: Asturian <gnome at softastur.org>\n"
+ "MIME-Version: 1.0\n"
+@@ -2280,7 +2280,7 @@
+ msgid "Keyboard Layout Options"
+ msgstr "Opciones de distribución del tecláu"
+
+-#: ../capplets/keyboard/cc-keyboard-panel.c:163
++#: ../capplets/keyboard/cc-keyboard-panel.c:181
+ #: ../capplets/keyboard/cc-keyboard-page.c:203
+ #: ../capplets/keyboard/keyboard.desktop.in.in.h:1
+ msgid "Keyboard"
+@@ -3274,6 +3274,14 @@
+ msgid "Control Center"
+ msgstr "Centru de control"
+
++#: ../shell/shell.ui.h:1
++msgid "System Settings"
++msgstr "Axustes del Sistema"
++
++#: ../shell/shell.ui.h:2
++msgid "_All Settings"
++msgstr "_Tolos Axustes"
++
+ #: ../typing-break/drw-break-window.c:194
+ msgid "_Postpone Break"
+ msgstr "_Posponer el descansu"
+diff -uNr gnome-control-center-2.29.16/po/de.po gnome-control-center-2.29.16.new/po/de.po
+--- gnome-control-center-2.29.16/po/de.po 2010-06-09 00:21:42.000000000 +0800
++++ gnome-control-center-2.29.16.new/po/de.po 2010-06-22 09:34:15.595567151 +0800
+@@ -19,9 +19,9 @@
+ msgstr ""
+ "Project-Id-Version: gnome-control-center HEAD\n"
+ "Report-Msgid-Bugs-To: \n"
+-"POT-Creation-Date: 2010-05-12 09:40+0000\n"
+-"PO-Revision-Date: 2010-05-12 13:22-0800\n"
+-"Last-Translator: Clara Steiner-Jay <csteiner at aracnet.com>\n"
++"POT-Creation-Date: 2010-06-14 09:21+0000\n"
++"PO-Revision-Date: 2010-06-15 22:59-0800\n"
++"Last-Translator: Andreas Machoy <amachoy at hotmail.com>\n"
+ "Language-Team: German <gnome-de at gnome.org>\n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+@@ -2301,7 +2301,7 @@
+ msgid "Keyboard Layout Options"
+ msgstr "Tastaturbelegungseinstellungen"
+
+-#: ../capplets/keyboard/cc-keyboard-panel.c:163
++#: ../capplets/keyboard/cc-keyboard-panel.c:181
+ #: ../capplets/keyboard/cc-keyboard-page.c:203
+ #: ../capplets/keyboard/keyboard.desktop.in.in.h:1
+ msgid "Keyboard"
+@@ -2765,7 +2765,7 @@
+
+ #: ../capplets/network/gnome-network-properties.ui.h:25
+ msgid "_Use the same proxy for all protocols"
+-msgstr "Den se_lben Proxy für alle Protokolle verwenden"
++msgstr "Den g_leichen Proxy für alle Protokolle verwenden"
+
+ #: ../capplets/security/run-passwd.c:427
+ msgid "Authentication failed"
+@@ -2809,7 +2809,7 @@
+ #: ../capplets/security/run-passwd.c:531
+ #, c-format
+ msgid "Unknown error"
+-msgstr "Unbekanner Fehler"
++msgstr "Unbekannter Fehler"
+
+ #: ../capplets/security/cc-security-panel.c:154
+ msgid "Sorry, the passwords do not match"
+@@ -3306,6 +3306,14 @@
+ msgid "Control Center"
+ msgstr "Kontrollzentrum"
+
++#: ../shell/shell.ui.h:1
++msgid "System Settings"
++msgstr "Systemeinstellungen"
++
++#: ../shell/shell.ui.h:2
++msgid "_All Settings"
++msgstr "_Alle Einstellungen"
++
+ # CHECK
+ #: ../typing-break/drw-break-window.c:194
+ msgid "_Postpone Break"
+@@ -3518,33 +3526,46 @@
+
+ #~ msgid "- GNOME Network Preferences"
+ #~ msgstr "- GNOME Netzwerk-Einstellungen"
++
+ #~ msgid "Choose which accessibility features to enable when you log in"
+ #~ msgstr ""
+ #~ "Die beim Anmelden zu startenden Hilfsmittel für Barrierefreiheit festlegen"
++
+ #~ msgid "Assign shortcut keys to commands"
+ #~ msgstr "Befehlen eine Tastenkombination zuweisen"
++
+ #~ msgid "key not found [%s]\n"
+ #~ msgstr "Schlüssel »%s« konnte nicht gefunden werden\n"
++
+ #~ msgid "Hide on start (useful to preload the shell)"
+ #~ msgstr "Beim Start verbergen (nützlich, um die Shell vorab zu laden)"
++
+ #~ msgid "Filter"
+ #~ msgstr "Filter"
++
+ #~ msgid "Groups"
+ #~ msgstr "Gruppen"
++
+ #~ msgid "Common Tasks"
+ #~ msgstr "Häufige Aktionen"
++
+ #~ msgid "Your filter \"%s\" does not match any items."
+ #~ msgstr "Ihr Filter »%s« führt zu keinen Übereinstimmungen."
++
+ #~ msgid "No matches found."
+ #~ msgstr "Keine Treffer gefunden."
++
+ #~ msgid "Other"
+ #~ msgstr "Sonstige"
++
+ #~ msgid "Start %s"
+ #~ msgstr "%s starten"
++
+ #~ msgid "Help"
+ #~ msgstr "Hilfe"
++
+ #~ msgid "Upgrade"
+ #~ msgstr "Hochrüsten"
++
+ #~ msgid "Uninstall"
+ #~ msgstr "Entfernen"
+-
+diff -uNr gnome-control-center-2.29.16/po/en_GB.po gnome-control-center-2.29.16.new/po/en_GB.po
+--- gnome-control-center-2.29.16/po/en_GB.po 2010-06-09 00:21:42.000000000 +0800
++++ gnome-control-center-2.29.16.new/po/en_GB.po 2010-06-22 09:34:15.603567072 +0800
+@@ -7,8 +7,8 @@
+ msgstr ""
+ "Project-Id-Version: gnome-control-center\n"
+ "Report-Msgid-Bugs-To: \n"
+-"POT-Creation-Date: 2010-04-26 09:38+0000\n"
+-"PO-Revision-Date: 2010-04-27 16:19-0800\n"
++"POT-Creation-Date: 2010-06-08 20:19+0000\n"
++"PO-Revision-Date: 2010-06-08 14:01-0800\n"
+ "Last-Translator: Margie Foster <margie at linux.intel.com>\n"
+ "Language-Team: British English <en at li.org>\n"
+ "MIME-Version: 1.0\n"
+@@ -206,7 +206,7 @@
+
+ #: ../capplets/about-me/gnome-about-me.c:746
+ #: ../capplets/appearance/appearance-desktop.c:659
+-#: ../capplets/appearance/cc-background-page.c:1168
++#: ../capplets/appearance/cc-background-page.c:1171
+ msgid "Images"
+ msgstr "Images"
+
+@@ -785,12 +785,12 @@
+ msgstr "Universal Access"
+
+ #: ../capplets/appearance/appearance-desktop.c:628
+-#: ../capplets/appearance/cc-background-page.c:1133
++#: ../capplets/appearance/cc-background-page.c:1136
+ msgid "Add Wallpaper"
+ msgstr "Add Wallpaper"
+
+ #: ../capplets/appearance/appearance-desktop.c:663
+-#: ../capplets/appearance/cc-background-page.c:1173
++#: ../capplets/appearance/cc-background-page.c:1176
+ msgid "All files"
+ msgstr "All files"
+
+@@ -826,7 +826,7 @@
+ msgstr "Use selected font"
+
+ #: ../capplets/appearance/appearance-main.c:54
+-#: ../capplets/appearance/cc-background-page.c:1414
++#: ../capplets/appearance/cc-background-page.c:1417
+ #: ../capplets/appearance/cc-font-details-dialog.c:408
+ #: ../capplets/appearance/cc-font-page.c:458
+ #: ../capplets/appearance/cc-theme-customize-dialog.c:1203
+@@ -835,7 +835,7 @@
+ #: ../capplets/display/cc-display-minimal-page.c:609
+ #: ../capplets/keyboard/cc-keyboard-page.c:129
+ #: ../capplets/keyboard/cc-shortcuts-page.c:1844
+-#: ../capplets/network/cc-network-proxy-page.c:1287
++#: ../capplets/network/cc-network-proxy-page.c:1285
+ #: ../capplets/power/cc-power-panel.c:374
(9248 more lines skipped)
++++++ display-apply.patch (new)
--- display-apply.patch
+++ display-apply.patch
+diff --git a/capplets/display/cc-display-minimal-page.c b/capplets/display/cc-display-minimal-page.c
+index e9cf66d..0a0a7ff 100644
+--- a/capplets/display/cc-display-minimal-page.c
++++ b/capplets/display/cc-display-minimal-page.c
+@@ -591,6 +591,25 @@ on_toggled (MxGtkLightSwitch *toggle, gboolean state, gpointer user_data)
+ }
+
+ static void
++on_resolution_changed (GtkComboBox *combo, gpointer user_data)
++{
++ CcDisplayPage *page = CC_DISPLAY_PAGE (user_data);
++ GtkTreeModel *model;
++ GtkTreeIter iter;
++ GnomeRRMode *mode;
++
++ if (!gtk_combo_box_get_active_iter (combo, &iter))
++ return;
++
++ model = gtk_combo_box_get_model (combo);
++ gtk_tree_model_get (model, &iter, COL_MODE, &mode, COL_END);
++ g_assert (mode);
++
++ page->priv->external_output->width = gnome_rr_mode_get_width (mode);
++ page->priv->external_output->height = gnome_rr_mode_get_height (mode);
++}
++
++static void
+ setup_page (CcDisplayPage *page)
+ {
+ GtkBuilder *builder;
+@@ -616,6 +635,7 @@ setup_page (CcDisplayPage *page)
+ page->priv->state_label = WID ("state_label");
+ page->priv->resolution_box = WID ("resolution_box");
+ page->priv->resolution_combo = WID ("res_combo");
++ g_signal_connect (page->priv->resolution_combo, "changed", G_CALLBACK (on_resolution_changed), page);
+ page->priv->resolution_store = GTK_TREE_MODEL (gtk_builder_get_object (builder, "mode_store"));
+ widget = WID ("apply_button");
+ g_signal_connect (widget, "clicked", G_CALLBACK (on_apply_button_clicked), page);
++++++ gnome-control-center-2.29.12.tar.bz2 -> gnome-control-center-2.29.16.tar.bz2
28882 lines of diff (skipped)
++++++ gnome-control-center-netbook.yaml
--- gnome-control-center-netbook.yaml
+++ gnome-control-center-netbook.yaml
@@ -1,6 +1,6 @@
Name: gnome-control-center-netbook
Summary: Utilities to configure the netbook desktop
-Version: 2.29.12
+Version: 2.29.16
Release: 1
Group: System/Desktop
License: GPLv2+ and GFDL
@@ -13,6 +13,8 @@
- keyboard.desktop
Patches:
- MeeGo-patch-out-help-button-for-network.patch
+ - Update-Po-2010-06-21.patch
+ - display-apply.patch
Description: |
The GNOME control-center provides a number of extension points
for applications. This package contains directories where applications
More information about the MeeGo-packaging
mailing list