r10702 - in /desktop/unstable/gdm/debian: changelog
patches/37_manpage-binaries.patch patches/46_kde-substitude-uid.patch
patches/55_use-theme-gtkrc.patch patches/66_socket-in-var-run-for-fhs.patch
patches/90_from_svn_fix_gdm_restart.patch patches/series
lool at users.alioth.debian.org
lool at users.alioth.debian.org
Wed May 2 16:14:35 UTC 2007
Author: lool
Date: Wed May 2 16:14:31 2007
New Revision: 10702
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=10702
Log:
* New patch, 37_manpage-binaries, removes mentions of various executables
not present in the Debian package; closes: #357988.
* New patch, 66_socket-in-var-run-for-fhs, use /var/run for the gdm_socket
file to comply with the FHS and to avoid issues with bootclean;
Ubuntu #79620; found in the Ubuntu package.
* New patch, 55_use-theme-gtkrc, look for gtk-2.0/gtkrc in the theme
directory and use it; found in the Ubuntu package.
* New patch, 46_kde-substitude-uid, add X-KDE-SubstituteUID=true to the
gdmsetup desktop file to hide the entry for non-admin users in KDE.
Added:
desktop/unstable/gdm/debian/patches/37_manpage-binaries.patch
desktop/unstable/gdm/debian/patches/46_kde-substitude-uid.patch
desktop/unstable/gdm/debian/patches/55_use-theme-gtkrc.patch
desktop/unstable/gdm/debian/patches/66_socket-in-var-run-for-fhs.patch
Modified:
desktop/unstable/gdm/debian/changelog
desktop/unstable/gdm/debian/patches/90_from_svn_fix_gdm_restart.patch
desktop/unstable/gdm/debian/patches/series
Modified: desktop/unstable/gdm/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm/debian/changelog?rev=10702&op=diff
==============================================================================
--- desktop/unstable/gdm/debian/changelog (original)
+++ desktop/unstable/gdm/debian/changelog Wed May 2 16:14:31 2007
@@ -88,8 +88,17 @@
in Debian though.
* New patch, 90_from_svn_fix_gdm_restart, fixed restarting of gdm when
Ctrl-Alt-Backspace is pressed; from SVN; found in the Ubuntu package.
-
- -- Loic Minier <lool at dooz.org> Wed, 02 May 2007 15:27:02 +0200
+ * New patch, 37_manpage-binaries, removes mentions of various executables
+ not present in the Debian package; closes: #357988.
+ * New patch, 66_socket-in-var-run-for-fhs, use /var/run for the gdm_socket
+ file to comply with the FHS and to avoid issues with bootclean;
+ Ubuntu #79620; found in the Ubuntu package.
+ * New patch, 55_use-theme-gtkrc, look for gtk-2.0/gtkrc in the theme
+ directory and use it; found in the Ubuntu package.
+ * New patch, 46_kde-substitude-uid, add X-KDE-SubstituteUID=true to the
+ gdmsetup desktop file to hide the entry for non-admin users in KDE.
+
+ -- Loic Minier <lool at dooz.org> Wed, 02 May 2007 18:13:45 +0200
gdm (2.16.4-1.1) unstable; urgency=low
Added: desktop/unstable/gdm/debian/patches/37_manpage-binaries.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm/debian/patches/37_manpage-binaries.patch?rev=10702&op=file
==============================================================================
--- desktop/unstable/gdm/debian/patches/37_manpage-binaries.patch (added)
+++ desktop/unstable/gdm/debian/patches/37_manpage-binaries.patch Wed May 2 16:14:31 2007
@@ -1,0 +1,49 @@
+Debian #357988; Remove mentions of gdm-binary, gdm-stop, gdm-restart,
+gdm-safe-restart.
+
+Index: gdm-2.18.1/docs/gdm.1
+===================================================================
+--- gdm-2.18.1.orig/docs/gdm.1 2007-05-02 16:26:23.000000000 +0200
++++ gdm-2.18.1/docs/gdm.1 2007-05-02 16:27:12.000000000 +0200
+@@ -6,15 +6,7 @@
+ .SH SYNOPSIS
+ .B gdm [options]
+ .br
+-.B gdm-binary [options]
+-.br
+ .B gdmsetup [options]
+-.br
+-.B gdm-stop
+-.br
+-.B gdm-restart
+-.br
+-.B gdm-safe-restart
+ .SH DESCRIPTION
+ GDM is a replacement for XDM, the X Display Manager. Unlike its
+ competitors (X3DM, KDM, WDM) GDM was written from scratch and
+@@ -23,15 +15,7 @@
+ See http://www.gnome.org/projects/gdm/ for more details.
+ .P
+ .B gdm
+-is just a script that runs the actual
+-.B gdm-binary
+-executable.
+-.B gdm-stop
+-is a script that stops the current running daemon immediately,
+-.B gdm-restart
+-restarts the current daemon immediately and
+-.B gdm-safe-restart
+-restarts the current daemon after everyone has logged out.
++is main executable.
+ .B gdmsetup
+ is a graphical tool for easily changing the most commonly
+ used options.
+@@ -43,7 +27,7 @@
+ .SH OPTIONS
+ .B gdm
+ and thus also
+-.B gdm-binary
++.B gdm
+ accept the following options:
+ .TP
+ .BI \-nodaemon
Added: desktop/unstable/gdm/debian/patches/46_kde-substitude-uid.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm/debian/patches/46_kde-substitude-uid.patch?rev=10702&op=file
==============================================================================
--- desktop/unstable/gdm/debian/patches/46_kde-substitude-uid.patch (added)
+++ desktop/unstable/gdm/debian/patches/46_kde-substitude-uid.patch Wed May 2 16:14:31 2007
@@ -1,0 +1,15 @@
+Add X-KDE-SubstituteUID=true to the gdmsetup desktop file to hide the entry
+for non-admin users in KDE.
+
+Index: gdm-2.18.1/gui/gdmsetup.desktop.in.in
+===================================================================
+--- gdm-2.18.1.orig/gui/gdmsetup.desktop.in.in 2007-05-02 17:47:25.000000000 +0200
++++ gdm-2.18.1/gui/gdmsetup.desktop.in.in 2007-05-02 17:47:41.000000000 +0200
+@@ -9,6 +9,7 @@
+ Terminal=false
+ Type=Application
+ Categories=GNOME;GTK;Settings;System;
++X-KDE-SubstituteUID=true
+ X-GNOME-Bugzilla-Bugzilla=GNOME
+ X-GNOME-Bugzilla-Product=gdm
+ X-GNOME-Bugzilla-Component=general
Added: desktop/unstable/gdm/debian/patches/55_use-theme-gtkrc.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm/debian/patches/55_use-theme-gtkrc.patch?rev=10702&op=file
==============================================================================
--- desktop/unstable/gdm/debian/patches/55_use-theme-gtkrc.patch (added)
+++ desktop/unstable/gdm/debian/patches/55_use-theme-gtkrc.patch Wed May 2 16:14:31 2007
@@ -1,0 +1,29 @@
+Look for gtk-2.0/gtkrc in the theme directory and use it; found in the Ubuntu
+package.
+
+Index: gdm-2.18.1/gui/greeter/greeter_parser.c
+===================================================================
+--- gdm-2.18.1.orig/gui/greeter/greeter_parser.c 2007-04-09 07:15:10.000000000 +0200
++++ gdm-2.18.1/gui/greeter/greeter_parser.c 2007-05-02 18:09:17.000000000 +0200
+@@ -1781,6 +1781,7 @@
+ xmlChar *prop;
+ gboolean res;
+ GList *items;
++ char *dirtheme, *gtkrc;
+
+ /* FIXME: EVIL! GLOBAL! */
+ g_free (file_search_path);
+@@ -1827,6 +1828,13 @@
+ return NULL;
+ }
+
++ dirtheme = g_path_get_dirname (file);
++ gtkrc = g_build_filename (dirtheme, "gtk-2.0", "gtkrc", NULL);
++ if (g_file_test (gtkrc, G_FILE_TEST_IS_REGULAR))
++ gtk_rc_parse (gtkrc);
++ g_free (dirtheme);
++ g_free (gtkrc);
++
+ /*
+ * The gtk-theme property specifies a theme specific gtk-theme to use
+ */
Added: desktop/unstable/gdm/debian/patches/66_socket-in-var-run-for-fhs.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm/debian/patches/66_socket-in-var-run-for-fhs.patch?rev=10702&op=file
==============================================================================
--- desktop/unstable/gdm/debian/patches/66_socket-in-var-run-for-fhs.patch (added)
+++ desktop/unstable/gdm/debian/patches/66_socket-in-var-run-for-fhs.patch Wed May 2 16:14:31 2007
@@ -1,0 +1,16 @@
+Ubuntu #79620; use /var/run for the gdm_socket file to comply with the FHS and
+to avoid issues with bootclean; found in the Ubuntu package.
+
+Index: gdm-2.18.1/daemon/gdm.h
+===================================================================
+--- gdm-2.18.1.orig/daemon/gdm.h 2007-04-09 07:15:15.000000000 +0200
++++ gdm-2.18.1/daemon/gdm.h 2007-05-02 17:54:03.000000000 +0200
+@@ -798,7 +798,7 @@
+ * all to be grabbed in one pull.
+ */
+ #define GDM_SUP_MAX_MESSAGES 80
+-#define GDM_SUP_SOCKET "/tmp/.gdm_socket"
++#define GDM_SUP_SOCKET "/var/run/gdm_socket"
+
+ /*
+ * The user socket protocol. Each command is given on a separate line
Modified: desktop/unstable/gdm/debian/patches/90_from_svn_fix_gdm_restart.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm/debian/patches/90_from_svn_fix_gdm_restart.patch?rev=10702&op=diff
==============================================================================
--- desktop/unstable/gdm/debian/patches/90_from_svn_fix_gdm_restart.patch (original)
+++ desktop/unstable/gdm/debian/patches/90_from_svn_fix_gdm_restart.patch Wed May 2 16:14:31 2007
@@ -1,6 +1,7 @@
-diff -Nur gdm-2.18.0/daemon/slave.c gdm-2.18.0.new/daemon/slave.c
---- gdm-2.18.0/daemon/slave.c 2007-03-26 17:14:30.000000000 +0200
-+++ gdm-2.18.0.new/daemon/slave.c 2007-03-26 17:14:31.000000000 +0200
+Index: gdm-2.18.1/daemon/slave.c
+===================================================================
+--- gdm-2.18.1.orig/daemon/slave.c 2007-05-02 17:54:12.000000000 +0200
++++ gdm-2.18.1/daemon/slave.c 2007-05-02 17:54:16.000000000 +0200
@@ -160,7 +160,6 @@
/* Local prototypes */
static gint gdm_slave_xerror_handler (Display *disp, XErrorEvent *evt);
@@ -18,7 +19,7 @@
static gboolean return_to_slave_start_jmp = FALSE;
static gboolean already_in_slave_start_jmp = FALSE;
static char *slave_start_jmp_error_to_print = NULL;
-@@ -4519,38 +4516,6 @@
+@@ -4550,38 +4547,6 @@
kill (- (d->sesspid), SIGTERM);
gdm_sigchld_block_pop ();
@@ -57,7 +58,7 @@
finish_session_output (run_post_session /* do_read */);
if (local_login == NULL)
-@@ -4983,14 +4948,6 @@
+@@ -5013,14 +4978,6 @@
return (0);
}
Modified: desktop/unstable/gdm/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm/debian/patches/series?rev=10702&op=diff
==============================================================================
--- desktop/unstable/gdm/debian/patches/series (original)
+++ desktop/unstable/gdm/debian/patches/series Wed May 2 16:14:31 2007
@@ -1,20 +1,24 @@
20_xdm-stuff.patch
30_hardcode-standard-x-server.patch
35_gdm.conf.patch
+37_manpage-binaries.patch
41_config-files.patch
42_pam-and-timed-login.patch
43_clearenv-no-lang-and-buf-decl.patch
45_use-gksu-for-gdmsetup.patch
+46_kde-substitude-uid.patch
47_XKeepsCrashing-restore-keyboard.patch
48_random-greeter-theme.patch
50_close-fds.patch
53_remove-ok-and-cancel-from-included-themes.patch
+55_use-theme-gtkrc.patch
57_gdm-is-local.patch
60_logname-is-log-name-in-PostLogin.patch
61_gdm-manpage-section.patch
62_reference-manual-docbook-entity-reference.patch
64_vt-auto-allocation-fix.patch
65_french-translation-typo.patch
+66_socket-in-var-run-for-fhs.patch
67_C-locale-fallback.patch
68_doc-build-add-revnumber.patch
69_misc-config-typos.patch
More information about the pkg-gnome-commits
mailing list