r35937 - in /desktop/experimental/gdm3/debian: ./ patches/
sjoerd at users.alioth.debian.org
sjoerd at users.alioth.debian.org
Sun Oct 14 14:56:30 UTC 2012
Author: sjoerd
Date: Sun Oct 14 14:56:30 2012
New Revision: 35937
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=35937
Log:
* New upstream release
* debian/patches/04_reload_config.patch
debian/patches/05_debug_xserver_core.patch
debian/patches/17_switch_on_finish.patch
debian/patches/18_parametrize_create_display.patch
debian/patches/19_static_transient_display.patch
debian/patches/20_switch_kill_greeter.patch
debian/patches/30_dbus_prctl_death.patch
debian/patches/31_worker_session_gone.patch
debian/patches/32_ignore_greeter_crash.patch:
+ Dropped, merged upstream
* debian/patches/94_schemas_location_on_hup.patch:
+ Added, look in the right schema location on the HUP signal
* gdm3.{postinst,postrm}: PAM config file changed from gdm-welcome to
gdm-launch-environment. Adapt postinst/postrm for the new name and remove
the old
* debian/rules: Set --with-consolekit-directory
* debian/control.in: Update build-depends, break gnome-shell (<<3.5) and
depends on gnome-session >= 3.6
* Sync with Ubuntu:
+ debian/patches/10_no_gettext.patch:
+ Added, Don't mix intltool and gettext macro
FIXME: 06_first_vt.patch needs to be checked & updated
Added:
desktop/experimental/gdm3/debian/patches/10_no_gettext.patch
desktop/experimental/gdm3/debian/patches/94_schemas_location_on_hup.patch
Removed:
desktop/experimental/gdm3/debian/patches/04_reload_config.patch
desktop/experimental/gdm3/debian/patches/05_debug_xserver_core.patch
desktop/experimental/gdm3/debian/patches/17_switch_on_finish.patch
desktop/experimental/gdm3/debian/patches/18_parametrize_create_display.patch
desktop/experimental/gdm3/debian/patches/19_static_transient_display.patch
desktop/experimental/gdm3/debian/patches/20_switch_kill_greeter.patch
desktop/experimental/gdm3/debian/patches/30_dbus_prctl_death.patch
desktop/experimental/gdm3/debian/patches/31_worker_session_gone.patch
desktop/experimental/gdm3/debian/patches/32_ignore_greeter_crash.patch
Modified:
desktop/experimental/gdm3/debian/changelog
desktop/experimental/gdm3/debian/control
desktop/experimental/gdm3/debian/control.in
desktop/experimental/gdm3/debian/gdm3.postinst
desktop/experimental/gdm3/debian/gdm3.postrm
desktop/experimental/gdm3/debian/patches/06_first_vt.patch
desktop/experimental/gdm3/debian/patches/07_libexec-paths.patch
desktop/experimental/gdm3/debian/patches/08_frequent-users_greeter.patch
desktop/experimental/gdm3/debian/patches/09_default_session.patch
desktop/experimental/gdm3/debian/patches/10_gdm3_pam.patch
desktop/experimental/gdm3/debian/patches/16_xserver_path.patch
desktop/experimental/gdm3/debian/patches/22_noconsole.patch
desktop/experimental/gdm3/debian/patches/92_gsettings_path.patch
desktop/experimental/gdm3/debian/patches/93_private_lib.patch
desktop/experimental/gdm3/debian/patches/series
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=35937&op=diff
==============================================================================
--- desktop/experimental/gdm3/debian/changelog [utf-8] (original)
+++ desktop/experimental/gdm3/debian/changelog [utf-8] Sun Oct 14 14:56:30 2012
@@ -1,3 +1,32 @@
+gdm3 (3.6.0-1) UNRELEASED; urgency=low
+
+ * New upstream release
+ * debian/patches/04_reload_config.patch
+ debian/patches/05_debug_xserver_core.patch
+ debian/patches/17_switch_on_finish.patch
+ debian/patches/18_parametrize_create_display.patch
+ debian/patches/19_static_transient_display.patch
+ debian/patches/20_switch_kill_greeter.patch
+ debian/patches/30_dbus_prctl_death.patch
+ debian/patches/31_worker_session_gone.patch
+ debian/patches/32_ignore_greeter_crash.patch:
+ + Dropped, merged upstream
+ * debian/patches/94_schemas_location_on_hup.patch:
+ + Added, look in the right schema location on the HUP signal
+ * gdm3.{postinst,postrm}: PAM config file changed from gdm-welcome to
+ gdm-launch-environment. Adapt postinst/postrm for the new name and remove
+ the old
+ * debian/rules: Set --with-consolekit-directory
+ * debian/control.in: Update build-depends, break gnome-shell (<<3.5) and
+ depends on gnome-session >= 3.6
+ * Sync with Ubuntu:
+ + debian/patches/10_no_gettext.patch:
+ + Added, Don't mix intltool and gettext macro
+
+ FIXME: 06_first_vt.patch needs to be checked & updated
+
+ -- Sjoerd Simons <sjoerd at debian.org> Sun, 14 Oct 2012 16:51:30 +0200
+
gdm3 (3.4.1-3) unstable; urgency=low
* Drop suggests on gnome-mag.
Modified: desktop/experimental/gdm3/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gdm3/debian/control?rev=35937&op=diff
==============================================================================
--- desktop/experimental/gdm3/debian/control [utf-8] (original)
+++ desktop/experimental/gdm3/debian/control [utf-8] Sun Oct 14 14:56:30 2012
@@ -7,18 +7,16 @@
Section: gnome
Priority: optional
Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
-Uploaders: Josselin Mouette <joss at debian.org>, Michael Biebl <biebl at debian.org>
+Uploaders: Josselin Mouette <joss at debian.org>, Michael Biebl <biebl at debian.org>, Sjoerd Simons <sjoerd at debian.org>
Build-Depends: gnome-pkg-tools (>= 0.16.3),
debhelper (>= 8.1.0),
cdbs,
dh-autoreconf,
intltool (>= 0.40.0),
- gnome-doc-utils,
libdbus-glib-1-dev (>= 0.74),
- libglib2.0-dev (>= 2.29.3),
+ libglib2.0-dev (>= 2.34.0),
libgtk-3-dev (>= 2.91.1),
libpango1.0-dev (>= 1.3.0),
- libxklavier-dev (>= 4.0),
libcanberra-gtk3-dev (>= 0.4),
libfontconfig1-dev (>= 2.5.0),
libupower-glib-dev (>= 0.9.0),
@@ -41,13 +39,14 @@
libxft-dev,
libxi-dev,
libxinerama-dev,
+ yelp-tools,
libselinux1-dev [linux-any],
libattr1-dev [linux-any],
iso-codes,
libaudit-dev [linux-any],
docbook-xml,
gsettings-desktop-schemas
-Standards-Version: 3.9.2
+Standards-Version: 3.9.3
Vcs-Svn: svn://svn.debian.org/pkg-gnome/desktop/unstable/gdm3/
Vcs-Browser: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm3/
@@ -60,7 +59,7 @@
adduser,
libpam-modules (>= 0.72-1),
libpam-runtime (>= 0.76-13.1),
- gnome-session-bin (>= 3.2),
+ gnome-session-bin (>= 3.6),
gnome-settings-daemon (>= 3.2),
metacity (>= 1:2.34.2),
policykit-1-gnome,
@@ -81,19 +80,17 @@
xserver-xorg,
at-spi2-core,
gnome-icon-theme,
- gnome-icon-theme-symbolic,
- desktop-base (>= 6)
+ gnome-icon-theme-symbolic
Suggests: libpam-gnome-keyring,
gnome-orca,
gok,
gnome-shell
Provides: x-display-manager
-Conflicts: gdm
Breaks: gnome-panel (<< 3.0),
gnome-screensaver (<< 2.17.7),
gnome-orca (<< 2.30.0-2),
gnome-control-center (<< 3.0),
- gnome-shell (<< 3.2)
+ gnome-shell (<< 3.5)
Description: Next generation GNOME Display Manager
GDM provides the equivalent of a "login:" prompt for X displays: it
asks for a login and starts X sessions.
Modified: desktop/experimental/gdm3/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gdm3/debian/control.in?rev=35937&op=diff
==============================================================================
--- desktop/experimental/gdm3/debian/control.in [utf-8] (original)
+++ desktop/experimental/gdm3/debian/control.in [utf-8] Sun Oct 14 14:56:30 2012
@@ -8,12 +8,10 @@
cdbs,
dh-autoreconf,
intltool (>= 0.40.0),
- gnome-doc-utils,
libdbus-glib-1-dev (>= 0.74),
- libglib2.0-dev (>= 2.29.3),
+ libglib2.0-dev (>= 2.34.0),
libgtk-3-dev (>= 2.91.1),
libpango1.0-dev (>= 1.3.0),
- libxklavier-dev (>= 4.0),
libcanberra-gtk3-dev (>= 0.4),
libfontconfig1-dev (>= 2.5.0),
libupower-glib-dev (>= 0.9.0),
@@ -36,13 +34,14 @@
libxft-dev,
libxi-dev,
libxinerama-dev,
+ yelp-tools,
libselinux1-dev [linux-any],
libattr1-dev [linux-any],
iso-codes,
libaudit-dev [linux-any],
docbook-xml,
gsettings-desktop-schemas
-Standards-Version: 3.9.2
+Standards-Version: 3.9.3
Vcs-Svn: svn://svn.debian.org/pkg-gnome/desktop/unstable/gdm3/
Vcs-Browser: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm3/
@@ -55,7 +54,7 @@
adduser,
libpam-modules (>= 0.72-1),
libpam-runtime (>= 0.76-13.1),
- gnome-session-bin (>= 3.2),
+ gnome-session-bin (>= 3.6),
gnome-settings-daemon (>= 3.2),
metacity (>= 1:2.34.2),
policykit-1-gnome,
@@ -83,12 +82,11 @@
gok,
gnome-shell
Provides: x-display-manager
-Conflicts: gdm
Breaks: gnome-panel (<< 3.0),
gnome-screensaver (<< 2.17.7),
gnome-orca (<< 2.30.0-2),
gnome-control-center (<< 3.0),
- gnome-shell (<< 3.2)
+ gnome-shell (<< 3.5)
Description: Next generation GNOME Display Manager
GDM provides the equivalent of a "login:" prompt for X displays: it
asks for a login and starts X sessions.
Modified: desktop/experimental/gdm3/debian/gdm3.postinst
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gdm3/debian/gdm3.postinst?rev=35937&op=diff
==============================================================================
--- desktop/experimental/gdm3/debian/gdm3.postinst [utf-8] (original)
+++ desktop/experimental/gdm3/debian/gdm3.postinst [utf-8] Sun Oct 14 14:56:30 2012
@@ -61,8 +61,12 @@
chown -R Debian-gdm:Debian-gdm /var/lib/gdm3
-if [ ! -f /etc/pam.d/gdm-welcome ]; then
- ln -s gdm3-autologin /etc/pam.d/gdm-welcome
+if [ ! -f /etc/pam.d/gdm-launch-environment ]; then
+ ln -s gdm3-autologin /etc/pam.d/gdm-launch-environment
+fi
+
+if [ -L /etc/pam.d/gdm-welcome ]; then
+ rm -f /etc/pam.d/gdm-welcome
fi
#DEBHELPER#
Modified: desktop/experimental/gdm3/debian/gdm3.postrm
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gdm3/debian/gdm3.postrm?rev=35937&op=diff
==============================================================================
--- desktop/experimental/gdm3/debian/gdm3.postrm [utf-8] (original)
+++ desktop/experimental/gdm3/debian/gdm3.postrm [utf-8] Sun Oct 14 14:56:30 2012
@@ -15,7 +15,7 @@
rm -rf /var/run/gdm3
rm -rf /var/log/gdm3
rm -rf /var/cache/gdm
- rm -f /etc/pam.d/gdm-welcome
+ rm -f /etc/pam.d/gdm-launch-environment
if getent passwd Debian-gdm >/dev/null; then
if [ -x /usr/sbin/deluser ]; then
deluser --system Debian-gdm || echo "Could not remove Debian-gdm user."
Modified: desktop/experimental/gdm3/debian/patches/06_first_vt.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gdm3/debian/patches/06_first_vt.patch?rev=35937&op=diff
==============================================================================
--- desktop/experimental/gdm3/debian/patches/06_first_vt.patch [utf-8] (original)
+++ desktop/experimental/gdm3/debian/patches/06_first_vt.patch [utf-8] Sun Oct 14 14:56:30 2012
@@ -1,22 +1,8 @@
It's almost the same tty manager of gdm 2.20, except we don't support Sun VTs,
only Linux and FreeBSD.
-Index: gdm-3.4.1/common/gdm-settings-keys.h
-===================================================================
---- gdm-3.4.1.orig/common/gdm-settings-keys.h 2012-06-25 20:10:49.108971142 +0200
-+++ gdm-3.4.1/common/gdm-settings-keys.h 2012-06-25 20:13:02.993625666 +0200
-@@ -32,6 +32,7 @@ G_BEGIN_DECLS
- #define GDM_KEY_TIMED_LOGIN_ENABLE "daemon/TimedLoginEnable"
- #define GDM_KEY_TIMED_LOGIN_USER "daemon/TimedLogin"
- #define GDM_KEY_TIMED_LOGIN_DELAY "daemon/TimedLoginDelay"
-+#define GDM_KEY_FIRST_VT "daemon/FirstVT"
-
- #define GDM_KEY_DEBUG "debug/Enable"
-
-Index: gdm-3.4.1/daemon/gdm-server.c
-===================================================================
---- gdm-3.4.1.orig/daemon/gdm-server.c 2012-06-25 20:12:59.685609512 +0200
-+++ gdm-3.4.1/daemon/gdm-server.c 2012-06-25 20:13:02.993625666 +0200
-@@ -752,6 +752,213 @@ gdm_server_spawn (GdmServer *server,
+--- a/daemon/gdm-server.c
++++ b/daemon/gdm-server.c
+@@ -767,6 +767,213 @@
return ret;
}
@@ -230,29 +216,11 @@
/**
* gdm_server_start:
* @disp: Pointer to a GdmDisplay structure
-@@ -763,10 +970,14 @@ gboolean
- gdm_server_start (GdmServer *server)
- {
- gboolean res;
-+ char *vtarg;
-+
-+ vtarg = gdm_get_empty_vt_argument ();
-
- /* fork X server process */
-- res = gdm_server_spawn (server, NULL);
-+ res = gdm_server_spawn (server, vtarg);
-
-+ g_free (vtarg);
- return res;
- }
-
-Index: gdm-3.4.1/data/gdm.schemas.in.in
-===================================================================
---- gdm-3.4.1.orig/data/gdm.schemas.in.in 2012-06-25 20:10:49.108971142 +0200
-+++ gdm-3.4.1/data/gdm.schemas.in.in 2012-06-25 20:13:02.997625695 +0200
-@@ -47,6 +47,11 @@
- <signature>i</signature>
- <default>30</default>
+--- a/data/gdm.schemas.in.in
++++ b/data/gdm.schemas.in.in
+@@ -52,6 +52,11 @@
+ <signature>b</signature>
+ <default>false</default>
</schema>
+ <schema>
+ <key>daemon/FirstVT</key>
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=35937&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] Sun Oct 14 14:56:30 2012
@@ -1,23 +1,8 @@
GNOME #645918
-Index: gdm-3.4.1/daemon/gdm-server.c
-===================================================================
---- gdm-3.4.1.orig/daemon/gdm-server.c 2012-06-20 20:53:20.643879549 +0200
-+++ gdm-3.4.1/daemon/gdm-server.c 2012-06-20 20:53:20.679879718 +0200
-@@ -142,7 +142,7 @@ _gdm_server_query_ck_for_display_device
- g_return_val_if_fail (GDM_IS_SERVER (server), NULL);
-
- error = NULL;
-- command = g_strdup_printf (LIBEXECDIR "/ck-get-x11-display-device --display %s",
-+ command = g_strdup_printf (CK_LIBEXECDIR "/ck-get-x11-display-device --display %s",
- server->priv->display_name);
-
- g_debug ("GdmServer: Running helper %s", command);
-Index: gdm-3.4.1/gui/simple-chooser/gdm-chooser-session.c
-===================================================================
---- gdm-3.4.1.orig/gui/simple-chooser/gdm-chooser-session.c 2012-06-20 20:53:13.515844704 +0200
-+++ gdm-3.4.1/gui/simple-chooser/gdm-chooser-session.c 2012-06-20 20:53:20.679879718 +0200
-@@ -131,7 +131,7 @@ start_settings_daemon (GdmChooserSession
+--- a/gui/simple-chooser/gdm-chooser-session.c
++++ b/gui/simple-chooser/gdm-chooser-session.c
+@@ -133,7 +133,7 @@
ret = FALSE;
error = NULL;
@@ -26,11 +11,9 @@
if (error != NULL) {
g_warning ("Error starting settings daemon: %s", error->message);
g_error_free (error);
-Index: gdm-3.4.1/configure.ac
-===================================================================
---- gdm-3.4.1.orig/configure.ac 2012-06-20 20:53:20.611879386 +0200
-+++ gdm-3.4.1/configure.ac 2012-06-20 20:53:20.679879718 +0200
-@@ -67,6 +67,7 @@ LIBCANBERRA_GTK_REQUIRED_VERSION=0.4
+--- a/configure.ac
++++ b/configure.ac
+@@ -74,6 +74,7 @@
FONTCONFIG_REQUIRED_VERSION=2.5.0
UPOWER_REQUIRED_VERSION=0.9.0
ACCOUNTS_SERVICE_REQUIRED_VERSION=0.6.12
@@ -38,8 +21,8 @@
NSS_REQUIRED_VERSION=3.11.1
EXTRA_COMPILE_WARNINGS(yes)
-@@ -187,6 +188,34 @@ LIBGDMGREETER_GIR_INCLUDES="GLib-2.0 GOb
- AC_SUBST(LIBGDMGREETER_GIR_INCLUDES)
+@@ -185,6 +186,16 @@
+ AC_SUBST(LIBGDM_GIR_INCLUDES)
dnl ---------------------------------------------------------------------------
+dnl - Paths for dependencies
@@ -51,45 +34,13 @@
+GSD_BINARY=`pkg-config --variable=binary gnome-settings-daemon`
+AC_SUBST(GSD_BINARY)
+
-+dnl This should be done with pkg-config, but ConsoleKit doesn't
-+dnl ship .pc files
-+dnl Because of that we only handle the case where libexecdir is the same
-+dnl (e.g. Red Hat), and the case where libexecdir = pkglibdir (e.g. Debian)
-+
-+AC_MSG_CHECKING(where helpers are installed)
-+if test x`basename "$libexecdir"` = "xlibexec"; then
-+ AC_MSG_RESULT($libexecdir)
-+ CK_LIBEXECDIR="$libexecdir"
-+ SESSION_LIBEXECDIR="$libexecdir"
-+else
-+ AC_MSG_RESULT("$libdir/Consolekit")
-+ CK_LIBEXECDIR="$libdir/ConsoleKit"
-+ SESSION_LIBEXECDIR="$libdir/gnome-session"
-+fi
-+AC_SUBST(CK_LIBEXECDIR)
-+AC_SUBST(SESSION_LIBEXECDIR)
-+
+dnl ---------------------------------------------------------------------------
dnl - Configuration file stuff
dnl ---------------------------------------------------------------------------
-Index: gdm-3.4.1/daemon/Makefile.am
-===================================================================
---- gdm-3.4.1.orig/daemon/Makefile.am 2012-06-20 20:53:13.515844704 +0200
-+++ gdm-3.4.1/daemon/Makefile.am 2012-06-20 20:53:20.679879718 +0200
-@@ -12,6 +12,7 @@ AM_CPPFLAGS = \
- -DGDMCONFDIR=\"$(gdmconfdir)\" \
- -DLIBDIR=\"$(libdir)\" \
- -DLIBEXECDIR=\"$(libexecdir)\" \
-+ -DCK_LIBEXECDIR=\"$(CK_LIBEXECDIR)\" \
- -DLOGDIR=\"$(logdir)\" \
- -DSBINDIR=\"$(sbindir)\" \
- -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
-Index: gdm-3.4.1/gui/simple-chooser/Makefile.am
-===================================================================
---- gdm-3.4.1.orig/gui/simple-chooser/Makefile.am 2012-06-20 20:53:13.515844704 +0200
-+++ gdm-3.4.1/gui/simple-chooser/Makefile.am 2012-06-20 20:53:20.679879718 +0200
-@@ -12,6 +12,7 @@ AM_CPPFLAGS = \
+--- a/gui/simple-chooser/Makefile.am
++++ b/gui/simple-chooser/Makefile.am
+@@ -14,6 +14,7 @@
-DSBINDIR=\""$(sbindir)"\" \
-DPIXMAPDIR=\""$(pixmapdir)"\" \
-DAT_SPI_REGISTRYD_DIR="\"$(AT_SPI_REGISTRYD_DIR)\"" \
@@ -97,27 +48,3 @@
$(GTK_CFLAGS) \
$(XLIB_CFLAGS) \
$(XDMCP_CFLAGS) \
-Index: gdm-3.4.1/data/Makefile.am
-===================================================================
---- gdm-3.4.1.orig/data/Makefile.am 2012-06-20 20:53:13.515844704 +0200
-+++ gdm-3.4.1/data/Makefile.am 2012-06-20 20:53:20.679879718 +0200
-@@ -79,7 +79,7 @@ gdm.schemas.in: $(srcdir)/gdm.schemas.in
- <$(srcdir)/gdm.schemas.in.in >gdm.schemas.in
-
- gdm-shell.session: $(srcdir)/gdm-shell.session.in
-- sed -e 's,[@]libexecdir[@],$(libexecdir),g' \
-+ sed -e 's,[@]SESSION_LIBEXECDIR[@],$(SESSION_LIBEXECDIR),g' \
- < $(srcdir)/gdm-shell.session.in > gdm-shell.session
-
- localealiasdir = $(datadir)/gdm
-Index: gdm-3.4.1/data/gdm-shell.session.in
-===================================================================
---- gdm-3.4.1.orig/data/gdm-shell.session.in 2012-06-20 20:53:11.635835509 +0200
-+++ gdm-3.4.1/data/gdm-shell.session.in 2012-06-20 20:53:44.015993807 +0200
-@@ -1,5 +1,5 @@
- [GNOME Session]
- Name=Display Manager
- RequiredComponents=gnome-shell;gnome-settings-daemon;
--IsRunnableHelper=bash -c 'gnome-shell --help | grep -q gdm-mode && @libexecdir@/gnome-session-check-accelerated'
-+IsRunnableHelper=bash -c 'gnome-shell --help | grep -q gdm-mode && @SESSION_LIBEXECDIR@/gnome-session-check-accelerated'
- FallbackSession=gdm-fallback
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=35937&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] Sun Oct 14 14:56:30 2012
@@ -1,12 +1,10 @@
-Index: gdm-3.2.1.1/daemon/gdm-simple-slave.c
-===================================================================
---- gdm-3.2.1.1.orig/daemon/gdm-simple-slave.c 2011-10-19 17:41:52.000000000 +0200
-+++ gdm-3.2.1.1/daemon/gdm-simple-slave.c 2011-12-17 03:58:58.702116527 +0100
-@@ -299,6 +299,7 @@ on_session_setup_complete (GdmSession
- const char *service_name,
- GdmSimpleSlave *slave)
- {
-+ gdm_session_select_session_type (GDM_SESSION (session), "x11");
- gdm_session_authenticate (session, service_name);
- }
+--- a/daemon/gdm-session.c
++++ b/daemon/gdm-session.c
+@@ -1911,6 +1911,7 @@
+ 0,
+ service_name);
++ gdm_session_select_session_type (self, "x11");
+ gdm_session_authenticate (self, service_name);
+
+ } else {
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=35937&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] Sun Oct 14 14:56:30 2012
@@ -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.0.4/daemon/gdm-session-direct.c
-===================================================================
---- 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 @@
+--- a/daemon/gdm-session.c
++++ b/daemon/gdm-session.c
+@@ -521,7 +521,7 @@
}
}
- name = g_strdup ("gnome");
+ name = g_strdup ("default");
if (get_session_command_for_name (name, NULL)) {
- g_free (session_direct->priv->fallback_session_name);
- session_direct->priv->fallback_session_name = name;
+ g_free (self->priv->fallback_session_name);
+ self->priv->fallback_session_name = 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=35937&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] Sun Oct 14 14:56:30 2012
@@ -1,30 +1,18 @@
-Index: gdm-3.4.1/daemon/gdm-simple-slave.c
-===================================================================
---- gdm-3.4.1.orig/daemon/gdm-simple-slave.c 2012-06-09 16:44:24.794210103 +0200
-+++ gdm-3.4.1/daemon/gdm-simple-slave.c 2012-06-09 16:44:24.862210431 +0200
-@@ -740,7 +740,7 @@ start_autologin_conversation_if_necessar
+--- a/daemon/gdm-simple-slave.c
++++ b/daemon/gdm-simple-slave.c
+@@ -506,7 +506,8 @@
+ }
g_debug ("GdmSimpleSlave: Starting automatic login conversation");
- gdm_session_start_conversation (GDM_SESSION (slave->priv->session),
-- "gdm-autologin");
-+ GDM_PAM_DOMAIN "-autologin");
+- gdm_session_start_conversation (slave->priv->session, "gdm-autologin");
++ gdm_session_start_conversation (slave->priv->session,
++ GDM_PAM_DOMAIN"-autologin");
}
static void
-@@ -1070,7 +1070,7 @@ on_greeter_begin_auto_login (GdmGreeterS
- return;
- }
- gdm_session_setup_for_user (GDM_SESSION (slave->priv->session),
-- "gdm-autologin",
-+ GDM_PAM_DOMAIN "-autologin",
- username);
- }
-
-Index: gdm-3.4.1/configure.ac
-===================================================================
---- gdm-3.4.1.orig/configure.ac 2012-06-09 16:44:13.078152829 +0200
-+++ gdm-3.4.1/configure.ac 2012-06-09 16:44:24.862210431 +0200
-@@ -522,6 +522,21 @@ else
+--- a/configure.ac
++++ b/configure.ac
+@@ -532,6 +532,21 @@
fi
AC_SUBST(PAM_PREFIX)
@@ -46,10 +34,8 @@
have_pam=no
AC_CHECK_LIB(pam, pam_start, have_pam=yes)
-Index: gdm-3.4.1/gui/simple-greeter/extensions/unified/Makefile.am
-===================================================================
---- gdm-3.4.1.orig/gui/simple-greeter/extensions/unified/Makefile.am 2012-06-09 16:43:11.457851581 +0200
-+++ gdm-3.4.1/gui/simple-greeter/extensions/unified/Makefile.am 2012-06-09 16:44:24.862210431 +0200
+--- a/gui/simple-greeter/extensions/unified/Makefile.am
++++ b/gui/simple-greeter/extensions/unified/Makefile.am
@@ -1,5 +1,5 @@
NULL =
-PAM_SERVICE_NAME = gdm
@@ -57,58 +43,19 @@
extensiondir = $(GDM_SIMPLE_GREETER_EXTENSIONS_DATA_DIR)/unified
extension_DATA = page.ui
-Index: gdm-3.4.1/daemon/Makefile.am
-===================================================================
---- gdm-3.4.1.orig/daemon/Makefile.am 2012-06-09 16:43:11.457851581 +0200
-+++ gdm-3.4.1/daemon/Makefile.am 2012-06-09 16:44:24.866210456 +0200
-@@ -20,6 +20,7 @@ AM_CPPFLAGS = \
+--- a/daemon/Makefile.am
++++ b/daemon/Makefile.am
+@@ -20,6 +20,7 @@
-DGDM_SCREENSHOT_DIR=\"$(GDM_SCREENSHOT_DIR)\" \
-DGDM_CACHE_DIR=\""$(localstatedir)/cache/gdm"\" \
-DGDM_SESSION_DEFAULT_PATH=\"$(GDM_SESSION_DEFAULT_PATH)\" \
-+ -DGDM_PAM_DOMAIN="\"$(GDM_PAM_DOMAIN)\"" \
++ -DGDM_PAM_DOMAIN="\"$(GDM_PAM_DOMAIN)\"" \
+ -DCONSOLEKIT_DIR=\"$(CONSOLEKIT_DIR)\" \
$(DISABLE_DEPRECATED_CFLAGS) \
$(DAEMON_CFLAGS) \
- $(XLIB_CFLAGS) \
-Index: gdm-3.4.1/daemon/gdm-greeter-server.c
-===================================================================
---- gdm-3.4.1.orig/daemon/gdm-greeter-server.c 2012-06-09 16:43:11.457851581 +0200
-+++ gdm-3.4.1/daemon/gdm-greeter-server.c 2012-06-09 16:45:39.662576078 +0200
-@@ -253,7 +253,7 @@ translate_outgoing_service_name (GdmGree
- const char *service_name)
- {
- #ifndef ENABLE_SPLIT_AUTHENTICATION
-- if (strcmp (service_name, "gdm") == 0 && greeter_server->priv->using_legacy_service_name) {
-+ if (strcmp (service_name, GDM_PAM_DOMAIN) == 0 && greeter_server->priv->using_legacy_service_name) {
- return "gdm-password";
- }
- #endif
-@@ -268,7 +268,7 @@ translate_incoming_service_name (GdmGree
- #ifndef ENABLE_SPLIT_AUTHENTICATION
- if (strcmp (service_name, "gdm-password") == 0) {
- g_debug ("GdmGreeterServer: Adjusting pam service from '%s' to 'gdm' for legacy compatibility", service_name);
-- service_name = "gdm";
-+ service_name = GDM_PAM_DOMAIN;
- greeter_server->priv->using_legacy_service_name = TRUE;
- } else if (g_str_has_prefix (service_name, "gdm-") && strcmp (service_name, "gdm-autologin") != 0) {
- g_debug ("GdmGreeterServer: Rejecting pam service '%s' for legacy compatibility", service_name);
-Index: gdm-3.4.1/daemon/test-session.c
-===================================================================
---- gdm-3.4.1.orig/daemon/test-session.c 2012-06-09 16:43:11.457851581 +0200
-+++ gdm-3.4.1/daemon/test-session.c 2012-06-09 16:44:24.866210456 +0200
-@@ -279,7 +279,7 @@ main (int argc,
- username = argv[1];
- }
-
-- gdm_session_start_conversation (GDM_SESSION (session), "gdm");
-+ gdm_session_start_conversation (GDM_SESSION (session), "gdm3");
-
- g_signal_connect (session,
- "conversation-started",
-Index: gdm-3.4.1/gui/simple-greeter/Makefile.am
-===================================================================
---- gdm-3.4.1.orig/gui/simple-greeter/Makefile.am 2012-06-09 16:46:56.766953047 +0200
-+++ gdm-3.4.1/gui/simple-greeter/Makefile.am 2012-06-09 16:47:06.959002879 +0200
-@@ -19,6 +19,7 @@ AM_CPPFLAGS = \
+--- a/gui/simple-greeter/Makefile.am
++++ b/gui/simple-greeter/Makefile.am
+@@ -21,6 +21,7 @@
-DSBINDIR=\""$(sbindir)"\" \
-DGDM_CACHE_DIR=\""$(localstatedir)/cache/gdm"\" \
-DAT_SPI_REGISTRYD_DIR="\"$(AT_SPI_REGISTRYD_DIR)\"" \
@@ -116,11 +63,9 @@
$(UPOWER_CFLAGS) \
-DGDM_SIMPLE_GREETER_PLUGINS_DIR="\"$(GDM_SIMPLE_GREETER_PLUGINS_DIR)\""\
$(DISABLE_DEPRECATED_CFLAGS) \
-Index: gdm-3.4.1/gui/simple-greeter/gdm-greeter-login-window.c
-===================================================================
---- gdm-3.4.1.orig/gui/simple-greeter/gdm-greeter-login-window.c 2012-04-14 20:52:00.000000000 +0200
-+++ gdm-3.4.1/gui/simple-greeter/gdm-greeter-login-window.c 2012-06-09 16:49:09.279600877 +0200
-@@ -756,7 +756,7 @@ begin_other_verification (GdmGreeterLogi
+--- a/gui/simple-greeter/gdm-greeter-login-window.c
++++ b/gui/simple-greeter/gdm-greeter-login-window.c
+@@ -753,7 +753,7 @@
if (find_extension_with_service_name (login_window, "gdm-password") != NULL) {
begin_single_service_verification (login_window, "gdm-password");
} else {
@@ -129,7 +74,7 @@
}
}
-@@ -988,7 +988,7 @@ handle_stopped_conversation (GdmGreeterL
+@@ -985,7 +985,7 @@
* FIXME: we need to get this policy out of the source code
*/
if (strcmp (service_name, "gdm-password") == 0 ||
Added: desktop/experimental/gdm3/debian/patches/10_no_gettext.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gdm3/debian/patches/10_no_gettext.patch?rev=35937&op=file
==============================================================================
--- desktop/experimental/gdm3/debian/patches/10_no_gettext.patch (added)
+++ desktop/experimental/gdm3/debian/patches/10_no_gettext.patch [utf-8] Sun Oct 14 14:56:30 2012
@@ -1,0 +1,17 @@
+From: Jeremy Bicha <jbicha at ubuntu.com>
+Description: Don't mix intltool and gettext macros.
+
+Index: gdm-3.5.91/configure.ac
+===================================================================
+--- gdm-3.5.91.orig/configure.ac 2012-09-05 12:41:58.770013245 -0400
++++ gdm-3.5.91/configure.ac 2012-09-05 12:43:49.646015603 -0400
+@@ -52,9 +52,6 @@
+ # i18n stuff
+ IT_PROG_INTLTOOL([0.40.0])
+
+-AM_GNU_GETTEXT_VERSION([0.17])
+-AM_GNU_GETTEXT([external])
+-
+ GETTEXT_PACKAGE=gdm
+ AC_SUBST(GETTEXT_PACKAGE)
+ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [gettext package])
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=35937&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] Sun Oct 14 14:56:30 2012
@@ -1,8 +1,6 @@
-Index: gdm-3.0.4/configure.ac
-===================================================================
---- 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 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -1252,7 +1252,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/22_noconsole.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gdm3/debian/patches/22_noconsole.patch?rev=35937&op=diff
==============================================================================
--- desktop/experimental/gdm3/debian/patches/22_noconsole.patch [utf-8] (original)
+++ desktop/experimental/gdm3/debian/patches/22_noconsole.patch [utf-8] Sun Oct 14 14:56:30 2012
@@ -1,10 +1,8 @@
GNOME #567522
-Index: gdm-3.0.0/common/gdm-settings-keys.h
-===================================================================
---- gdm-3.0.0.orig/common/gdm-settings-keys.h 2011-04-28 21:24:03.215419171 +0200
-+++ gdm-3.0.0/common/gdm-settings-keys.h 2011-04-28 23:07:16.625697201 +0200
-@@ -43,6 +43,7 @@ G_BEGIN_DECLS
+--- a/common/gdm-settings-keys.h
++++ b/common/gdm-settings-keys.h
+@@ -43,6 +43,7 @@
#define GDM_KEY_DISALLOW_TCP "security/DisallowTCP"
#define GDM_KEY_XDMCP_ENABLE "xdmcp/Enable"
@@ -12,20 +10,18 @@
#define GDM_KEY_MAX_PENDING "xdmcp/MaxPending"
#define GDM_KEY_MAX_SESSIONS "xdmcp/MaxSessions"
#define GDM_KEY_MAX_WAIT "xdmcp/MaxWait"
-Index: gdm-3.0.0/daemon/gdm-manager.c
-===================================================================
---- gdm-3.0.0.orig/daemon/gdm-manager.c 2011-04-28 21:24:03.171418953 +0200
-+++ gdm-3.0.0/daemon/gdm-manager.c 2011-04-28 21:34:56.658613691 +0200
-@@ -63,7 +63,7 @@ struct GdmManagerPrivate
+--- a/daemon/gdm-manager.c
++++ b/daemon/gdm-manager.c
+@@ -66,7 +66,7 @@
gboolean started;
gboolean wait_for_go;
- gboolean no_console;
+ gboolean show_local_greeter;
- DBusGProxy *bus_proxy;
- DBusGConnection *connection;
-@@ -71,7 +71,8 @@ struct GdmManagerPrivate
+ GDBusProxy *bus_proxy;
+ GDBusConnection *connection;
+@@ -75,7 +75,8 @@
enum {
PROP_0,
@@ -35,7 +31,7 @@
};
enum {
-@@ -161,7 +162,7 @@ gdm_manager_start (GdmManager *manager)
+@@ -901,7 +902,7 @@
{
g_debug ("GdmManager: GDM starting to manage displays");
@@ -44,7 +40,7 @@
gdm_display_factory_start (GDM_DISPLAY_FACTORY (manager->priv->local_factory));
}
-@@ -187,7 +188,8 @@ gdm_manager_set_wait_for_go (GdmManager
+@@ -927,7 +928,8 @@
if (! wait_for_go) {
/* we got a go */
@@ -54,7 +50,7 @@
#ifdef HAVE_LIBXDMCP
if (manager->priv->xdmcp_enabled && manager->priv->xdmcp_factory != NULL) {
-@@ -313,6 +315,15 @@ gdm_manager_set_xdmcp_enabled (GdmManage
+@@ -1000,6 +1002,15 @@
}
@@ -70,7 +66,7 @@
static void
gdm_manager_set_property (GObject *object,
guint prop_id,
-@@ -327,6 +338,9 @@ gdm_manager_set_property (GObject *
+@@ -1014,6 +1025,9 @@
case PROP_XDMCP_ENABLED:
gdm_manager_set_xdmcp_enabled (self, g_value_get_boolean (value));
break;
@@ -80,7 +76,7 @@
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
-@@ -347,6 +361,9 @@ gdm_manager_get_property (GObject *ob
+@@ -1034,6 +1048,9 @@
case PROP_XDMCP_ENABLED:
g_value_set_boolean (value, self->priv->xdmcp_enabled);
break;
@@ -90,11 +86,9 @@
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
-Index: gdm-3.0.0/daemon/gdm-manager.h
-===================================================================
---- gdm-3.0.0.orig/daemon/gdm-manager.h 2011-04-28 21:24:03.131418759 +0200
-+++ gdm-3.0.0/daemon/gdm-manager.h 2011-04-28 21:36:36.891103703 +0200
-@@ -69,6 +69,8 @@ void gdm_manager_set_wait
+--- a/daemon/gdm-manager.h
++++ b/daemon/gdm-manager.h
+@@ -71,6 +71,8 @@
void gdm_manager_set_xdmcp_enabled (GdmManager *manager,
gboolean enabled);
@@ -103,21 +97,19 @@
gboolean gdm_manager_get_displays (GdmManager *manager,
GPtrArray **displays,
GError **error);
-Index: gdm-3.0.0/daemon/main.c
-===================================================================
---- gdm-3.0.0.orig/daemon/main.c 2011-04-28 21:24:03.099418603 +0200
-+++ gdm-3.0.0/daemon/main.c 2011-04-28 21:38:26.515639629 +0200
-@@ -525,6 +525,7 @@ main (int argc,
- int ret;
- gboolean res;
- gboolean xdmcp_enabled;
-+ gboolean show_local_greeter;
- GdmSignalHandler *signal_handler;
- static gboolean do_timed_exit = FALSE;
- static gboolean print_version = FALSE;
-@@ -629,6 +630,10 @@ main (int argc,
- goto out;
- }
+--- a/daemon/main.c
++++ b/daemon/main.c
+@@ -545,6 +545,7 @@
+ gpointer user_data)
+ {
+ gboolean xdmcp_enabled;
++ gboolean show_local_greeter;
+
+ manager = gdm_manager_new ();
+ if (manager == NULL) {
+@@ -556,6 +557,10 @@
+
+ gdm_manager_start (manager);
+ show_local_greeter = TRUE;
+ gdm_settings_direct_get_boolean (GDM_KEY_SHOW_LOCAL_GREETER, &show_local_greeter);
@@ -126,10 +118,8 @@
xdmcp_enabled = FALSE;
gdm_settings_direct_get_boolean (GDM_KEY_XDMCP_ENABLE, &xdmcp_enabled);
gdm_manager_set_xdmcp_enabled (manager, xdmcp_enabled);
-Index: gdm-3.0.0/data/gdm.schemas.in.in
-===================================================================
---- gdm-3.0.0.orig/data/gdm.schemas.in.in 2011-04-28 21:24:03.063418423 +0200
-+++ gdm-3.0.0/data/gdm.schemas.in.in 2011-04-28 21:38:58.147794273 +0200
+--- a/data/gdm.schemas.in.in
++++ b/data/gdm.schemas.in.in
@@ -87,6 +87,11 @@
<default>false</default>
</schema>
Modified: desktop/experimental/gdm3/debian/patches/92_gsettings_path.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gdm3/debian/patches/92_gsettings_path.patch?rev=35937&op=diff
==============================================================================
--- desktop/experimental/gdm3/debian/patches/92_gsettings_path.patch [utf-8] (original)
+++ desktop/experimental/gdm3/debian/patches/92_gsettings_path.patch [utf-8] Sun Oct 14 14:56:30 2012
@@ -1,8 +1,6 @@
-Index: gdm-3.2.1.1/daemon/gdm-welcome-session.c
-===================================================================
---- gdm-3.2.1.1.orig/daemon/gdm-welcome-session.c 2011-10-19 17:41:52.000000000 +0200
-+++ gdm-3.2.1.1/daemon/gdm-welcome-session.c 2012-02-20 23:05:20.151709517 +0100
-@@ -323,6 +323,7 @@ build_welcome_environment (GdmWelcomeSes
+--- a/daemon/gdm-launch-environment.c
++++ b/daemon/gdm-launch-environment.c
+@@ -289,6 +289,7 @@
g_hash_table_insert (hash, g_strdup ("RUNNING_UNDER_GDM"), g_strdup ("true"));
g_hash_table_insert (hash, g_strdup ("GVFS_DISABLE_FUSE"), g_strdup ("1"));
g_hash_table_insert (hash, g_strdup ("DCONF_PROFILE"), g_strdup ("gdm"));
Modified: desktop/experimental/gdm3/debian/patches/93_private_lib.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gdm3/debian/patches/93_private_lib.patch?rev=35937&op=diff
==============================================================================
--- desktop/experimental/gdm3/debian/patches/93_private_lib.patch [utf-8] (original)
+++ desktop/experimental/gdm3/debian/patches/93_private_lib.patch [utf-8] Sun Oct 14 14:56:30 2012
@@ -1,33 +1,6 @@
-Index: gdm-3.4.1/gui/libgdmgreeter/Makefile.am
-===================================================================
---- gdm-3.4.1.orig/gui/libgdmgreeter/Makefile.am 2012-06-20 20:51:40.555390238 +0200
-+++ gdm-3.4.1/gui/libgdmgreeter/Makefile.am 2012-06-20 21:31:01.862934073 +0200
-@@ -11,7 +11,7 @@ AM_CPPFLAGS = \
- -DDATADIR=\""$(datadir)"\" \
- $(END_OF_LIST)
-
--lib_LTLIBRARIES = \
-+pkglib_LTLIBRARIES = \
- libgdmgreeter.la \
- $(END_OF_LIST)
-
-@@ -46,9 +46,9 @@ dist_pkgconfig_DATA = gdmgreeter.pc
- -include $(INTROSPECTION_MAKEFILE)
-
- if HAVE_INTROSPECTION
--girdir = $(datadir)/gir-1.0
-+girdir = $(pkglibdir)
- gir_DATA = GdmGreeter-1.0.gir
--typelibsdir = $(libdir)/girepository-1.0
-+typelibsdir = $(pkglibdir)
- typelibs_DATA = $(gir_DATA:.gir=.typelib)
- INTROSPECTION_GIRS = $(gir_DATA)
-
-Index: gdm-3.4.1/gui/simple-greeter/libgdmsimplegreeter/Makefile.am
-===================================================================
---- gdm-3.4.1.orig/gui/simple-greeter/libgdmsimplegreeter/Makefile.am 2012-06-20 20:51:40.555390238 +0200
-+++ gdm-3.4.1/gui/simple-greeter/libgdmsimplegreeter/Makefile.am 2012-06-20 21:14:19.326032929 +0200
-@@ -14,7 +14,7 @@ AM_CPPFLAGS = \
+--- a/gui/simple-greeter/libgdmsimplegreeter/Makefile.am
++++ b/gui/simple-greeter/libgdmsimplegreeter/Makefile.am
+@@ -14,7 +14,7 @@
$(GTK_CFLAGS) \
$(NULL)
@@ -36,3 +9,26 @@
libgdmsimplegreeter.la \
$(NULL)
+--- a/gui/libgdm/Makefile.am
++++ b/gui/libgdm/Makefile.am
+@@ -40,7 +40,7 @@
+ -DDATADIR=\""$(datadir)"\" \
+ $(END_OF_LIST)
+
+-lib_LTLIBRARIES = \
++pkglib_LTLIBRARIES = \
+ libgdm.la \
+ $(END_OF_LIST)
+
+@@ -87,9 +87,9 @@
+ -include $(INTROSPECTION_MAKEFILE)
+
+ if HAVE_INTROSPECTION
+-girdir = $(datadir)/gir-1.0
++girdir = $(pkglibdir)
+ gir_DATA = Gdm-1.0.gir
+-typelibsdir = $(libdir)/girepository-1.0
++typelibsdir = $(pkglibdir)
+ typelibs_DATA = $(gir_DATA:.gir=.typelib)
+ INTROSPECTION_GIRS = $(gir_DATA)
+
Added: desktop/experimental/gdm3/debian/patches/94_schemas_location_on_hup.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gdm3/debian/patches/94_schemas_location_on_hup.patch?rev=35937&op=file
==============================================================================
--- desktop/experimental/gdm3/debian/patches/94_schemas_location_on_hup.patch (added)
+++ desktop/experimental/gdm3/debian/patches/94_schemas_location_on_hup.patch [utf-8] Sun Oct 14 14:56:30 2012
@@ -1,0 +1,20 @@
+From 8aab9864b22e02725d1f6ce562837aecb27f8e38 Mon Sep 17 00:00:00 2001
+From: Sjoerd Simons <sjoerd at luon.net>
+Date: Sun, 14 Oct 2012 12:01:18 +0200
+Subject: [PATCH] Look in the correct location for gdm.schemas on HUP
+
+---
+ daemon/main.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/daemon/main.c
++++ b/daemon/main.c
+@@ -366,7 +366,7 @@
+ g_object_unref (settings);
+ settings = gdm_settings_new ();
+ if (settings != NULL) {
+- if (! gdm_settings_direct_init (settings, GDMCONFDIR "/gdm.schemas", "/")) {
++ if (! gdm_settings_direct_init (settings, DATADIR "/gdm/gdm.schemas", "/")) {
+ g_warning ("Unable to initialize settings");
+ }
+ }
Modified: desktop/experimental/gdm3/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gdm3/debian/patches/series?rev=35937&op=diff
==============================================================================
--- desktop/experimental/gdm3/debian/patches/series [utf-8] (original)
+++ desktop/experimental/gdm3/debian/patches/series [utf-8] Sun Oct 14 14:56:30 2012
@@ -1,24 +1,14 @@
#02_xnest-wrapper.patch
-04_reload_config.patch
-05_debug_xserver_core.patch
-06_first_vt.patch
+#06_first_vt.patch
07_libexec-paths.patch
08_frequent-users_greeter.patch
09_default_session.patch
10_gdm3_pam.patch
+10_no_gettext.patch
#11_xephyr_nested.patch
16_xserver_path.patch
-17_switch_on_finish.patch
-18_parametrize_create_display.patch
-19_static_transient_display.patch
-20_switch_kill_greeter.patch
-21_static_display_purge.patch
22_noconsole.patch
-23_start_polkit.patch
-30_dbus_prctl_death.patch
-31_worker_session_gone.patch
-32_ignore_greeter_crash.patch
90_config_comments.patch
-91_shell_version_control.patch
92_gsettings_path.patch
93_private_lib.patch
+94_schemas_location_on_hup.patch
Modified: desktop/experimental/gdm3/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gdm3/debian/rules?rev=35937&op=diff
==============================================================================
--- desktop/experimental/gdm3/debian/rules [utf-8] (original)
+++ desktop/experimental/gdm3/debian/rules [utf-8] Sun Oct 14 14:56:30 2012
@@ -30,7 +30,8 @@
--with-pam-domain=gdm3 \
--with-lang-file=/etc/default/locale \
--without-systemd \
- --disable-split-authentication
+ --disable-split-authentication \
+ --with-consolekit-directory=/usr/lib/ConsoleKit
ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
DEB_CONFIGURE_EXTRA_FLAGS += --enable-debug
@@ -48,7 +49,7 @@
DEB_DH_INSTALLINIT_ARGS := --noscripts
DEB_DH_MAKESHLIBS_ARGS_gdm3 := --no-act
-DEB_DH_GIREPOSITORY_ARGS_gdm3 := -l$(CURDIR)/gui/libgdmgreeter /usr/lib/gdm/
+DEB_DH_GIREPOSITORY_ARGS_gdm3 := -l$(CURDIR)/gui/libgdm /usr/lib/gdm/
binary-install/gdm3::
mv debian/gdm3/usr/sbin/gdm-binary debian/gdm3/usr/sbin/gdm3
@@ -71,7 +72,7 @@
cd debian/gdm3/usr/lib/gdm && \
rm -f lib*.a lib*.la lib*.so *.gir
cd debian/gdm3/usr/lib/gnome-shell && \
- ln -s ../gdm/*.typelib . && ln -s ../gdm/libgdmgreeter*.so.? .
+ ln -s ../gdm/*.typelib . && ln -s ../gdm/libgdm*.so.? .
INFILES := $(wildcard debian/*.desktop.in)
OUTFILES := $(INFILES:.desktop.in=.desktop)
More information about the pkg-gnome-commits
mailing list