reverted: --- gnome-control-center-2.32.1/debian/libgnome-window-settings-dev.debhelper.log +++ gnome-control-center-2.32.1.orig/debian/libgnome-window-settings-dev.debhelper.log @@ -1 +0,0 @@ -dh_autoreconf_clean reverted: --- gnome-control-center-2.32.1/debian/gnome-control-center-dev.debhelper.log +++ gnome-control-center-2.32.1.orig/debian/gnome-control-center-dev.debhelper.log @@ -1 +0,0 @@ -dh_autoreconf_clean diff -u gnome-control-center-2.32.1/debian/changelog gnome-control-center-2.32.1/debian/changelog --- gnome-control-center-2.32.1/debian/changelog +++ gnome-control-center-2.32.1/debian/changelog @@ -1,9 +1,29 @@ -gnome-control-center (1:2.32.1-0ubuntu13.1~stracciatellappa+natty2) natty; urgency=low +gnome-control-center (1:2.32.1-0ubuntu15.1~stracciatellappa+natty1) natty; urgency=low * Rebuild for GNOME Stracciatella PPA - - removed support to appindicator + * debian/control + - removed dependencies from appindicator + * debian/patches + - removed patches: + 06_use_icon_description_in_indicator.patch + 53_ubuntu_show_shell.patch + 54_ubuntu_rename_shell.patch + * removed gnome-control-center.links - -- Gianvito Cavasoli Mon, 18 Apr 2011 11:51:13 +0200 + -- Gianvito Cavasoli Tue, 19 Apr 2011 17:21:04 +0200 + +gnome-control-center (1:2.32.1-0ubuntu15) natty; urgency=low + + * debian/rules: switch rules order to avoid log files in the diff.gz + + -- Sebastien Bacher Tue, 19 Apr 2011 11:31:56 +0200 + +gnome-control-center (1:2.32.1-0ubuntu14) natty; urgency=low + + * debian/patches/06_use_icon_description_in_indicator.patch: + - Add patch to set a description (for A11Y) on indicators (LP: #740729) + + -- Rodrigo Moya Mon, 11 Apr 2011 16:59:07 +0200 gnome-control-center (1:2.32.1-0ubuntu13) natty; urgency=low reverted: --- gnome-control-center-2.32.1/debian/libgnome-window-settings1.debhelper.log +++ gnome-control-center-2.32.1.orig/debian/libgnome-window-settings1.debhelper.log @@ -1 +0,0 @@ -dh_autoreconf_clean diff -u gnome-control-center-2.32.1/debian/control gnome-control-center-2.32.1/debian/control --- gnome-control-center-2.32.1/debian/control +++ gnome-control-center-2.32.1/debian/control @@ -9,7 +9,7 @@ Maintainer: Ubuntu Desktop Team XSBC-Original-Maintainer: Debian GNOME Maintainers Uploaders: Debian GNOME Maintainers -Standards-Version: 3.8.3 +Standards-Version: 3.9.1 Build-Depends: cdbs (>= 0.4.41), hardening-wrapper, gnome-pkg-tools (>= 0.10), diff -u gnome-control-center-2.32.1/debian/rules gnome-control-center-2.32.1/debian/rules --- gnome-control-center-2.32.1/debian/rules +++ gnome-control-center-2.32.1/debian/rules @@ -2,10 +2,10 @@ export DEB_BUILD_HARDENING=1 +include /usr/share/cdbs/1/rules/autoreconf.mk include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/rules/patchsys-quilt.mk include /usr/share/cdbs/1/rules/utils.mk -include /usr/share/cdbs/1/rules/autoreconf.mk include /usr/share/cdbs/1/class/gnome.mk include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk include /usr/share/gnome-pkg-tools/1/rules/gnome-version.mk reverted: --- gnome-control-center-2.32.1/debian/capplets-data.debhelper.log +++ gnome-control-center-2.32.1.orig/debian/capplets-data.debhelper.log @@ -1 +0,0 @@ -dh_autoreconf_clean reverted: --- gnome-control-center-2.32.1/debian/gnome-control-center.debhelper.log +++ gnome-control-center-2.32.1.orig/debian/gnome-control-center.debhelper.log @@ -1 +0,0 @@ -dh_autoreconf_clean diff -u gnome-control-center-2.32.1/debian/control.in gnome-control-center-2.32.1/debian/control.in --- gnome-control-center-2.32.1/debian/control.in +++ gnome-control-center-2.32.1/debian/control.in @@ -4,7 +4,7 @@ Maintainer: Ubuntu Desktop Team XSBC-Original-Maintainer: Debian GNOME Maintainers Uploaders: @GNOME_TEAM@ -Standards-Version: 3.8.3 +Standards-Version: 3.9.1 Build-Depends: cdbs (>= 0.4.41), hardening-wrapper, gnome-pkg-tools (>= 0.10), diff -u gnome-control-center-2.32.1/debian/patches/series gnome-control-center-2.32.1/debian/patches/series --- gnome-control-center-2.32.1/debian/patches/series +++ gnome-control-center-2.32.1/debian/patches/series @@ -3,6 +3,8 @@ 01_remove_debian_default_applications.patch 03_use_libunique.patch 04_keyboard_layout_gconf_names.patch +100_at_properties_readd_gksudo_disable_grab_toggle.patch +113_at_properties_add_visual_bell.patch 16_preferred_applications_list_cleanup.patch 25_window_manager_settings.patch 50_ubuntu_systemwide_prefs.patch only in patch2: unchanged: --- gnome-control-center-2.32.1.orig/debian/patches/100_at_properties_readd_gksudo_disable_grab_toggle.patch +++ gnome-control-center-2.32.1/debian/patches/100_at_properties_readd_gksudo_disable_grab_toggle.patch @@ -0,0 +1,119 @@ +Descrption: No gksu/disable-grab option per gui in gnome-at-properties +Author: ? + +diff -Nur -x '*.orig' -x '*~' gnome-control-center-2.27.91/capplets/accessibility/at-properties/at-enable-dialog.ui gnome-control-center-2.27.91.new/capplets/accessibility/at-properties/at-enable-dialog.ui +--- gnome-control-center-2.27.91/capplets/accessibility/at-properties/at-enable-dialog.ui 2009-08-31 02:16:12.377854799 +0100 ++++ gnome-control-center-2.27.91.new/capplets/accessibility/at-properties/at-enable-dialog.ui 2009-08-31 02:16:15.337854165 +0100 +@@ -98,6 +98,28 @@ + 1 + + ++ ++ ++ True ++ True ++ _Password dialogs as normal windows ++ True ++ True ++ ++ ++ ++ ++ ++ Changes to enable assistive technologies will not take effect until your next log in. ++ ++ ++ ++ ++ False ++ False ++ 2 ++ ++ + + + 1 +diff -Nur -x '*.orig' -x '*~' gnome-control-center-2.27.91/capplets/accessibility/at-properties/main.c gnome-control-center-2.27.91.new/capplets/accessibility/at-properties/main.c +--- gnome-control-center-2.27.91/capplets/accessibility/at-properties/main.c 2009-08-31 02:16:12.373856697 +0100 ++++ gnome-control-center-2.27.91.new/capplets/accessibility/at-properties/main.c 2009-08-31 02:16:15.337854165 +0100 +@@ -21,6 +21,8 @@ + + #define ACCESSIBILITY_KEY "/desktop/gnome/interface/accessibility" + #define ACCESSIBILITY_KEY_DIR "/desktop/gnome/interface" ++#define GKSU_NO_GRAB_KEY "/apps/gksu/disable-grab" ++#define GKSU_NO_GRAB_KEY_DIR "/apps/gksu" + + static gboolean initial_state; + +@@ -211,6 +213,42 @@ + } + + static void ++at_gksudo_update (GConfClient *client, ++ GtkBuilder *builder) ++{ ++ gboolean is_enabled = gconf_client_get_bool (client, GKSU_NO_GRAB_KEY, NULL); ++ GObject *button = gtk_builder_get_object (builder, "at_gksudo_toggle"); ++ ++ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), ++ is_enabled); ++} ++ ++ ++static void ++at_gksudo_changed (GConfClient *client, ++ guint cnxn_id, ++ GConfEntry *entry, ++ gpointer user_data) ++{ ++ at_gksudo_update (client, user_data); ++} ++ ++ ++static void ++at_gksudo_toggled (GtkToggleButton *toggle_button, ++ GtkBuilder *builder) ++{ ++ GConfClient *client = gconf_client_get_default (); ++ gboolean is_enabled = gtk_toggle_button_get_active (toggle_button); ++ ++ gconf_client_set_bool (client, GKSU_NO_GRAB_KEY, ++ is_enabled, ++ NULL); ++ g_object_unref (client); ++} ++ ++ ++static void + setup_dialog (GtkBuilder *builder) + { + GConfClient *client; +@@ -219,7 +257,27 @@ + GObject *peditor; + + client = gconf_client_get_default (); +- ++ ++ //Password grab toggle ++ gconf_client_add_dir (client, GKSU_NO_GRAB_KEY_DIR, ++ GCONF_CLIENT_PRELOAD_ONELEVEL, NULL); ++ ++ object = gtk_builder_get_object (builder, "at_gksudo_toggle"); ++ ++ g_signal_connect (object, "toggled", ++ G_CALLBACK (at_gksudo_toggled), ++ builder); ++ ++ peditor = gconf_peditor_new_boolean (NULL, GKSU_NO_GRAB_KEY, ++ GTK_WIDGET (object), ++ NULL); ++ ++ at_gksudo_update (client, builder); ++ ++ gconf_client_notify_add (client, GKSU_NO_GRAB_KEY_DIR, ++ at_gksudo_changed, ++ builder, NULL, NULL); ++ + gconf_client_add_dir (client, ACCESSIBILITY_KEY_DIR, + GCONF_CLIENT_PRELOAD_ONELEVEL, NULL); + only in patch2: unchanged: --- gnome-control-center-2.32.1.orig/debian/patches/113_at_properties_add_visual_bell.patch +++ gnome-control-center-2.32.1/debian/patches/113_at_properties_add_visual_bell.patch @@ -0,0 +1,117 @@ +Index: gnome-control-center-2.30.1/capplets/accessibility/at-properties/at-enable-dialog.ui +=================================================================== +--- gnome-control-center-2.30.1.orig/capplets/accessibility/at-properties/at-enable-dialog.ui 2010-08-20 20:10:39.451730011 -0400 ++++ gnome-control-center-2.30.1/capplets/accessibility/at-properties/at-enable-dialog.ui 2010-08-20 20:14:55.139510013 -0400 +@@ -120,6 +120,28 @@ + 2 + + ++ ++ ++ True ++ True ++ Enable _visual system bell ++ True ++ True ++ ++ ++ ++ ++ ++ Changes to visual system bell take effect immediately. ++ ++ ++ ++ ++ False ++ False ++ 3 ++ ++ + + + 1 +Index: gnome-control-center-2.30.1/capplets/accessibility/at-properties/main.c +=================================================================== +--- gnome-control-center-2.30.1.orig/capplets/accessibility/at-properties/main.c 2010-08-20 20:15:08.126000011 -0400 ++++ gnome-control-center-2.30.1/capplets/accessibility/at-properties/main.c 2010-08-20 20:28:08.716100014 -0400 +@@ -23,6 +23,8 @@ + #define ACCESSIBILITY_KEY_DIR "/desktop/gnome/interface" + #define GKSU_NO_GRAB_KEY "/apps/gksu/disable-grab" + #define GKSU_NO_GRAB_KEY_DIR "/apps/gksu" ++#define VISUAL_BELL_KEY "/apps/metacity/general/visual_bell" ++#define VISUAL_BELL_KEY_DIR "/apps/metacity/general" + + static gboolean initial_state; + +@@ -248,6 +250,41 @@ + g_object_unref (client); + } + ++static void ++at_visual_bell_update (GConfClient *client, ++ GtkBuilder *builder) ++{ ++ gboolean is_enabled = gconf_client_get_bool (client, VISUAL_BELL_KEY, NULL); ++ GObject *button = gtk_builder_get_object (builder, "at_visual_bell_toggle"); ++ ++ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), ++ is_enabled); ++} ++ ++ ++static void ++at_visual_bell_changed (GConfClient *client, ++ guint cnxn_id, ++ GConfEntry *entry, ++ gpointer user_data) ++{ ++ at_visual_bell_update (client, user_data); ++} ++ ++ ++static void ++at_visual_bell_toggled (GtkToggleButton *toggle_button, ++ GtkBuilder *builder) ++{ ++ GConfClient *client = gconf_client_get_default (); ++ gboolean is_enabled = gtk_toggle_button_get_active (toggle_button); ++ ++ gconf_client_set_bool (client, VISUAL_BELL_KEY, ++ is_enabled, ++ NULL); ++ g_object_unref (client); ++} ++ + + static void + setup_dialog (GtkBuilder *builder) +@@ -279,6 +316,28 @@ + at_gksudo_changed, + builder, NULL, NULL); + ++ ++ // Visual bell toggle ++ gconf_client_add_dir (client, VISUAL_BELL_KEY_DIR, ++ GCONF_CLIENT_PRELOAD_ONELEVEL, NULL); ++ ++ object = gtk_builder_get_object (builder, "at_visual_bell_toggle"); ++ ++ g_signal_connect (object, "toggled", ++ G_CALLBACK (at_visual_bell_toggled), ++ builder); ++ ++ peditor = gconf_peditor_new_boolean (NULL, VISUAL_BELL_KEY, ++ GTK_WIDGET (object), ++ NULL); ++ ++ at_visual_bell_update (client, builder); ++ ++ gconf_client_notify_add (client, VISUAL_BELL_KEY_DIR, ++ at_visual_bell_changed, ++ builder, NULL, NULL); ++ ++ + gconf_client_add_dir (client, ACCESSIBILITY_KEY_DIR, + GCONF_CLIENT_PRELOAD_ONELEVEL, NULL); +