r22348 - in /desktop/lenny/gnome-system-tools/debian: changelog patches/26_users_home_dir.patch patches/85_users_fix_add_group.patch patches/series
joss at users.alioth.debian.org
joss at users.alioth.debian.org
Sat Nov 14 16:10:58 UTC 2009
Author: joss
Date: Sat Nov 14 16:10:58 2009
New Revision: 22348
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=22348
Log:
* Backport a pair of RC bug fixes.
* 26_users_home_dir.patch: patch from Ubuntu to allow changing root
propertiew without making /home/root the new home directory.
Closes: #488252.
* 85_users_fix_add_group.patch: patch from Ubuntu to always allow to
create groups. Closes: #488249.
Added:
desktop/lenny/gnome-system-tools/debian/patches/26_users_home_dir.patch
desktop/lenny/gnome-system-tools/debian/patches/85_users_fix_add_group.patch
Modified:
desktop/lenny/gnome-system-tools/debian/changelog
desktop/lenny/gnome-system-tools/debian/patches/series
Modified: desktop/lenny/gnome-system-tools/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/lenny/gnome-system-tools/debian/changelog?rev=22348&op=diff
==============================================================================
--- desktop/lenny/gnome-system-tools/debian/changelog [utf-8] (original)
+++ desktop/lenny/gnome-system-tools/debian/changelog [utf-8] Sat Nov 14 16:10:58 2009
@@ -1,3 +1,14 @@
+gnome-system-tools (2.22.0-4) stable; urgency=low
+
+ * Backport a pair of RC bug fixes.
+ * 26_users_home_dir.patch: patch from Ubuntu to allow changing root
+ propertiew without making /home/root the new home directory.
+ Closes: #488252.
+ * 85_users_fix_add_group.patch: patch from Ubuntu to always allow to
+ create groups. Closes: #488249.
+
+ -- Josselin Mouette <joss at debian.org> Sat, 14 Nov 2009 17:10:40 +0100
+
gnome-system-tools (2.22.0-3) unstable; urgency=low
[ Emilio Pozuelo Monfort ]
Added: desktop/lenny/gnome-system-tools/debian/patches/26_users_home_dir.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/lenny/gnome-system-tools/debian/patches/26_users_home_dir.patch?rev=22348&op=file
==============================================================================
--- desktop/lenny/gnome-system-tools/debian/patches/26_users_home_dir.patch (added)
+++ desktop/lenny/gnome-system-tools/debian/patches/26_users_home_dir.patch [utf-8] Sat Nov 14 16:10:58 2009
@@ -1,0 +1,30 @@
+Debian #488252
+Launchpad #198172
+GNOME #523180
+
+Index: ubuntu/src/users/user-settings.c
+===================================================================
+--- ubuntu.orig/src/users/user-settings.c 2008-06-24 17:04:49.000000000 +0100
++++ ubuntu/src/users/user-settings.c 2008-06-24 17:04:49.000000000 +0100
+@@ -347,9 +347,6 @@
+ widget = gst_dialog_get_widget (tool->main_dialog, "user_settings_shell");
+ set_entry_text (GTK_BIN (widget)->child, oobs_user_get_shell (user));
+
+- widget = gst_dialog_get_widget (tool->main_dialog, "user_settings_home");
+- set_entry_text (widget, oobs_user_get_home_directory (user));
+-
+ widget = gst_dialog_get_widget (tool->main_dialog, "user_settings_uid");
+ gtk_spin_button_set_value (GTK_SPIN_BUTTON (widget), oobs_user_get_uid (user));
+ gtk_widget_set_sensitive (GTK_SPIN_BUTTON (widget), FALSE);
+@@ -394,6 +391,11 @@
+ if (!login)
+ table_set_default_profile (GST_USERS_TOOL (tool));
+
++ if (user) {
++ widget = gst_dialog_get_widget (tool->main_dialog, "user_settings_home");
++ set_entry_text (widget, oobs_user_get_home_directory (user));
++ }
++
+ return dialog;
+ }
+
Added: desktop/lenny/gnome-system-tools/debian/patches/85_users_fix_add_group.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/lenny/gnome-system-tools/debian/patches/85_users_fix_add_group.patch?rev=22348&op=file
==============================================================================
--- desktop/lenny/gnome-system-tools/debian/patches/85_users_fix_add_group.patch (added)
+++ desktop/lenny/gnome-system-tools/debian/patches/85_users_fix_add_group.patch [utf-8] Sat Nov 14 16:10:58 2009
@@ -1,0 +1,53 @@
+Debian #488249
+Launchpad #205144
+GNOME #529228
+
+Index: gnome-system-tools-2.22.1/src/users/callbacks.c
+===================================================================
+--- gnome-system-tools-2.22.1.orig/src/users/callbacks.c 2008-09-23 00:27:45.000000000 +0200
++++ gnome-system-tools-2.22.1/src/users/callbacks.c 2009-06-09 16:41:45.204224174 +0200
+@@ -407,7 +407,7 @@ on_group_new_clicked (GtkButton *button,
+ response = group_settings_dialog_run (dialog, group);
+
+ if (response == GTK_RESPONSE_OK) {
+- group_settings_dialog_get_data (group);
++ group = group_settings_dialog_get_group ();
+
+ config = OOBS_GROUPS_CONFIG (GST_USERS_TOOL (tool)->groups_config);
+ groups_list = oobs_groups_config_get_groups (config);
+Index: gnome-system-tools-2.22.1/src/users/group-settings.c
+===================================================================
+--- gnome-system-tools-2.22.1.orig/src/users/group-settings.c 2008-09-23 00:27:45.000000000 +0200
++++ gnome-system-tools-2.22.1/src/users/group-settings.c 2009-06-09 16:41:45.204224174 +0200
+@@ -341,3 +341,19 @@ group_settings_dialog_get_data (OobsGrou
+
+ group_members_table_save (group);
+ }
++
++OobsGroup*
++group_settings_dialog_get_group (void)
++{
++ GtkWidget *widget;
++ OobsGroup *group;
++
++ widget = gst_dialog_get_widget (tool->main_dialog, "group_settings_name");
++ group = oobs_group_new(gtk_entry_get_text (GTK_ENTRY (widget)));
++ widget = gst_dialog_get_widget (tool->main_dialog, "group_settings_gid");
++ oobs_group_set_gid (group, gtk_spin_button_get_value (GTK_SPIN_BUTTON (widget)));
++
++ group_members_table_save (group);
++
++ return group;
++}
+Index: gnome-system-tools-2.22.1/src/users/group-settings.h
+===================================================================
+--- gnome-system-tools-2.22.1.orig/src/users/group-settings.h 2008-09-23 00:27:45.000000000 +0200
++++ gnome-system-tools-2.22.1/src/users/group-settings.h 2009-06-09 16:41:45.204224174 +0200
+@@ -37,6 +37,7 @@ gint group_settings_dialog_run
+
+ gid_t group_settings_find_new_gid (void);
+ void group_settings_dialog_get_data (OobsGroup *group);
++OobsGroup* group_settings_dialog_get_group (void);
+
+
+ #endif /* __GROUP_SETTINGS_H */
Modified: desktop/lenny/gnome-system-tools/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/lenny/gnome-system-tools/debian/patches/series?rev=22348&op=diff
==============================================================================
--- desktop/lenny/gnome-system-tools/debian/patches/series [utf-8] (original)
+++ desktop/lenny/gnome-system-tools/debian/patches/series [utf-8] Sat Nov 14 16:10:58 2009
@@ -1,8 +1,10 @@
18_disable_uid.patch
22_root_only.patch
+26_users_home_dir.patch
40_more-groups.patch
50_min-max-gid.patch
60_save_crash.patch
61_network_auto.patch
62_postgresql.patch
63_hosts_crash.patch
+85_users_fix_add_group.patch
More information about the pkg-gnome-commits
mailing list