diff -u xscreensaver-5.26/debian/changelog xscreensaver-5.26/debian/changelog --- xscreensaver-5.26/debian/changelog +++ xscreensaver-5.26/debian/changelog @@ -1,3 +1,11 @@ +xscreensaver (5.26-1ubuntu3) utopic; urgency=medium + + * debian/patches/91_replace-gdmflexiserver.patch: + - Use dm-tool instead of gdmflexiserver for user-switching, + the latter is no longer provided by lightdm (LP: #1320560) + + -- Sean Davis Tue, 14 Oct 2014 07:07:45 -0400 + xscreensaver (5.26-1ubuntu2) utopic; urgency=medium * debian/control: Fix typo in Repleaces on xscreensaver-data diff -u xscreensaver-5.26/debian/patches/series xscreensaver-5.26/debian/patches/series --- xscreensaver-5.26/debian/patches/series +++ xscreensaver-5.26/debian/patches/series @@ -25,0 +26 @@ +91_replace-gdmflexiserver.patch only in patch2: unchanged: --- xscreensaver-5.26.orig/debian/patches/91_replace-gdmflexiserver.patch +++ xscreensaver-5.26/debian/patches/91_replace-gdmflexiserver.patch @@ -0,0 +1,40 @@ +Description: Replace gdmflexiserver with dm-tool + gdmflexiserver is no longer provided by lightdm. Replace it with dm-tool. +Author: Sean Davis +Bug-Ubuntu: https://launchpad.net/bugs/1320560 +Last-Update: 2014-09-07 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +--- a/driver/XScreenSaver.ad.in ++++ b/driver/XScreenSaver.ad.in +@@ -144,7 +144,7 @@ + ! + ! @NEW_LOGIN_COMMAND_P@*newLoginCommand: @NEW_LOGIN_COMMAND@ + ! Debian: Hard-wire the command in case the build machine does not have gdm +-*newLoginCommand: gdmflexiserver -ls ++*newLoginCommand: dm-tool switch-to-greeter + + + ! Turning on "installColormap" on 8-bit systems interacts erratically with +--- a/configure ++++ b/configure +@@ -10938,7 +10938,7 @@ + ############################################################################### + + with_login_manager_req=unspecified +-default_login_manager_1='gdmflexiserver -ls' ++default_login_manager_1='dm-tool switch-to-greeter' + default_login_manager_2='kdmctl reserve' + + +--- a/configure.in ++++ b/configure.in +@@ -2391,7 +2391,7 @@ + ############################################################################### + + with_login_manager_req=unspecified +-default_login_manager_1='gdmflexiserver -ls' ++default_login_manager_1='dm-tool switch-to-greeter' + default_login_manager_2='kdmctl reserve' + + AC_ARG_WITH(login-manager,