r45519 - in /desktop/unstable/gdm3/debian: ./ patches/

biebl at users.alioth.debian.org biebl at users.alioth.debian.org
Thu Jul 9 11:12:50 UTC 2015 

Author: biebl
Date: Thu Jul  9 11:12:50 2015
New Revision: 45519

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=45519
Log:
Refresh patches, drop patches which were merged upstream.

Removed:
    desktop/unstable/gdm3/debian/patches/95_systemd-import-language-into-daemon-environment.patch
    desktop/unstable/gdm3/debian/patches/96_plymouth-quit.patch
Modified:
    desktop/unstable/gdm3/debian/changelog
    desktop/unstable/gdm3/debian/patches/08_frequent-users_greeter.patch
    desktop/unstable/gdm3/debian/patches/09_default_session.patch
    desktop/unstable/gdm3/debian/patches/16_xserver_path.patch
    desktop/unstable/gdm3/debian/patches/19_switch_kill_greeter.patch
    desktop/unstable/gdm3/debian/patches/92_systemd_unit.patch
    desktop/unstable/gdm3/debian/patches/94_retain_xorg_log.patch
    desktop/unstable/gdm3/debian/patches/series

Modified: desktop/unstable/gdm3/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm3/debian/changelog?rev=45519&op=diff
==============================================================================
--- desktop/unstable/gdm3/debian/changelog	[utf-8] (original)
+++ desktop/unstable/gdm3/debian/changelog	[utf-8] Thu Jul  9 11:12:50 2015
@@ -1,6 +1,7 @@
 gdm3 (3.14.2-1) UNRELEASED; urgency=medium
 
   * New upstream release.
+  * Refresh patches, drop patches which were merged upstream.
 
  -- Michael Biebl <biebl at debian.org>  Thu, 09 Jul 2015 13:05:28 +0200
 

Modified: desktop/unstable/gdm3/debian/patches/08_frequent-users_greeter.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm3/debian/patches/08_frequent-users_greeter.patch?rev=45519&op=diff
==============================================================================
--- desktop/unstable/gdm3/debian/patches/08_frequent-users_greeter.patch	[utf-8] (original)
+++ desktop/unstable/gdm3/debian/patches/08_frequent-users_greeter.patch	[utf-8] Thu Jul  9 11:12:50 2015
@@ -1,6 +1,8 @@
---- a/daemon/gdm-session.c
-+++ b/daemon/gdm-session.c
-@@ -1891,6 +1891,7 @@
+Index: gdm-3.14.2/daemon/gdm-session.c
+===================================================================
+--- gdm-3.14.2.orig/daemon/gdm-session.c	2015-07-09 13:06:02.127447024 +0200
++++ gdm-3.14.2/daemon/gdm-session.c	2015-07-09 13:06:02.123446952 +0200
+@@ -1977,6 +1977,7 @@
                                 0,
                                 service_name);
  

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=45519&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] Thu Jul  9 11:12:50 2015
@@ -1,9 +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
---- a/daemon/gdm-session.c
-+++ b/daemon/gdm-session.c
-@@ -536,7 +536,7 @@
+Index: gdm-3.14.2/daemon/gdm-session.c
+===================================================================
+--- gdm-3.14.2.orig/daemon/gdm-session.c	2015-07-09 13:06:06.447523437 +0200
++++ gdm-3.14.2/daemon/gdm-session.c	2015-07-09 13:06:06.447523437 +0200
+@@ -546,7 +546,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=45519&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] Thu Jul  9 11:12:50 2015
@@ -1,6 +1,8 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -1244,7 +1244,10 @@
+Index: gdm-3.14.2/configure.ac
+===================================================================
+--- gdm-3.14.2.orig/configure.ac	2015-07-09 13:06:09.183572078 +0200
++++ gdm-3.14.2/configure.ac	2015-07-09 13:06:09.179572007 +0200
+@@ -1236,7 +1236,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/19_switch_kill_greeter.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm3/debian/patches/19_switch_kill_greeter.patch?rev=45519&op=diff
==============================================================================
--- desktop/unstable/gdm3/debian/patches/19_switch_kill_greeter.patch	[utf-8] (original)
+++ desktop/unstable/gdm3/debian/patches/19_switch_kill_greeter.patch	[utf-8] Thu Jul  9 11:12:50 2015
@@ -1,8 +1,8 @@
-Index: gdm3-3.12.2/configure.ac
+Index: gdm-3.14.2/configure.ac
 ===================================================================
---- gdm3-3.12.2.orig/configure.ac	2014-08-13 21:37:53.886754675 +0200
-+++ gdm3-3.12.2/configure.ac	2014-08-14 00:27:12.457744070 +0200
-@@ -274,6 +274,11 @@ AC_ARG_WITH(at-spi-registryd-directory,
+--- gdm-3.14.2.orig/configure.ac	2015-07-09 13:06:14.027658660 +0200
++++ gdm-3.14.2/configure.ac	2015-07-09 13:06:14.027658660 +0200
+@@ -274,6 +274,11 @@
  AT_SPI_REGISTRYD_DIR=$with_at_spi_registryd_directory
  AC_SUBST(AT_SPI_REGISTRYD_DIR)
  
@@ -14,7 +14,7 @@
  # Allow configuration of default PATH
  #
  withval=""
-@@ -991,6 +996,14 @@ AC_SUBST(PLYMOUTH_CFLAGS)
+@@ -991,6 +996,14 @@
  AC_SUBST(PLYMOUTH_LIBS)
  
  dnl ---------------------------------------------------------------------------
@@ -29,11 +29,11 @@
  dnl - Check for D-Bus
  dnl ---------------------------------------------------------------------------
  
-Index: gdm3-3.12.2/daemon/gdm-manager.c
+Index: gdm-3.14.2/daemon/gdm-manager.c
 ===================================================================
---- gdm3-3.12.2.orig/daemon/gdm-manager.c	2014-08-13 23:26:29.000000000 +0200
-+++ gdm3-3.12.2/daemon/gdm-manager.c	2014-08-14 00:57:53.365712128 +0200
-@@ -108,6 +108,8 @@ static void create_seed_session_for_disp
+--- gdm-3.14.2.orig/daemon/gdm-manager.c	2015-07-09 13:06:14.027658660 +0200
++++ gdm-3.14.2/daemon/gdm-manager.c	2015-07-09 13:06:14.027658660 +0200
+@@ -108,6 +108,8 @@
                                               uid_t       allowed_user);
  static void     touch_ran_once_marker_file  (GdmManager *manager);
  
@@ -42,7 +42,7 @@
  static gpointer manager_object = NULL;
  
  static void manager_interface_init (GdmDBusManagerIface *interface);
-@@ -1366,19 +1368,26 @@ on_start_user_session (StartUserSessionO
+@@ -1367,19 +1369,26 @@
           */
          migrated = switch_to_compatible_user_session (operation->manager, operation->session, fail_if_already_switched);
  
@@ -75,11 +75,11 @@
          if (gdm_session_get_display_mode (operation->session) == GDM_SESSION_DISPLAY_MODE_REUSE_VT) {
                  /* In this case, the greeter's display is morphing into
                   * the user session display. Kill the greeter on this session
-Index: gdm3-3.12.2/daemon/gdm-server.c
+Index: gdm-3.14.2/daemon/gdm-server.c
 ===================================================================
---- gdm3-3.12.2.orig/daemon/gdm-server.c	2014-03-19 16:15:29.000000000 +0100
-+++ gdm3-3.12.2/daemon/gdm-server.c	2014-08-14 00:40:52.525234183 +0200
-@@ -276,7 +276,11 @@ gdm_server_init_command (GdmServer *serv
+--- gdm-3.14.2.orig/daemon/gdm-server.c	2015-07-09 13:06:14.027658660 +0200
++++ gdm-3.14.2/daemon/gdm-server.c	2015-07-09 13:06:14.027658660 +0200
+@@ -276,7 +276,11 @@
                  debug_options = "";
          }
  

Modified: desktop/unstable/gdm3/debian/patches/92_systemd_unit.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm3/debian/patches/92_systemd_unit.patch?rev=45519&op=diff
==============================================================================
--- desktop/unstable/gdm3/debian/patches/92_systemd_unit.patch	[utf-8] (original)
+++ desktop/unstable/gdm3/debian/patches/92_systemd_unit.patch	[utf-8] Thu Jul  9 11:12:50 2015
@@ -1,9 +1,9 @@
-Index: gdm3-3.12.1/data/gdm.service.in
+Index: gdm-3.14.2/data/gdm.service.in
 ===================================================================
---- gdm3-3.12.1.orig/data/gdm.service.in	2014-04-27 14:40:14.210580120 +0200
-+++ gdm3-3.12.1/data/gdm.service.in	2014-04-27 14:43:22.350149176 +0200
-@@ -4,12 +4,15 @@ Conflicts=getty at tty@GDM_INITIAL_VT at .serv
- After=systemd-user-sessions.service getty at tty@GDM_INITIAL_VT at .service plymouth-quit.service
+--- gdm-3.14.2.orig/data/gdm.service.in	2015-07-09 13:08:55.990860974 +0200
++++ gdm-3.14.2/data/gdm.service.in	2015-07-09 13:10:17.864673341 +0200
+@@ -20,13 +20,16 @@
+ OnFailure=plymouth-quit.service
  
  [Service]
 -ExecStart=@sbindir@/gdm
@@ -20,6 +20,7 @@
 +#BusName=org.gnome.DisplayManager
  StandardOutput=syslog
  StandardError=inherit
+ EnvironmentFile=- at LANG_CONFIG_FILE@
 -
 -[Install]
 -Alias=display-manager.service

Modified: desktop/unstable/gdm3/debian/patches/94_retain_xorg_log.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm3/debian/patches/94_retain_xorg_log.patch?rev=45519&op=diff
==============================================================================
--- desktop/unstable/gdm3/debian/patches/94_retain_xorg_log.patch	[utf-8] (original)
+++ desktop/unstable/gdm3/debian/patches/94_retain_xorg_log.patch	[utf-8] Thu Jul  9 11:12:50 2015
@@ -5,11 +5,11 @@
 Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=765771
 Forwarded: no
 
-diff --git a/daemon/gdm-server.c b/daemon/gdm-server.c
-index ccb26a3..537f9db 100644
---- a/daemon/gdm-server.c
-+++ b/daemon/gdm-server.c
-@@ -299,12 +299,14 @@ gdm_server_init_command (GdmServer *server)
+Index: gdm-3.14.2/daemon/gdm-server.c
+===================================================================
+--- gdm-3.14.2.orig/daemon/gdm-server.c	2015-07-09 13:10:26.760876885 +0200
++++ gdm-3.14.2/daemon/gdm-server.c	2015-07-09 13:10:26.756876793 +0200
+@@ -303,12 +303,14 @@
          }
  
  #ifdef ENABLE_SYSTEMD_JOURNAL

Modified: desktop/unstable/gdm3/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm3/debian/patches/series?rev=45519&op=diff
==============================================================================
--- desktop/unstable/gdm3/debian/patches/series	[utf-8] (original)
+++ desktop/unstable/gdm3/debian/patches/series	[utf-8] Thu Jul  9 11:12:50 2015
@@ -10,5 +10,3 @@
 92_systemd_unit.patch
 93_disable_gvfs.patch
 94_retain_xorg_log.patch
-95_systemd-import-language-into-daemon-environment.patch
-96_plymouth-quit.patch

More information about the pkg-gnome-commits mailing list