r25268 - in /desktop/unstable/gdm3/debian: changelog patches/21_schemas_usr.patch
joss at users.alioth.debian.org
joss at users.alioth.debian.org
Sun Oct 3 08:20:03 UTC 2010
Author: joss
Date: Sun Oct 3 08:19:58 2010
New Revision: 25268
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=25268
Log:
21_schemas_usr.patch: add some comments in the daemon.conf file to
explain the available options. Thanks Joey Hess. Closes: #598666.
Modified:
desktop/unstable/gdm3/debian/changelog
desktop/unstable/gdm3/debian/patches/21_schemas_usr.patch
Modified: desktop/unstable/gdm3/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm3/debian/changelog?rev=25268&op=diff
==============================================================================
--- desktop/unstable/gdm3/debian/changelog [utf-8] (original)
+++ desktop/unstable/gdm3/debian/changelog [utf-8] Sun Oct 3 08:19:58 2010
@@ -1,3 +1,10 @@
+gdm3 (2.30.5-4) UNRELEASED; urgency=low
+
+ * 21_schemas_usr.patch: add some comments in the daemon.conf file to
+ explain the available options. Thanks Joey Hess. Closes: #598666.
+
+ -- Josselin Mouette <joss at debian.org> Sun, 03 Oct 2010 10:19:10 +0200
+
gdm3 (2.30.5-3) unstable; urgency=low
[ Josselin Mouette ]
Modified: desktop/unstable/gdm3/debian/patches/21_schemas_usr.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm3/debian/patches/21_schemas_usr.patch?rev=25268&op=diff
==============================================================================
--- desktop/unstable/gdm3/debian/patches/21_schemas_usr.patch [utf-8] (original)
+++ desktop/unstable/gdm3/debian/patches/21_schemas_usr.patch [utf-8] Sun Oct 3 08:19:58 2010
@@ -1,7 +1,7 @@
Index: gdm-2.30.5/common/test-settings-client.c
===================================================================
--- gdm-2.30.5.orig/common/test-settings-client.c 2010-08-11 16:19:44.000000000 +0200
-+++ gdm-2.30.5/common/test-settings-client.c 2010-09-05 19:47:08.572368325 +0200
++++ gdm-2.30.5/common/test-settings-client.c 2010-10-03 10:15:59.947567340 +0200
@@ -78,7 +78,7 @@ main (int argc, char **argv)
g_type_init ();
@@ -14,7 +14,7 @@
Index: gdm-2.30.5/daemon/factory-slave-main.c
===================================================================
--- gdm-2.30.5.orig/daemon/factory-slave-main.c 2010-08-11 16:19:44.000000000 +0200
-+++ gdm-2.30.5/daemon/factory-slave-main.c 2010-09-05 19:47:08.572368325 +0200
++++ gdm-2.30.5/daemon/factory-slave-main.c 2010-10-03 10:15:59.947567340 +0200
@@ -207,7 +207,7 @@ main (int argc,
exit (1);
}
@@ -27,7 +27,7 @@
Index: gdm-2.30.5/daemon/main.c
===================================================================
--- gdm-2.30.5.orig/daemon/main.c 2010-08-11 19:40:07.000000000 +0200
-+++ gdm-2.30.5/daemon/main.c 2010-09-05 19:47:08.572368325 +0200
++++ gdm-2.30.5/daemon/main.c 2010-10-03 10:15:59.947567340 +0200
@@ -603,7 +603,7 @@ main (int argc,
goto out;
}
@@ -40,7 +40,7 @@
Index: gdm-2.30.5/daemon/product-slave-main.c
===================================================================
--- gdm-2.30.5.orig/daemon/product-slave-main.c 2010-08-11 16:19:44.000000000 +0200
-+++ gdm-2.30.5/daemon/product-slave-main.c 2010-09-05 19:47:08.576369392 +0200
++++ gdm-2.30.5/daemon/product-slave-main.c 2010-10-03 10:15:59.947567340 +0200
@@ -211,7 +211,7 @@ main (int argc,
goto out;
}
@@ -53,7 +53,7 @@
Index: gdm-2.30.5/daemon/session-worker-main.c
===================================================================
--- gdm-2.30.5.orig/daemon/session-worker-main.c 2010-08-11 19:40:07.000000000 +0200
-+++ gdm-2.30.5/daemon/session-worker-main.c 2010-09-05 19:47:08.576369392 +0200
++++ gdm-2.30.5/daemon/session-worker-main.c 2010-10-03 10:15:59.947567340 +0200
@@ -167,7 +167,7 @@ main (int argc,
exit (1);
}
@@ -66,7 +66,7 @@
Index: gdm-2.30.5/daemon/simple-slave-main.c
===================================================================
--- gdm-2.30.5.orig/daemon/simple-slave-main.c 2010-08-11 16:19:44.000000000 +0200
-+++ gdm-2.30.5/daemon/simple-slave-main.c 2010-09-05 19:47:08.576369392 +0200
++++ gdm-2.30.5/daemon/simple-slave-main.c 2010-10-03 10:15:59.947567340 +0200
@@ -214,7 +214,7 @@ main (int argc,
goto out;
}
@@ -88,7 +88,7 @@
Index: gdm-2.30.5/daemon/xdmcp-chooser-slave-main.c
===================================================================
--- gdm-2.30.5.orig/daemon/xdmcp-chooser-slave-main.c 2010-08-11 16:19:44.000000000 +0200
-+++ gdm-2.30.5/daemon/xdmcp-chooser-slave-main.c 2010-09-05 19:47:08.576369392 +0200
++++ gdm-2.30.5/daemon/xdmcp-chooser-slave-main.c 2010-10-03 10:15:59.947567340 +0200
@@ -213,7 +213,7 @@ main (int argc,
goto out;
}
@@ -100,8 +100,8 @@
}
Index: gdm-2.30.5/data/Makefile.am
===================================================================
---- gdm-2.30.5.orig/data/Makefile.am 2010-09-05 19:40:46.000000000 +0200
-+++ gdm-2.30.5/data/Makefile.am 2010-09-05 19:47:08.576369392 +0200
+--- gdm-2.30.5.orig/data/Makefile.am 2010-10-03 10:15:59.715569010 +0200
++++ gdm-2.30.5/data/Makefile.am 2010-10-03 10:15:59.947567340 +0200
@@ -42,7 +42,7 @@ dbusconf_DATA = $(dbusconf_in_files:.con
@INTLTOOL_SCHEMAS_RULE@
@@ -114,7 +114,7 @@
Index: gdm-2.30.5/gui/simple-greeter/greeter-main.c
===================================================================
--- gdm-2.30.5.orig/gui/simple-greeter/greeter-main.c 2010-08-11 16:19:44.000000000 +0200
-+++ gdm-2.30.5/gui/simple-greeter/greeter-main.c 2010-09-05 19:47:08.576369392 +0200
++++ gdm-2.30.5/gui/simple-greeter/greeter-main.c 2010-10-03 10:15:59.947567340 +0200
@@ -257,7 +257,7 @@ main (int argc, char *argv[])
g_type_init ();
@@ -127,7 +127,7 @@
Index: gdm-2.30.5/gui/simple-greeter/test-greeter-login-window.c
===================================================================
--- gdm-2.30.5.orig/gui/simple-greeter/test-greeter-login-window.c 2010-08-11 16:19:44.000000000 +0200
-+++ gdm-2.30.5/gui/simple-greeter/test-greeter-login-window.c 2010-09-05 19:47:08.576369392 +0200
++++ gdm-2.30.5/gui/simple-greeter/test-greeter-login-window.c 2010-10-03 10:15:59.947567340 +0200
@@ -91,7 +91,7 @@ main (int argc, char *argv[])
NULL,
NULL);
@@ -140,7 +140,7 @@
Index: gdm-2.30.5/gui/simple-greeter/test-user-chooser.c
===================================================================
--- gdm-2.30.5.orig/gui/simple-greeter/test-user-chooser.c 2010-08-11 16:19:44.000000000 +0200
-+++ gdm-2.30.5/gui/simple-greeter/test-user-chooser.c 2010-09-05 19:47:08.576369392 +0200
++++ gdm-2.30.5/gui/simple-greeter/test-user-chooser.c 2010-10-03 10:15:59.947567340 +0200
@@ -46,7 +46,7 @@ main (int argc, char *argv[])
gtk_init (&argc, &argv);
@@ -153,7 +153,7 @@
Index: gdm-2.30.5/gui/simple-greeter/test-user-manager.c
===================================================================
--- gdm-2.30.5.orig/gui/simple-greeter/test-user-manager.c 2010-08-11 16:19:44.000000000 +0200
-+++ gdm-2.30.5/gui/simple-greeter/test-user-manager.c 2010-09-05 19:47:08.576369392 +0200
++++ gdm-2.30.5/gui/simple-greeter/test-user-manager.c 2010-10-03 10:15:59.947567340 +0200
@@ -118,7 +118,7 @@ main (int argc, char *argv[])
g_log_set_always_fatal (fatal_mask);
}
@@ -166,7 +166,7 @@
Index: gdm-2.30.5/gui/user-switch-applet/applet.c
===================================================================
--- gdm-2.30.5.orig/gui/user-switch-applet/applet.c 2010-08-11 19:40:07.000000000 +0200
-+++ gdm-2.30.5/gui/user-switch-applet/applet.c 2010-09-05 19:47:32.244370359 +0200
++++ gdm-2.30.5/gui/user-switch-applet/applet.c 2010-10-03 10:15:59.947567340 +0200
@@ -1376,7 +1376,7 @@ fill_applet (PanelApplet *applet)
gtk_window_set_default_icon_name ("stock_people");
g_set_application_name (_("User Switch Applet"));
@@ -178,8 +178,8 @@
}
Index: gdm-2.30.5/gui/gdmsetup/gdmsetup.c
===================================================================
---- gdm-2.30.5.orig/gui/gdmsetup/gdmsetup.c 2010-09-05 19:40:50.000000000 +0200
-+++ gdm-2.30.5/gui/gdmsetup/gdmsetup.c 2010-09-05 19:47:08.580368504 +0200
+--- gdm-2.30.5.orig/gui/gdmsetup/gdmsetup.c 2010-10-03 10:15:59.739563681 +0200
++++ gdm-2.30.5/gui/gdmsetup/gdmsetup.c 2010-10-03 10:15:59.947567340 +0200
@@ -319,7 +319,7 @@ int main (int argc, char **argv)
gtk_init (&argc, &argv);
@@ -189,3 +189,19 @@
g_error ("Unable to initialize settings client");
ui = gtk_builder_new ();
+Index: gdm-2.30.5/data/gdm.conf-custom.in
+===================================================================
+--- gdm-2.30.5.orig/data/gdm.conf-custom.in 2010-10-03 10:16:43.863066033 +0200
++++ gdm-2.30.5/data/gdm.conf-custom.in 2010-10-03 10:18:57.211061579 +0200
+@@ -1,6 +1,11 @@
+ # GDM configuration storage
++#
++# See /usr/share/gdm/gdm.schemas for a list of available options.
++# Some settings can also be configured using the gdmsetup tool.
+
+ [daemon]
++# AutomaticLoginEnable = false
++# AutomaticLogin =
+
+ [security]
+
More information about the pkg-gnome-commits
mailing list