r20288 - in /desktop/unstable/gnome-system-tools/debian: changelog control control.in 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
Tue Jun 9 14:43:32 UTC 2009 

Author: joss
Date: Tue Jun  9 14:43:32 2009
New Revision: 20288

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=20288
Log:
* 26_users_home_dir.patch: patch from Ubuntu to allow changing root 
  propertiew without making /home/root the new home directory.
  Closes: #488252.
* gnome-network-admin breaks network-manager-gnome. Closes: #460691.
* 85_users_fix_add_group.patch: patch from Ubuntu to always allow to 
  create groups. Closes: #488249.

Added:
    desktop/unstable/gnome-system-tools/debian/patches/26_users_home_dir.patch
    desktop/unstable/gnome-system-tools/debian/patches/85_users_fix_add_group.patch
Modified:
    desktop/unstable/gnome-system-tools/debian/changelog
    desktop/unstable/gnome-system-tools/debian/control
    desktop/unstable/gnome-system-tools/debian/control.in
    desktop/unstable/gnome-system-tools/debian/patches/series

Modified: desktop/unstable/gnome-system-tools/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-system-tools/debian/changelog?rev=20288&op=diff
==============================================================================
--- desktop/unstable/gnome-system-tools/debian/changelog (original)
+++ desktop/unstable/gnome-system-tools/debian/changelog Tue Jun  9 14:43:32 2009
@@ -1,9 +1,15 @@
-gnome-system-tools (2.22.1-5) UNRELEASED; urgency=low
+gnome-system-tools (2.22.1-5) unstable; urgency=low
 
   * Revert 2.22.1-4 change with a brown paper bag, it’s useless since 
     policykit depends on consolekit.
-
- -- Josselin Mouette <joss at debian.org>  Tue, 07 Apr 2009 23:49:08 +0200
+  * 26_users_home_dir.patch: patch from Ubuntu to allow changing root 
+    propertiew without making /home/root the new home directory.
+    Closes: #488252.
+  * gnome-network-admin breaks network-manager-gnome. Closes: #460691.
+  * 85_users_fix_add_group.patch: patch from Ubuntu to always allow to 
+    create groups. Closes: #488249.
+
+ -- Josselin Mouette <joss at debian.org>  Tue, 09 Jun 2009 16:43:21 +0200
 
 gnome-system-tools (2.22.1-4) unstable; urgency=low
 

Modified: desktop/unstable/gnome-system-tools/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-system-tools/debian/control?rev=20288&op=diff
==============================================================================
--- desktop/unstable/gnome-system-tools/debian/control (original)
+++ desktop/unstable/gnome-system-tools/debian/control Tue Jun  9 14:43:32 2009
@@ -53,9 +53,8 @@
  Nowadays there are tools for managing:
   - Users and groups
   - Date and time
-  - Network configuration
   - Services
-  - Shares
+  - Shares (NFS and Samba)
 
 Package: gnome-network-admin
 Architecture: any
@@ -63,6 +62,7 @@
          ${shlibs:Depends},
          gnome-system-tools (= ${binary:Version})
 Replaces: gnome-system-tools (<< 2.20.0-3)
+Breaks: network-manager-gnome
 Description: GNOME Network Administration Tool
  The GNOME System Tools are a fully integrated set of tools aimed to make easy
  the job that means the computer administration on an UNIX or Linux system.

Modified: desktop/unstable/gnome-system-tools/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-system-tools/debian/control.in?rev=20288&op=diff
==============================================================================
--- desktop/unstable/gnome-system-tools/debian/control.in (original)
+++ desktop/unstable/gnome-system-tools/debian/control.in Tue Jun  9 14:43:32 2009
@@ -53,9 +53,8 @@
  Nowadays there are tools for managing:
   - Users and groups
   - Date and time
-  - Network configuration
   - Services
-  - Shares
+  - Shares (NFS and Samba)
 
 Package: gnome-network-admin
 Architecture: any
@@ -63,6 +62,7 @@
          ${shlibs:Depends},
          gnome-system-tools (= ${binary:Version})
 Replaces: gnome-system-tools (<< 2.20.0-3)
+Breaks: network-manager-gnome
 Description: GNOME Network Administration Tool
  The GNOME System Tools are a fully integrated set of tools aimed to make easy
  the job that means the computer administration on an UNIX or Linux system.

Added: desktop/unstable/gnome-system-tools/debian/patches/26_users_home_dir.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-system-tools/debian/patches/26_users_home_dir.patch?rev=20288&op=file
==============================================================================
--- desktop/unstable/gnome-system-tools/debian/patches/26_users_home_dir.patch (added)
+++ desktop/unstable/gnome-system-tools/debian/patches/26_users_home_dir.patch Tue Jun  9 14:43:32 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/unstable/gnome-system-tools/debian/patches/85_users_fix_add_group.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-system-tools/debian/patches/85_users_fix_add_group.patch?rev=20288&op=file
==============================================================================
--- desktop/unstable/gnome-system-tools/debian/patches/85_users_fix_add_group.patch (added)
+++ desktop/unstable/gnome-system-tools/debian/patches/85_users_fix_add_group.patch Tue Jun  9 14:43:32 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/unstable/gnome-system-tools/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-system-tools/debian/patches/series?rev=20288&op=diff
==============================================================================
--- desktop/unstable/gnome-system-tools/debian/patches/series (original)
+++ desktop/unstable/gnome-system-tools/debian/patches/series Tue Jun  9 14:43:32 2009
@@ -1,7 +1,9 @@
 01_wait_for_backends.patch
 18_disable_uid.patch
+26_users_home_dir.patch
 40_more-groups.patch
 50_min-max-gid.patch
 60_save_crash.patch
 62_postgresql.patch
 63_hosts_crash.patch
+85_users_fix_add_group.patch

More information about the pkg-gnome-commits mailing list