r30454 - in /desktop/unstable/gdm3/debian: changelog patches/01_language.patch patches/02_xnest-wrapper.patch patches/04_no_fatal_criticals.patch patches/09_default_session.patch patches/16_xserver_path.patch patches/20_switch_kill_greeter.patch

biebl at users.alioth.debian.org biebl at users.alioth.debian.org
Fri Oct 14 12:33:21 UTC 2011 

Author: biebl
Date: Fri Oct 14 12:33:21 2011
New Revision: 30454

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=30454
Log:
Refresh patches.

Modified:
    desktop/unstable/gdm3/debian/changelog
    desktop/unstable/gdm3/debian/patches/01_language.patch
    desktop/unstable/gdm3/debian/patches/02_xnest-wrapper.patch
    desktop/unstable/gdm3/debian/patches/04_no_fatal_criticals.patch
    desktop/unstable/gdm3/debian/patches/09_default_session.patch
    desktop/unstable/gdm3/debian/patches/16_xserver_path.patch
    desktop/unstable/gdm3/debian/patches/20_switch_kill_greeter.patch

Modified: desktop/unstable/gdm3/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm3/debian/changelog?rev=30454&op=diff
==============================================================================
--- desktop/unstable/gdm3/debian/changelog [utf-8] (original)
+++ desktop/unstable/gdm3/debian/changelog [utf-8] Fri Oct 14 12:33:21 2011
@@ -2,6 +2,7 @@
 
   * Upload to unstable.
   * Drop Build-Depends on libpolkit-gobject-1-dev and libpolkit-gtk-1-dev.
+  * Refresh patches.
 
  -- Michael Biebl <biebl at debian.org>  Fri, 14 Oct 2011 14:32:20 +0200
 

Modified: desktop/unstable/gdm3/debian/patches/01_language.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm3/debian/patches/01_language.patch?rev=30454&op=diff
==============================================================================
--- desktop/unstable/gdm3/debian/patches/01_language.patch [utf-8] (original)
+++ desktop/unstable/gdm3/debian/patches/01_language.patch [utf-8] Fri Oct 14 12:33:21 2011
@@ -10,11 +10,11 @@
  daemon/gdm-session-direct.c |   18 ++++++++++++------
  1 files changed, 12 insertions(+), 6 deletions(-)
 
-diff --git a/daemon/gdm-session-direct.c b/daemon/gdm-session-direct.c
-index fa8ae49..e977486 100644
---- a/daemon/gdm-session-direct.c
-+++ b/daemon/gdm-session-direct.c
-@@ -2211,6 +2211,8 @@ gdm_session_direct_set_environment_variable (GdmSessionDirect *session,
+Index: gdm-3.0.4/daemon/gdm-session-direct.c
+===================================================================
+--- gdm-3.0.4.orig/daemon/gdm-session-direct.c	2011-05-31 17:46:56.000000000 +0200
++++ gdm-3.0.4/daemon/gdm-session-direct.c	2011-10-14 14:30:55.039767843 +0200
+@@ -1962,6 +1962,8 @@
  static void
  setup_session_environment (GdmSessionDirect *session)
  {
@@ -23,7 +23,7 @@
          gdm_session_direct_set_environment_variable (session,
                                                       "GDMSESSION",
                                                       get_session_name (session));
-@@ -2218,12 +2220,16 @@ setup_session_environment (GdmSessionDirect *session)
+@@ -1969,12 +1971,16 @@
                                                       "DESKTOP_SESSION",
                                                       get_session_name (session));
  
@@ -46,5 +46,3 @@
  
          gdm_session_direct_set_environment_variable (session,
                                                       "DISPLAY",
--- 
-1.7.5.1

Modified: desktop/unstable/gdm3/debian/patches/02_xnest-wrapper.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm3/debian/patches/02_xnest-wrapper.patch?rev=30454&op=diff
==============================================================================
--- desktop/unstable/gdm3/debian/patches/02_xnest-wrapper.patch [utf-8] (original)
+++ desktop/unstable/gdm3/debian/patches/02_xnest-wrapper.patch [utf-8] Fri Oct 14 12:33:21 2011
@@ -1,6 +1,8 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -1163,28 +1163,10 @@
+Index: gdm-3.0.4/configure.ac
+===================================================================
+--- gdm-3.0.4.orig/configure.ac	2011-05-31 18:24:23.000000000 +0200
++++ gdm-3.0.4/configure.ac	2011-10-14 14:31:00.163703427 +0200
+@@ -1169,28 +1169,10 @@
  dnl - Check for Xnest / Xephyr support
  dnl ---------------------------------------------------------------------------
  

Modified: desktop/unstable/gdm3/debian/patches/04_no_fatal_criticals.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm3/debian/patches/04_no_fatal_criticals.patch?rev=30454&op=diff
==============================================================================
--- desktop/unstable/gdm3/debian/patches/04_no_fatal_criticals.patch [utf-8] (original)
+++ desktop/unstable/gdm3/debian/patches/04_no_fatal_criticals.patch [utf-8] Fri Oct 14 12:33:21 2011
@@ -1,8 +1,10 @@
 Temporarly disable fatal-criticals.
 libxklavier bug: http://bugs.freedesktop.org/show_bug.cgi?id=22881
---- a/common/gdm-common.c
-+++ b/common/gdm-common.c
-@@ -68,8 +68,8 @@
+Index: gdm-3.0.4/common/gdm-common.c
+===================================================================
+--- gdm-3.0.4.orig/common/gdm-common.c	2011-05-31 16:52:04.000000000 +0200
++++ gdm-3.0.4/common/gdm-common.c	2011-10-14 14:31:02.923668729 +0200
+@@ -69,8 +69,8 @@
  gdm_set_fatal_warnings_if_unstable (void)
  {
          if (gdm_is_version_unstable ()) {

Modified: desktop/unstable/gdm3/debian/patches/09_default_session.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm3/debian/patches/09_default_session.patch?rev=30454&op=diff
==============================================================================
--- desktop/unstable/gdm3/debian/patches/09_default_session.patch [utf-8] (original)
+++ desktop/unstable/gdm3/debian/patches/09_default_session.patch [utf-8] Fri Oct 14 12:33:21 2011
@@ -1,11 +1,11 @@
 Description: Prefer "default.desktop", so that other desktop environments like XFCE can use gdm, too, without being forced to start GNOME.
 Ubuntu: https://launchpad.net/bugs/403291
 Upstream: https://bugzilla.gnome.org/show_bug.cgi?id=594733
-Index: gdm-2.30.5/daemon/gdm-session-direct.c
+Index: gdm-3.0.4/daemon/gdm-session-direct.c
 ===================================================================
---- gdm-2.30.5.orig/daemon/gdm-session-direct.c	2010-08-11 19:40:07.000000000 +0200
-+++ gdm-2.30.5/daemon/gdm-session-direct.c	2010-09-05 19:39:21.584368320 +0200
-@@ -660,7 +660,7 @@ get_fallback_session_name (GdmSessionDir
+--- gdm-3.0.4.orig/daemon/gdm-session-direct.c	2011-10-14 14:30:55.039767843 +0200
++++ gdm-3.0.4/daemon/gdm-session-direct.c	2011-10-14 14:31:09.575585102 +0200
+@@ -627,7 +627,7 @@
                  }
          }
  

Modified: desktop/unstable/gdm3/debian/patches/16_xserver_path.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm3/debian/patches/16_xserver_path.patch?rev=30454&op=diff
==============================================================================
--- desktop/unstable/gdm3/debian/patches/16_xserver_path.patch [utf-8] (original)
+++ desktop/unstable/gdm3/debian/patches/16_xserver_path.patch [utf-8] Fri Oct 14 12:33:21 2011
@@ -1,8 +1,8 @@
-Index: gdm-2.30.2/configure.ac
+Index: gdm-3.0.4/configure.ac
 ===================================================================
---- gdm-2.30.2.orig/configure.ac	2010-04-27 21:27:38.177532027 +0200
-+++ gdm-2.30.2/configure.ac	2010-04-27 21:29:03.733526716 +0200
-@@ -1129,7 +1129,10 @@ dnl ------------------------------------
+--- gdm-3.0.4.orig/configure.ac	2011-10-14 14:31:15.351512490 +0200
++++ gdm-3.0.4/configure.ac	2011-10-14 14:31:19.227463762 +0200
+@@ -1157,7 +1157,10 @@
  # and /usr/X11 since they often symlink to each other, and configure
  # should use the more stable location (the real directory) if possible.
  #

Modified: desktop/unstable/gdm3/debian/patches/20_switch_kill_greeter.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm3/debian/patches/20_switch_kill_greeter.patch?rev=30454&op=diff
==============================================================================
--- desktop/unstable/gdm3/debian/patches/20_switch_kill_greeter.patch [utf-8] (original)
+++ desktop/unstable/gdm3/debian/patches/20_switch_kill_greeter.patch [utf-8] Fri Oct 14 12:33:21 2011
@@ -28,11 +28,11 @@
  daemon/gdm-simple-slave.c |   15 ++++++++++-----
  3 files changed, 30 insertions(+), 6 deletions(-)
 
-diff --git a/configure.ac b/configure.ac
-index 675f5a6..8bb6c75 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -238,6 +238,11 @@ AC_ARG_WITH(at-spi-registryd-directory,
+Index: gdm-3.0.4/configure.ac
+===================================================================
+--- gdm-3.0.4.orig/configure.ac	2011-10-14 14:31:19.227463762 +0200
++++ gdm-3.0.4/configure.ac	2011-10-14 14:31:29.011340763 +0200
+@@ -272,6 +272,11 @@
  AT_SPI_REGISTRYD_DIR=$with_at_spi_registryd_directory
  AC_SUBST(AT_SPI_REGISTRYD_DIR)
  
@@ -44,7 +44,7 @@
  # Allow configuration of default PATH
  #
  withval=""
-@@ -885,6 +890,14 @@ AM_CONDITIONAL(WITH_CONSOLE_KIT, test x$use_console_kit = xyes)
+@@ -934,6 +939,14 @@
  AC_SUBST(WITH_CONSOLE_KIT)
  
  dnl ---------------------------------------------------------------------------
@@ -59,11 +59,11 @@
  dnl - Check for D-Bus
  dnl ---------------------------------------------------------------------------
  
-diff --git a/daemon/gdm-server.c b/daemon/gdm-server.c
-index 339f3cc..f697a4b 100644
---- a/daemon/gdm-server.c
-+++ b/daemon/gdm-server.c
-@@ -52,6 +52,12 @@
+Index: gdm-3.0.4/daemon/gdm-server.c
+===================================================================
+--- gdm-3.0.4.orig/daemon/gdm-server.c	2011-10-14 14:31:06.839619499 +0200
++++ gdm-3.0.4/daemon/gdm-server.c	2011-10-14 14:31:29.011340763 +0200
+@@ -55,6 +55,12 @@
  
  extern char **environ;
  
@@ -76,7 +76,7 @@
  #define GDM_SERVER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GDM_TYPE_SERVER, GdmServerPrivate))
  
  /* These are the servstat values, also used as server
-@@ -941,7 +947,7 @@ gdm_server_init (GdmServer *server)
+@@ -1155,7 +1161,7 @@
          server->priv = GDM_SERVER_GET_PRIVATE (server);
  
          server->priv->pid = -1;
@@ -85,11 +85,11 @@
          server->priv->log_dir = g_strdup (LOGDIR);
  
          add_ready_handler (server);
-diff --git a/daemon/gdm-simple-slave.c b/daemon/gdm-simple-slave.c
-index ddf7a63..1ce9d03 100644
---- a/daemon/gdm-simple-slave.c
-+++ b/daemon/gdm-simple-slave.c
-@@ -471,12 +471,17 @@ start_session_timeout (GdmSimpleSlave *slave)
+Index: gdm-3.0.4/daemon/gdm-simple-slave.c
+===================================================================
+--- gdm-3.0.4.orig/daemon/gdm-simple-slave.c	2011-10-14 14:31:15.347512541 +0200
++++ gdm-3.0.4/daemon/gdm-simple-slave.c	2011-10-14 14:31:29.015340712 +0200
+@@ -471,12 +471,17 @@
          if (migrated) {
                  destroy_session (slave);
  
@@ -112,5 +112,3 @@
                  goto out;
          }
  
--- 
-1.7.5.1

More information about the pkg-gnome-commits mailing list