diff options
author | Robby Workman <rworkman@slackbuilds.org> | 2014-02-16 00:49:21 -0600 |
---|---|---|
committer | Robby Workman <rworkman@slackbuilds.org> | 2014-02-16 01:49:02 -0600 |
commit | bb6f0cd84ac2aecbf52e70330c68130fd0b2a90f (patch) | |
tree | b57aba04af448d70e504b9398ea1690088bacf54 /system/gdm | |
parent | c8b41d3184a4b47dc6a8ea957fee9d937c30bc80 (diff) |
system/gdm: sysconfdir is now /etc/gdm/ instead of /etc/X11/gdm/
This commit also adds a few more files in sysconfdir to the
config() handling (with .new extensions).
Signed-off-by: Robby Workman <rworkman@slackbuilds.org>
Diffstat (limited to 'system/gdm')
-rw-r--r-- | system/gdm/doinst.sh | 16 | ||||
-rw-r--r-- | system/gdm/gdm.SlackBuild | 22 | ||||
-rw-r--r-- | system/gdm/patches/make_xfce_default_session.diff | 4 |
3 files changed, 29 insertions, 13 deletions
diff --git a/system/gdm/doinst.sh b/system/gdm/doinst.sh index e09179d821afb..0ffbca54b11db 100644 --- a/system/gdm/doinst.sh +++ b/system/gdm/doinst.sh @@ -11,11 +11,17 @@ config() { # Otherwise, we leave the .new copy for the admin to consider... } -config etc/X11/gdm/custom.conf.new -config etc/X11/gdm/Xsession.new -config etc/X11/gdm/Init/Default.new -config etc/X11/gdm/PreSession/Default.new -config etc/X11/gdm/PostSession/Default.new +config etc/gdm/Xsession.new +config etc/gdm/Init/Default.new +config etc/gdm/PreSession/Default.new +config etc/gdm/PostSession/Default.new +config etc/gdm/XKeepsCrashing.new +config etc/gdm/custom.conf.new +config etc/gdm/locale.alias.new +config etc/gdm/modules/factory-AccessDwellMouseEvents.new +config etc/gdm/modules/AccessDwellMouseEvents.new +config etc/gdm/modules/factory-AccessKeyMouseEvents.new +config etc/gdm/modules/AccessKeyMouseEvents.new if [ -x /usr/bin/update-desktop-database ]; then /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1 diff --git a/system/gdm/gdm.SlackBuild b/system/gdm/gdm.SlackBuild index 6b610e6c00876..2cce07f45c92d 100644 --- a/system/gdm/gdm.SlackBuild +++ b/system/gdm/gdm.SlackBuild @@ -68,7 +68,7 @@ CXXFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ - --sysconfdir=/etc/X11 \ + --sysconfdir=/etc \ --localstatedir=/var/lib \ --mandir=/usr/man \ --docdir=/usr/doc/$PRGNAM-$VERSION \ @@ -91,11 +91,21 @@ chmod 0755 $PKG/usr/share/xsessions/* patch -d $PKG -p1 < $CWD/patches/make_xfce_default_session.diff # Let's not clobber the configs -mv $PKG/etc/X11/gdm/custom.conf $PKG/etc/X11/gdm/custom.conf.new -mv $PKG/etc/X11/gdm/Xsession $PKG/etc/X11/gdm/Xsession.new -mv $PKG/etc/X11/gdm/Init/Default $PKG/etc/X11/gdm/Init/Default.new -mv $PKG/etc/X11/gdm/PreSession/Default $PKG/etc/X11/gdm/PreSession/Default.new -mv $PKG/etc/X11/gdm/PostSession/Default $PKG/etc/X11/gdm/PostSession/Default.new +mv $PKG/etc/gdm/custom.conf $PKG/etc/gdm/custom.conf.new +mv $PKG/etc/gdm/Xsession $PKG/etc/gdm/Xsession.new +mv $PKG/etc/gdm/Init/Default $PKG/etc/gdm/Init/Default.new +mv $PKG/etc/gdm/PreSession/Default $PKG/etc/gdm/PreSession/Default.new +mv $PKG/etc/gdm/PostSession/Default $PKG/etc/gdm/PostSession/Default.new +mv $PKG/etc/gdm/XKeepsCrashing $PKG/etc/gdm/XKeepsCrashing.new +mv $PKG/etc/gdm/locale.alias $PKG/etc/gdm/locale.alias.new +mv $PKG/etc/gdm/modules/factory-AccessDwellMouseEvents \ + $PKG/etc/gdm/modules/factory-AccessDwellMouseEvents.new +mv $PKG/etc/gdm/modules/AccessDwellMouseEvents \ + $PKG/etc/gdm/modules/AccessDwellMouseEvents.new +mv $PKG/etc/gdm/modules/factory-AccessKeyMouseEvents \ + $PKG/etc/gdm/modules/factory-AccessKeyMouseEvents.new +mv $PKG/etc/gdm/modules/AccessKeyMouseEvents \ + $PKG/etc/gdm/modules/AccessKeyMouseEvents.new find $PKG/usr/man -type f -exec gzip -9 {} \; for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done diff --git a/system/gdm/patches/make_xfce_default_session.diff b/system/gdm/patches/make_xfce_default_session.diff index 1b2fcc1ef9406..e5b220a5a16b0 100644 --- a/system/gdm/patches/make_xfce_default_session.diff +++ b/system/gdm/patches/make_xfce_default_session.diff @@ -1,5 +1,5 @@ ---- a/etc/X11/gdm/custom.conf 2009-07-31 00:32:22.065895378 -0500 -+++ b/etc/X11/gdm/custom.conf 2009-07-31 00:32:38.975622851 -0500 +--- a/etc/gdm/custom.conf 2009-07-31 00:32:22.065895378 -0500 ++++ b/etc/gdm/custom.conf 2009-07-31 00:32:38.975622851 -0500 @@ -54,6 +54,8 @@ [daemon] |