r45737 - in /desktop/experimental/gdm3/debian: ./ patches/
ah at users.alioth.debian.org
ah at users.alioth.debian.org
Fri Aug 21 21:48:16 UTC 2015
Author: ah
Date: Fri Aug 21 21:48:16 2015
New Revision: 45737
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=45737
Log:
* New upstream development release.
* Update build-dependencies according to configure.ac changes:
- drop libxrandr-dev
* Update debian/rules according to configure.ac changes:
- drop --with/without-systemd and --with/without-consolekit,
these configure flags are no longer available.
* Drop debian/patches/07_fix_caribou_path.patch, obsoleted by
upstream removal of caribou autostart file removal.
* Temporarily disable patches which no longer apply:
- 17_switch_on_finish.patch
- 18_all_displays_transient.patch
- 19_switch_kill_greeter.patch
* Drop debian/patches/95_libsystemd.patch, fixed upstream.
* Drop debian/patches/08_frequent-users_greeter.patch, likely obsolete.
* Fix and refresh remaining patches to apply.
* debian/gdm3.install: drop debian/tmp/usr/share/gnome-session/,
gdm-shell.session no longer shipped upstream. See commit f66cdfcb2948.
"It's identical to gnome.session these days. All GDMification comes
from the overridden gnome-shell.desktop file."
* Update debian/libgdm1.symbols
* TODO: This DOES NOT WORK for unknown reasons.
- Xorg fails to open vt7 with "permission denied" error message.
- WORKAROUND: chmod +s /usr/bin/Xorg
Modified:
desktop/experimental/gdm3/debian/changelog
desktop/experimental/gdm3/debian/control
desktop/experimental/gdm3/debian/control.in
desktop/experimental/gdm3/debian/gdm3.install
desktop/experimental/gdm3/debian/libgdm1.symbols
desktop/experimental/gdm3/debian/patches/08_frequent-users_greeter.patch
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/91_dconf_database_path.patch
desktop/experimental/gdm3/debian/patches/92_systemd_unit.patch
desktop/experimental/gdm3/debian/patches/93_disable_gvfs.patch
desktop/experimental/gdm3/debian/patches/94_retain_xorg_log.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=45737&op=diff
==============================================================================
--- desktop/experimental/gdm3/debian/changelog [utf-8] (original)
+++ desktop/experimental/gdm3/debian/changelog [utf-8] Fri Aug 21 21:48:16 2015
@@ -1,3 +1,32 @@
+gdm3 (3.17.4-1) UNRELEASED; urgency=medium
+
+ * New upstream development release.
+ * Update build-dependencies according to configure.ac changes:
+ - drop libxrandr-dev
+ * Update debian/rules according to configure.ac changes:
+ - drop --with/without-systemd and --with/without-consolekit,
+ these configure flags are no longer available.
+ * Drop debian/patches/07_fix_caribou_path.patch, obsoleted by
+ upstream removal of caribou autostart file removal.
+ * Temporarily disable patches which no longer apply:
+ - 17_switch_on_finish.patch
+ - 18_all_displays_transient.patch
+ - 19_switch_kill_greeter.patch
+ * Drop debian/patches/95_libsystemd.patch, fixed upstream.
+ * Drop debian/patches/08_frequent-users_greeter.patch, likely obsolete.
+ * Fix and refresh remaining patches to apply.
+ * debian/gdm3.install: drop debian/tmp/usr/share/gnome-session/,
+ gdm-shell.session no longer shipped upstream. See commit f66cdfcb2948.
+ "It's identical to gnome.session these days. All GDMification comes
+ from the overridden gnome-shell.desktop file."
+ * Update debian/libgdm1.symbols
+
+ * TODO: This DOES NOT WORK for unknown reasons.
+ - Xorg fails to open vt7 with "permission denied" error message.
+ - WORKAROUND: chmod +s /usr/bin/Xorg
+
+ -- Andreas Henriksson <andreas at fatal.se> Fri, 21 Aug 2015 14:41:53 +0200
+
gdm3 (3.14.2-2) unstable; urgency=medium
* Re-add our workaround which drops BusName from gdm.service. There are
Modified: desktop/experimental/gdm3/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gdm3/debian/control?rev=45737&op=diff
==============================================================================
--- desktop/experimental/gdm3/debian/control [utf-8] (original)
+++ desktop/experimental/gdm3/debian/control [utf-8] Fri Aug 21 21:48:16 2015
@@ -6,7 +6,7 @@
Section: gnome
Priority: optional
Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
-Uploaders: Josselin Mouette <joss at debian.org>, Laurent Bigonville <bigon at debian.org>, Michael Biebl <biebl at debian.org>
+Uploaders: Andreas Henriksson <andreas at fatal.se>, Josselin Mouette <joss at debian.org>, Laurent Bigonville <bigon at debian.org>, Michael Biebl <biebl at debian.org>
Build-Depends: gnome-pkg-tools (>= 0.16.3),
debhelper (>= 8.1.3),
cdbs (>= 0.4.122~),
@@ -27,7 +27,6 @@
libnss3-dev (>= 3.11.1),
libx11-dev,
libxau-dev,
- libxrandr-dev,
libxt-dev,
libxext-dev,
check (>= 0.9.10-2~),
Modified: desktop/experimental/gdm3/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gdm3/debian/control.in?rev=45737&op=diff
==============================================================================
--- desktop/experimental/gdm3/debian/control.in [utf-8] (original)
+++ desktop/experimental/gdm3/debian/control.in [utf-8] Fri Aug 21 21:48:16 2015
@@ -23,7 +23,6 @@
libnss3-dev (>= 3.11.1),
libx11-dev,
libxau-dev,
- libxrandr-dev,
libxt-dev,
libxext-dev,
check (>= 0.9.10-2~),
Modified: desktop/experimental/gdm3/debian/gdm3.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gdm3/debian/gdm3.install?rev=45737&op=diff
==============================================================================
--- desktop/experimental/gdm3/debian/gdm3.install [utf-8] (original)
+++ desktop/experimental/gdm3/debian/gdm3.install [utf-8] Fri Aug 21 21:48:16 2015
@@ -5,7 +5,6 @@
# gets renamed to gdm3 in binary-install
debian/tmp/usr/sbin/gdm
debian/tmp/usr/share/pixmaps/
-debian/tmp/usr/share/gnome-session/
debian/tmp/usr/share/locale/
debian/tmp/usr/share/icons/
debian/tmp/usr/share/help/
Modified: desktop/experimental/gdm3/debian/libgdm1.symbols
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gdm3/debian/libgdm1.symbols?rev=45737&op=diff
==============================================================================
--- desktop/experimental/gdm3/debian/libgdm1.symbols [utf-8] (original)
+++ desktop/experimental/gdm3/debian/libgdm1.symbols [utf-8] Fri Aug 21 21:48:16 2015
@@ -84,8 +84,12 @@
gdm_manager_call_open_session at Base 3.8.3
gdm_manager_call_open_session_finish at Base 3.8.3
gdm_manager_call_open_session_sync at Base 3.8.3
+ gdm_manager_call_register_display at Base 3.17.4
+ gdm_manager_call_register_display_finish at Base 3.17.4
+ gdm_manager_call_register_display_sync at Base 3.17.4
gdm_manager_complete_open_reauthentication_channel at Base 3.8.3
gdm_manager_complete_open_session at Base 3.8.3
+ gdm_manager_complete_register_display at Base 3.17.4
gdm_manager_dup_version at Base 3.8.3
gdm_manager_get_type at Base 3.8.3
gdm_manager_get_version at Base 3.8.3
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=45737&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] Fri Aug 21 21:48:16 2015
@@ -1,8 +1,6 @@
-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 @@
+--- a/daemon/gdm-session.c
++++ b/daemon/gdm-session.c
+@@ -2026,6 +2026,7 @@
0,
service_name);
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=45737&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] Fri Aug 21 21:48:16 2015
@@ -1,11 +1,9 @@
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.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 @@
+--- a/daemon/gdm-session.c
++++ b/daemon/gdm-session.c
+@@ -517,7 +517,7 @@
}
}
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=45737&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] Fri Aug 21 21:48:16 2015
@@ -1,8 +1,6 @@
-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 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -1184,7 +1184,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=45737&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] Fri Aug 21 21:48:16 2015
@@ -1,13 +1,14 @@
-Index: gdm3-3.12.1/data/gdm.conf-custom.in
-===================================================================
---- gdm3-3.12.1.orig/data/gdm.conf-custom.in 2014-04-26 16:31:15.765365729 +0200
-+++ gdm3-3.12.1/data/gdm.conf-custom.in 2014-04-26 16:31:39.233338510 +0200
-@@ -1,14 +1,29 @@
+--- a/data/gdm.conf-custom.in
++++ b/data/gdm.conf-custom.in
+@@ -1,18 +1,34 @@
# GDM configuration storage
+#
+# See /usr/share/gdm/gdm.schemas for a list of available options.
[daemon]
+ # Uncoment the line below to force the login screen to use Xorg
+ #WaylandEnable=false
+
+# Enabling automatic login
+# AutomaticLoginEnable = true
+# AutomaticLogin = user1
@@ -16,7 +17,7 @@
+# TimedLoginEnable = true
+# TimedLogin = user1
+# TimedLoginDelay = 10
-
++
[security]
[xdmcp]
@@ -29,7 +30,8 @@
[chooser]
[debug]
--
+ # Uncomment the line below to turn on debugging
+# More verbose logs
+# Additionally lets the X server dump core if it crashes
-+# Enable = true
+ #Enable=true
+
Modified: desktop/experimental/gdm3/debian/patches/91_dconf_database_path.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gdm3/debian/patches/91_dconf_database_path.patch?rev=45737&op=diff
==============================================================================
--- desktop/experimental/gdm3/debian/patches/91_dconf_database_path.patch [utf-8] (original)
+++ desktop/experimental/gdm3/debian/patches/91_dconf_database_path.patch [utf-8] Fri Aug 21 21:48:16 2015
@@ -1,7 +1,5 @@
-Index: gdm3-3.12.1/data/dconf/gdm.in
-===================================================================
---- gdm3-3.12.1.orig/data/dconf/gdm.in 2014-04-26 21:57:26.655244579 +0200
-+++ gdm3-3.12.1/data/dconf/gdm.in 2014-04-26 21:57:26.651244601 +0200
+--- a/data/dconf/gdm.in
++++ b/data/dconf/gdm.in
@@ -1,2 +1,2 @@
user-db:user
-file-db:@DATADIR@/@PACKAGE@/greeter-dconf-defaults
Modified: desktop/experimental/gdm3/debian/patches/92_systemd_unit.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gdm3/debian/patches/92_systemd_unit.patch?rev=45737&op=diff
==============================================================================
--- desktop/experimental/gdm3/debian/patches/92_systemd_unit.patch [utf-8] (original)
+++ desktop/experimental/gdm3/debian/patches/92_systemd_unit.patch [utf-8] Fri Aug 21 21:48:16 2015
@@ -1,8 +1,6 @@
-Index: gdm-3.14.2/data/gdm.service.in
-===================================================================
---- 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 @@
+--- a/data/gdm.service.in
++++ b/data/gdm.service.in
+@@ -20,14 +20,17 @@
OnFailure=plymouth-quit.service
[Service]
@@ -12,6 +10,7 @@
+ExecStart=@sbindir@/gdm3
+ExecReload=/bin/kill -HUP $MAINPID
+ExecReload=/usr/share/gdm/generate-config
+ KillMode=mixed
Restart=always
+RestartSec=1s
IgnoreSIGPIPE=no
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=45737&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] Fri Aug 21 21:48:16 2015
@@ -1,8 +1,6 @@
-Index: gdm3-3.12.1/daemon/gdm-launch-environment.c
-===================================================================
---- gdm3-3.12.1.orig/daemon/gdm-launch-environment.c 2014-04-10 18:58:02.000000000 +0200
-+++ gdm3-3.12.1/daemon/gdm-launch-environment.c 2014-05-06 14:41:41.240647859 +0200
-@@ -288,6 +288,9 @@
+--- a/daemon/gdm-launch-environment.c
++++ b/daemon/gdm-launch-environment.c
+@@ -183,6 +183,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"));
@@ -11,4 +9,4 @@
+ g_hash_table_insert (hash, g_strdup ("GVFS_REMOTE_VOLUME_MONITOR_IGNORE"), g_strdup ("1"));
g_hash_table_insert (hash, g_strdup ("DCONF_PROFILE"), g_strdup ("gdm"));
- if (launch_environment->priv->dbus_session_bus_address) {
+ return hash;
Modified: desktop/experimental/gdm3/debian/patches/94_retain_xorg_log.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gdm3/debian/patches/94_retain_xorg_log.patch?rev=45737&op=diff
==============================================================================
--- desktop/experimental/gdm3/debian/patches/94_retain_xorg_log.patch [utf-8] (original)
+++ desktop/experimental/gdm3/debian/patches/94_retain_xorg_log.patch [utf-8] Fri Aug 21 21:48:16 2015
@@ -5,12 +5,10 @@
Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=765771
Forwarded: no
-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 @@
- }
+--- a/daemon/gdm-server.c
++++ b/daemon/gdm-server.c
+@@ -243,12 +243,14 @@
+ * missing, or c) we are running for the main seat 'seat0'. */
#ifdef ENABLE_SYSTEMD_JOURNAL
- /* For systemd, we don't have a log file but instead log to stdout,
Modified: desktop/experimental/gdm3/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gdm3/debian/patches/series?rev=45737&op=diff
==============================================================================
--- desktop/experimental/gdm3/debian/patches/series [utf-8] (original)
+++ desktop/experimental/gdm3/debian/patches/series [utf-8] Fri Aug 21 21:48:16 2015
@@ -1,13 +1,10 @@
-07_fix_caribou_path.patch
-08_frequent-users_greeter.patch
09_default_session.patch
16_xserver_path.patch
-17_switch_on_finish.patch
-18_all_displays_transient.patch
-19_switch_kill_greeter.patch
+#17_switch_on_finish.patch
+#18_all_displays_transient.patch
+#19_switch_kill_greeter.patch
90_config_comments.patch
91_dconf_database_path.patch
92_systemd_unit.patch
93_disable_gvfs.patch
94_retain_xorg_log.patch
-95_libsystemd.patch
Modified: desktop/experimental/gdm3/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gdm3/debian/rules?rev=45737&op=diff
==============================================================================
--- desktop/experimental/gdm3/debian/rules [utf-8] (original)
+++ desktop/experimental/gdm3/debian/rules [utf-8] Fri Aug 21 21:48:16 2015
@@ -44,15 +44,13 @@
--with-initial-vt=7
ifeq (linux,$(DEB_HOST_ARCH_OS))
- DEB_CONFIGURE_EXTRA_FLAGS += --with-systemd \
+ DEB_CONFIGURE_EXTRA_FLAGS += \
--enable-wayland-support \
- --with-selinux \
- --without-console-kit
+ --with-selinux
else
- DEB_CONFIGURE_EXTRA_FLAGS += --without-systemd \
+ DEB_CONFIGURE_EXTRA_FLAGS += \
--disable-wayland-support \
- --without-selinux \
- --with-console-kit
+ --without-selinux
endif
DEB_CONFIGURE_EXTRA_FLAGS += --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH)
More information about the pkg-gnome-commits
mailing list