r47531 - in /desktop/experimental/gdm3/debian: changelog control control.in patches/09_default_session.patch patches/16_xserver_path.patch patches/90_config_comments.patch patches/93_disable_gvfs.patch

ah at users.alioth.debian.org ah at users.alioth.debian.org
Tue Mar 15 20:29:10 UTC 2016


Author: ah
Date: Tue Mar 15 20:29:10 2016
New Revision: 47531

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=47531
Log:
* New upstream release.
* Add build-dependency on xserver-xorg-dev for xorg-server.pc
  - upstream configure.ac now checks for xserver version.
* Bump Standards-Version to 3.9.7.
* Refresh the following patches to apply:
  - debian/patches/09_default_session.patch
  - debian/patches/16_xserver_path.patch
  - debian/patches/90_config_comments.patch
    (Drop greeter section comments as that section was removed.)
  - debian/patches/93_disable_gvfs.patch

Modified:
    desktop/experimental/gdm3/debian/changelog
    desktop/experimental/gdm3/debian/control
    desktop/experimental/gdm3/debian/control.in
    desktop/experimental/gdm3/debian/patches/09_default_session.patch
    desktop/experimental/gdm3/debian/patches/16_xserver_path.patch
    desktop/experimental/gdm3/debian/patches/90_config_comments.patch
    desktop/experimental/gdm3/debian/patches/93_disable_gvfs.patch

Modified: desktop/experimental/gdm3/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gdm3/debian/changelog?rev=47531&op=diff
==============================================================================
--- desktop/experimental/gdm3/debian/changelog	[utf-8] (original)
+++ desktop/experimental/gdm3/debian/changelog	[utf-8] Tue Mar 15 20:29:10 2016
@@ -1,3 +1,18 @@
+gdm3 (3.19.92-1) experimental; urgency=medium
+
+  * New upstream release.
+  * Add build-dependency on xserver-xorg-dev for xorg-server.pc
+    - upstream configure.ac now checks for xserver version.
+  * Bump Standards-Version to 3.9.7.
+  * Refresh the following patches to apply:
+    - debian/patches/09_default_session.patch
+    - debian/patches/16_xserver_path.patch
+    - debian/patches/90_config_comments.patch
+      (Drop greeter section comments as that section was removed.)
+    - debian/patches/93_disable_gvfs.patch
+
+ -- Andreas Henriksson <andreas at fatal.se>  Tue, 15 Mar 2016 21:18:48 +0100
+
 gdm3 (3.18.2-1) unstable; urgency=medium
 
   [ Tim Lunn ]

Modified: desktop/experimental/gdm3/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gdm3/debian/control?rev=47531&op=diff
==============================================================================
--- desktop/experimental/gdm3/debian/control	[utf-8] (original)
+++ desktop/experimental/gdm3/debian/control	[utf-8] Tue Mar 15 20:29:10 2016
@@ -46,8 +46,9 @@
                libaudit-dev [linux-any],
                docbook-xml,
                gsettings-desktop-schemas,
-               libsystemd-dev [linux-any]
-Standards-Version: 3.9.6
+               libsystemd-dev [linux-any],
+               xserver-xorg-dev
+Standards-Version: 3.9.7
 Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/desktop/unstable/gdm3/
 Vcs-Browser: https://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/gdm3/
 

Modified: desktop/experimental/gdm3/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gdm3/debian/control.in?rev=47531&op=diff
==============================================================================
--- desktop/experimental/gdm3/debian/control.in	[utf-8] (original)
+++ desktop/experimental/gdm3/debian/control.in	[utf-8] Tue Mar 15 20:29:10 2016
@@ -42,8 +42,9 @@
                libaudit-dev [linux-any],
                docbook-xml,
                gsettings-desktop-schemas,
-               libsystemd-dev [linux-any]
-Standards-Version: 3.9.6
+               libsystemd-dev [linux-any],
+               xserver-xorg-dev
+Standards-Version: 3.9.7
 Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/desktop/unstable/gdm3/
 Vcs-Browser: https://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/gdm3/
 

Modified: desktop/experimental/gdm3/debian/patches/09_default_session.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gdm3/debian/patches/09_default_session.patch?rev=47531&op=diff
==============================================================================
--- desktop/experimental/gdm3/debian/patches/09_default_session.patch	[utf-8] (original)
+++ desktop/experimental/gdm3/debian/patches/09_default_session.patch	[utf-8] Tue Mar 15 20:29:10 2016
@@ -1,16 +1,14 @@
 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-3.18.2/daemon/gdm-session.c
-===================================================================
---- gdm-3.18.2.orig/daemon/gdm-session.c	2015-11-18 06:40:51.995928039 +0100
-+++ gdm-3.18.2/daemon/gdm-session.c	2015-11-18 06:40:51.991927975 +0100
-@@ -518,7 +518,7 @@
+--- a/daemon/gdm-session.c
++++ b/daemon/gdm-session.c
+@@ -523,7 +523,7 @@
                  }
          }
  
 -        name = g_strdup ("gnome");
 +        name = g_strdup ("default");
-         if (get_session_command_for_name (name, NULL)) {
+         if (get_session_command_for_name (self, name, NULL)) {
                  g_free (self->priv->fallback_session_name);
                  self->priv->fallback_session_name = name;

Modified: desktop/experimental/gdm3/debian/patches/16_xserver_path.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gdm3/debian/patches/16_xserver_path.patch?rev=47531&op=diff
==============================================================================
--- desktop/experimental/gdm3/debian/patches/16_xserver_path.patch	[utf-8] (original)
+++ desktop/experimental/gdm3/debian/patches/16_xserver_path.patch	[utf-8] Tue Mar 15 20:29:10 2016
@@ -1,6 +1,6 @@
 --- a/configure.ac
 +++ b/configure.ac
-@@ -1184,7 +1184,10 @@
+@@ -1182,7 +1182,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/experimental/gdm3/debian/patches/90_config_comments.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gdm3/debian/patches/90_config_comments.patch?rev=47531&op=diff
==============================================================================
--- desktop/experimental/gdm3/debian/patches/90_config_comments.patch	[utf-8] (original)
+++ desktop/experimental/gdm3/debian/patches/90_config_comments.patch	[utf-8] Tue Mar 15 20:29:10 2016
@@ -1,6 +1,6 @@
 --- a/data/gdm.conf-custom.in
 +++ b/data/gdm.conf-custom.in
-@@ -1,18 +1,34 @@
+@@ -1,9 +1,20 @@
  # GDM configuration storage
 +#
 +# See /usr/share/gdm/gdm.schemas for a list of available options.
@@ -21,13 +21,7 @@
  [security]
  
  [xdmcp]
- 
- [greeter]
-+# Only include selected logins in the greeter
-+# IncludeAll = false
-+# Include = user1,user2
- 
- [chooser]
+@@ -12,5 +23,7 @@
  
  [debug]
  # Uncomment the line below to turn on debugging

Modified: desktop/experimental/gdm3/debian/patches/93_disable_gvfs.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gdm3/debian/patches/93_disable_gvfs.patch?rev=47531&op=diff
==============================================================================
--- desktop/experimental/gdm3/debian/patches/93_disable_gvfs.patch	[utf-8] (original)
+++ desktop/experimental/gdm3/debian/patches/93_disable_gvfs.patch	[utf-8] Tue Mar 15 20:29:10 2016
@@ -1,6 +1,6 @@
 --- a/daemon/gdm-launch-environment.c
 +++ b/daemon/gdm-launch-environment.c
-@@ -183,6 +183,9 @@
+@@ -197,6 +197,9 @@
          g_hash_table_insert (hash, g_strdup ("PATH"), g_strdup (g_getenv ("PATH")));
  
          g_hash_table_insert (hash, g_strdup ("RUNNING_UNDER_GDM"), g_strdup ("true"));




More information about the pkg-gnome-commits mailing list