r40089 - in /desktop/experimental/gdm3/debian: ./ patches/
sjoerd at users.alioth.debian.org
sjoerd at users.alioth.debian.org
Wed Oct 23 20:21:21 UTC 2013
Author: sjoerd
Date: Wed Oct 23 20:21:20 2013
New Revision: 40089
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=40089
Log:
* New upstream release (3.10.0.1)
* Switch from consolekit to systemd-logind sessions. For some reason
gnome-shell 3.10 unlocking fails with consolekit...
* debian/patches/*: Refreshed
Modified:
desktop/experimental/gdm3/debian/changelog
desktop/experimental/gdm3/debian/control.in
desktop/experimental/gdm3/debian/patches/07_libexec-paths.patch
desktop/experimental/gdm3/debian/patches/08_frequent-users_greeter.patch
desktop/experimental/gdm3/debian/patches/10_gdm3_pam.patch
desktop/experimental/gdm3/debian/patches/16_xserver_path.patch
desktop/experimental/gdm3/debian/patches/20_credentials.patch
desktop/experimental/gdm3/debian/patches/22_noconsole.patch
desktop/experimental/gdm3/debian/patches/96_check_libs.patch
desktop/experimental/gdm3/debian/rules
Modified: desktop/experimental/gdm3/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gdm3/debian/changelog?rev=40089&op=diff
==============================================================================
--- desktop/experimental/gdm3/debian/changelog [utf-8] (original)
+++ desktop/experimental/gdm3/debian/changelog [utf-8] Wed Oct 23 20:21:20 2013
@@ -1,9 +1,16 @@
-gdm3 (3.8.4-3) UNRELEASED; urgency=low
-
+gdm3 (3.10.0.1-1) UNRELEASED; urgency=low
+
+ [ Michael Biebl ]
* Drop Depends on policykit-1-gnome, with the gdm-fallback session gone,
this dependency is no longer required.
- -- Michael Biebl <biebl at debian.org> Tue, 15 Oct 2013 19:07:00 +0200
+ [ Sjoerd Simons ]
+ * New upstream release (3.10.0.1)
+ * Switch from consolekit to systemd-logind sessions. For some reason
+ gnome-shell 3.10 unlocking fails with consolekit...
+ * debian/patches/*: Refreshed
+
+ -- Sjoerd Simons <sjoerd at debian.org> Wed, 23 Oct 2013 22:04:24 +0200
gdm3 (3.8.4-2) unstable; urgency=low
Modified: desktop/experimental/gdm3/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gdm3/debian/control.in?rev=40089&op=diff
==============================================================================
--- desktop/experimental/gdm3/debian/control.in [utf-8] (original)
+++ desktop/experimental/gdm3/debian/control.in [utf-8] Wed Oct 23 20:21:20 2013
@@ -41,7 +41,9 @@
iso-codes,
libaudit-dev [linux-any],
docbook-xml,
- gsettings-desktop-schemas
+ gsettings-desktop-schemas,
+ libsystemd-login-dev (>= 186),
+ libsystemd-daemon-dev (>= 186)
Standards-Version: 3.9.4
Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/desktop/unstable/gdm3/
Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/gdm3/
Modified: desktop/experimental/gdm3/debian/patches/07_libexec-paths.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gdm3/debian/patches/07_libexec-paths.patch?rev=40089&op=diff
==============================================================================
--- desktop/experimental/gdm3/debian/patches/07_libexec-paths.patch [utf-8] (original)
+++ desktop/experimental/gdm3/debian/patches/07_libexec-paths.patch [utf-8] Wed Oct 23 20:21:20 2013
@@ -1,9 +1,7 @@
GNOME #645918
-Index: gdm-3.7.2/gui/simple-chooser/gdm-chooser-session.c
-===================================================================
---- gdm-3.7.2.orig/gui/simple-chooser/gdm-chooser-session.c 2012-09-21 10:42:45.000000000 +1200
-+++ gdm-3.7.2/gui/simple-chooser/gdm-chooser-session.c 2012-12-04 10:38:35.099982294 +1300
+--- a/gui/simple-chooser/gdm-chooser-session.c
++++ b/gui/simple-chooser/gdm-chooser-session.c
@@ -133,7 +133,7 @@
ret = FALSE;
@@ -13,19 +11,17 @@
if (error != NULL) {
g_warning ("Error starting settings daemon: %s", error->message);
g_error_free (error);
-Index: gdm-3.7.2/configure.ac
-===================================================================
---- gdm-3.7.2.orig/configure.ac 2012-11-20 02:48:01.000000000 +1300
-+++ gdm-3.7.2/configure.ac 2012-12-04 10:38:35.099982294 +1300
-@@ -74,6 +74,7 @@
- FONTCONFIG_REQUIRED_VERSION=2.5.0
- UPOWER_REQUIRED_VERSION=0.9.0
+--- a/configure.ac
++++ b/configure.ac
+@@ -67,6 +67,7 @@
+ GTK_REQUIRED_VERSION=2.91.1
+ LIBCANBERRA_GTK_REQUIRED_VERSION=0.4
ACCOUNTS_SERVICE_REQUIRED_VERSION=0.6.12
+GSD_REQUIRED_VERSION=2.91.2
- NSS_REQUIRED_VERSION=3.11.1
EXTRA_COMPILE_WARNINGS(yes)
-@@ -185,6 +186,16 @@
+
+@@ -156,6 +157,16 @@
AC_SUBST(LIBGDM_GIR_INCLUDES)
dnl ---------------------------------------------------------------------------
@@ -42,11 +38,9 @@
dnl - Configuration file stuff
dnl ---------------------------------------------------------------------------
-Index: gdm-3.7.2/gui/simple-chooser/Makefile.am
-===================================================================
---- gdm-3.7.2.orig/gui/simple-chooser/Makefile.am 2012-07-20 00:08:17.000000000 +1200
-+++ gdm-3.7.2/gui/simple-chooser/Makefile.am 2012-12-04 10:38:35.099982294 +1300
-@@ -14,6 +14,7 @@
+--- a/gui/simple-chooser/Makefile.am
++++ b/gui/simple-chooser/Makefile.am
+@@ -13,6 +13,7 @@
-DSBINDIR=\""$(sbindir)"\" \
-DPIXMAPDIR=\""$(pixmapdir)"\" \
-DAT_SPI_REGISTRYD_DIR="\"$(AT_SPI_REGISTRYD_DIR)\"" \
Modified: desktop/experimental/gdm3/debian/patches/08_frequent-users_greeter.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gdm3/debian/patches/08_frequent-users_greeter.patch?rev=40089&op=diff
==============================================================================
--- desktop/experimental/gdm3/debian/patches/08_frequent-users_greeter.patch [utf-8] (original)
+++ desktop/experimental/gdm3/debian/patches/08_frequent-users_greeter.patch [utf-8] Wed Oct 23 20:21:20 2013
@@ -1,8 +1,6 @@
-Index: gdm-3.7.3.1/daemon/gdm-session.c
-===================================================================
---- gdm-3.7.3.1.orig/daemon/gdm-session.c 2012-12-24 23:00:39.576975236 -0500
-+++ gdm-3.7.3.1/daemon/gdm-session.c 2012-12-24 23:00:43.312975080 -0500
-@@ -1910,6 +1910,7 @@
+--- a/daemon/gdm-session.c
++++ b/daemon/gdm-session.c
+@@ -1914,6 +1914,7 @@
0,
service_name);
Modified: desktop/experimental/gdm3/debian/patches/10_gdm3_pam.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gdm3/debian/patches/10_gdm3_pam.patch?rev=40089&op=diff
==============================================================================
--- desktop/experimental/gdm3/debian/patches/10_gdm3_pam.patch [utf-8] (original)
+++ desktop/experimental/gdm3/debian/patches/10_gdm3_pam.patch [utf-8] Wed Oct 23 20:21:20 2013
@@ -1,6 +1,6 @@
--- a/daemon/gdm-simple-slave.c
+++ b/daemon/gdm-simple-slave.c
-@@ -613,7 +613,7 @@
+@@ -614,7 +614,7 @@
g_debug ("GdmSimpleSlave: session conversation started for service %s", service_name);
@@ -9,7 +9,7 @@
return;
}
-@@ -658,7 +658,8 @@
+@@ -659,7 +659,8 @@
}
g_debug ("GdmSimpleSlave: Starting automatic login conversation");
@@ -21,7 +21,7 @@
static void
--- a/configure.ac
+++ b/configure.ac
-@@ -514,6 +514,21 @@
+@@ -495,6 +495,21 @@
fi
AC_SUBST(PAM_PREFIX)
@@ -45,7 +45,7 @@
--- a/daemon/Makefile.am
+++ b/daemon/Makefile.am
-@@ -21,6 +21,7 @@
+@@ -20,6 +20,7 @@
-DGDM_SCREENSHOT_DIR=\"$(GDM_SCREENSHOT_DIR)\" \
-DGDM_CACHE_DIR=\""$(localstatedir)/cache/gdm"\" \
-DGDM_SESSION_DEFAULT_PATH=\"$(GDM_SESSION_DEFAULT_PATH)\" \
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=40089&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] Wed Oct 23 20:21:20 2013
@@ -1,6 +1,6 @@
--- a/configure.ac
+++ b/configure.ac
-@@ -1260,7 +1260,10 @@
+@@ -1240,7 +1240,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/20_credentials.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gdm3/debian/patches/20_credentials.patch?rev=40089&op=diff
==============================================================================
--- desktop/experimental/gdm3/debian/patches/20_credentials.patch [utf-8] (original)
+++ desktop/experimental/gdm3/debian/patches/20_credentials.patch [utf-8] Wed Oct 23 20:21:20 2013
@@ -1,58 +1,58 @@
---- a/daemon/gdm-session.c 2013-10-12 10:43:49.000000000 +0200
-+++ b/daemon/gdm-session.c 2013-10-12 11:02:30.000000000 +0200
-@@ -970,28 +970,6 @@
- return FALSE;
- }
-
--static GPid
--credentials_get_unix_pid (GCredentials *credentials)
--{
-- GPid pid = 0;
-- gpointer native_credentials = NULL;
--
--#ifdef __linux__
-- native_credentials = g_credentials_get_native (credentials, G_CREDENTIALS_TYPE_LINUX_UCRED);
-- pid = (GPid) ((struct ucred *) native_credentials)->pid;
--#elif defined (__FreeBSD__)
-- native_credentials = g_credentials_get_native (credentials, G_CREDENTIALS_TYPE_OPENBSD_SOCKPEERCRED);
-- pid = (GPid) ((struct cmsgcred *) native_credentials)->cmcred_pid;
--#elif defined (__OpenBSD__)
-- native_credentials = g_credentials_get_native (credentials, G_CREDENTIALS_TYPE_OPENBSD_SOCKPEERCRED);
-- pid = (GPid) ((struct sockpeercred *) native_credentials)->pid;
--#else
--#error "platform not supported, need mechanism to detect pid of connected process"
--#endif
--
-- return pid;
--}
--
- static gboolean
- register_worker (GdmDBusWorkerManager *worker_manager_interface,
- GDBusMethodInvocation *invocation,
-@@ -1021,7 +999,7 @@
- connection_node);
-
- credentials = g_dbus_connection_get_peer_credentials (connection);
-- pid = credentials_get_unix_pid (credentials);
-+ pid = g_credentials_get_unix_pid (credentials, NULL);
-
- conversation = find_conversation_by_pid (self, (GPid) pid);
-
-@@ -1479,7 +1457,7 @@
- connection);
-
- credentials = g_dbus_connection_get_peer_credentials (connection);
-- pid_of_client = credentials_get_unix_pid (credentials);
-+ pid_of_client = g_credentials_get_unix_pid (credentials, NULL);
-
- g_signal_emit (G_OBJECT (self),
- signals [CLIENT_DISCONNECTED],
-@@ -1531,7 +1509,7 @@
- }
-
- credentials = g_dbus_connection_get_peer_credentials (connection);
-- pid_of_client = credentials_get_unix_pid (credentials);
-+ pid_of_client = g_credentials_get_unix_pid (credentials, NULL);
-
- g_signal_emit (G_OBJECT (self),
- signals [CLIENT_CONNECTED],
+--- a/daemon/gdm-session.c
++++ b/daemon/gdm-session.c
+@@ -970,28 +970,6 @@
+ return FALSE;
+ }
+
+-static GPid
+-credentials_get_unix_pid (GCredentials *credentials)
+-{
+- GPid pid = 0;
+- gpointer native_credentials = NULL;
+-
+-#ifdef __linux__
+- native_credentials = g_credentials_get_native (credentials, G_CREDENTIALS_TYPE_LINUX_UCRED);
+- pid = (GPid) ((struct ucred *) native_credentials)->pid;
+-#elif defined (__FreeBSD__)
+- native_credentials = g_credentials_get_native (credentials, G_CREDENTIALS_TYPE_OPENBSD_SOCKPEERCRED);
+- pid = (GPid) ((struct cmsgcred *) native_credentials)->cmcred_pid;
+-#elif defined (__OpenBSD__)
+- native_credentials = g_credentials_get_native (credentials, G_CREDENTIALS_TYPE_OPENBSD_SOCKPEERCRED);
+- pid = (GPid) ((struct sockpeercred *) native_credentials)->pid;
+-#else
+-#error "platform not supported, need mechanism to detect pid of connected process"
+-#endif
+-
+- return pid;
+-}
+-
+ static gboolean
+ register_worker (GdmDBusWorkerManager *worker_manager_interface,
+ GDBusMethodInvocation *invocation,
+@@ -1021,7 +999,7 @@
+ connection_node);
+
+ credentials = g_dbus_connection_get_peer_credentials (connection);
+- pid = credentials_get_unix_pid (credentials);
++ pid = g_credentials_get_unix_pid (credentials, NULL);
+
+ conversation = find_conversation_by_pid (self, (GPid) pid);
+
+@@ -1479,7 +1457,7 @@
+ connection);
+
+ credentials = g_dbus_connection_get_peer_credentials (connection);
+- pid_of_client = credentials_get_unix_pid (credentials);
++ pid_of_client = g_credentials_get_unix_pid (credentials, NULL);
+
+ g_signal_emit (G_OBJECT (self),
+ signals [CLIENT_DISCONNECTED],
+@@ -1531,7 +1509,7 @@
+ }
+
+ credentials = g_dbus_connection_get_peer_credentials (connection);
+- pid_of_client = credentials_get_unix_pid (credentials);
++ pid_of_client = g_credentials_get_unix_pid (credentials, NULL);
+
+ g_signal_emit (G_OBJECT (self),
+ signals [CLIENT_CONNECTED],
Modified: desktop/experimental/gdm3/debian/patches/22_noconsole.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gdm3/debian/patches/22_noconsole.patch?rev=40089&op=diff
==============================================================================
--- desktop/experimental/gdm3/debian/patches/22_noconsole.patch [utf-8] (original)
+++ desktop/experimental/gdm3/debian/patches/22_noconsole.patch [utf-8] Wed Oct 23 20:21:20 2013
@@ -99,7 +99,7 @@
GError **error);
--- a/daemon/main.c
+++ b/daemon/main.c
-@@ -446,6 +446,7 @@
+@@ -440,6 +440,7 @@
gpointer user_data)
{
gboolean xdmcp_enabled;
@@ -107,7 +107,7 @@
manager = gdm_manager_new ();
if (manager == NULL) {
-@@ -457,6 +458,10 @@
+@@ -451,6 +452,10 @@
gdm_manager_start (manager);
@@ -120,7 +120,7 @@
gdm_manager_set_xdmcp_enabled (manager, xdmcp_enabled);
--- a/data/gdm.schemas.in.in
+++ b/data/gdm.schemas.in.in
-@@ -87,6 +87,11 @@
+@@ -70,6 +70,11 @@
<default>false</default>
</schema>
<schema>
Modified: desktop/experimental/gdm3/debian/patches/96_check_libs.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gdm3/debian/patches/96_check_libs.patch?rev=40089&op=diff
==============================================================================
--- desktop/experimental/gdm3/debian/patches/96_check_libs.patch [utf-8] (original)
+++ desktop/experimental/gdm3/debian/patches/96_check_libs.patch [utf-8] Wed Oct 23 20:21:20 2013
@@ -1,6 +1,6 @@
--- a/configure.ac
+++ b/configure.ac
-@@ -166,6 +166,7 @@
+@@ -147,6 +147,7 @@
have_check=yes,
have_check=no)
AM_CONDITIONAL([HAVE_CHECK],[test "x$CHECK_CFLAGS" != "x"])
Modified: desktop/experimental/gdm3/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gdm3/debian/rules?rev=40089&op=diff
==============================================================================
--- desktop/experimental/gdm3/debian/rules [utf-8] (original)
+++ desktop/experimental/gdm3/debian/rules [utf-8] Wed Oct 23 20:21:20 2013
@@ -32,14 +32,13 @@
--with-user=Debian-gdm --with-group=Debian-gdm \
--with-pam-domain=gdm3 \
--with-lang-file=/etc/default/locale \
- --without-systemd \
+ --with-systemd \
+ --without-consolekit \
--disable-split-authentication \
- --with-consolekit \
- --with-consolekit-directory=/usr/lib/ConsoleKit \
--with-check-accelerated-directory=/usr/lib/gnome-session/ \
--with-ran-once-marker-directory=/var/run/gdm3 \
--with-initial-vt=7 \
- --disable-fallback-greeter
+ --disable-fallback-greeter
DEB_CONFIGURE_EXTRA_FLAGS += --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH)
More information about the pkg-gnome-commits
mailing list