[arch-commits] Commit in xorg-xinit/trunk (PKGBUILD xinitrc xserverrc xsession)

[Andreas Radke]

    Date: Monday, March 16, 2015 @ 19:19:24
  Author: andyrtr
Revision: 233950

upgpkg: xorg-xinit 1.3.4-2

drop useless user skeleton files FS#41092; don't double 1 FS#42193

Modified:
  xorg-xinit/trunk/PKGBUILD
  xorg-xinit/trunk/xserverrc
Deleted:
  xorg-xinit/trunk/xinitrc
  xorg-xinit/trunk/xsession

-----------+
 PKGBUILD  |   16 +++-------------
 xinitrc   |   17 -----------------
 xserverrc |    6 +-----
 xsession  |   10 ----------
 4 files changed, 4 insertions(+), 45 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-03-16 17:28:26 UTC (rev 233949)
+++ PKGBUILD	2015-03-16 18:19:24 UTC (rev 233950)
@@ -4,7 +4,7 @@
 
 pkgname=xorg-xinit
 pkgver=1.3.4
-pkgrel=1
+pkgrel=2
 pkgdesc="X.Org initialisation program "
 arch=('i686' 'x86_64')
 license=('custom')
@@ -12,23 +12,17 @@
 depends=('libx11' 'xorg-xauth' 'inetutils')
 makedepends=('xorg-util-macros')
 optdepends=('xorg-twm' 'xterm')
-backup=('etc/skel/.xinitrc'
-        'etc/skel/.xsession'
-        'etc/X11/xinit/xserverrc'
+backup=('etc/X11/xinit/xserverrc'
         'etc/X11/xinit/xinitrc')
 source=(${url}/releases/individual/app/xinit-${pkgver}.tar.bz2
         06_move_serverauthfile_into_tmp.diff
         fs25361.patch
-        xinitrc
-        xsession
         xserverrc)
 options=(!emptydirs)
 sha256sums=('75d88d7397a07e01db253163b7c7a00b249b3d30e99489f2734cac9a0c7902b3'
             'a5c6ced5822bbb3145e0f30a4b12995782ca6d80ff2d927851ec91b5e41212cb'
             '431335ceb84f75aaa96fba285a596f61a63629f94756f8063e4f621ae143629b'
-            '38a23848b49de8a5c635a128a8b32a6cd0a08a9ee153ad97cb25abd82cfda1bc'
-            '2b94a42f2521cb5662fb9a5765a7507456dc0352ac9d0f44c56b359dcdb38898'
-            '5e87bff928c143d9db9966048f6530e83e9e9a1cac09ce4c25f8aabc08611b6f')
+            '86835010b5350c41035495b7b845db0eecf1e4b7eeaf152b12a881fa502e5387')
 
 prepare() {
   cd xinit-${pkgver}
@@ -47,10 +41,6 @@
 package() {
   cd xinit-${pkgver}
   make DESTDIR="${pkgdir}" install
-
-  install -m755 -d "${pkgdir}/etc/skel"
-  install -m644 "${srcdir}/xinitrc" "${pkgdir}/etc/skel/.xinitrc"
-  install -m644 "${srcdir}/xsession" "${pkgdir}/etc/skel/.xsession"
   install -m644 "${srcdir}/xserverrc" "${pkgdir}/etc/X11/xinit/xserverrc"
   install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
   install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"

Deleted: xinitrc
===================================================================
--- xinitrc	2015-03-16 17:28:26 UTC (rev 233949)
+++ xinitrc	2015-03-16 18:19:24 UTC (rev 233950)
@@ -1,17 +0,0 @@
-#!/bin/sh
-#
-# ~/.xinitrc
-#
-# Executed by startx (run your window manager from here)
-
-if [ -d /etc/X11/xinit/xinitrc.d ]; then
-  for f in /etc/X11/xinit/xinitrc.d/*; do
-    [ -x "$f" ] && . "$f"
-  done
-  unset f
-fi
-
-# exec gnome-session
-# exec startkde
-# exec startxfce4
-# ...or the Window Manager of your choice

Modified: xserverrc
===================================================================
--- xserverrc	2015-03-16 17:28:26 UTC (rev 233949)
+++ xserverrc	2015-03-16 18:19:24 UTC (rev 233950)
@@ -1,6 +1,2 @@
 #!/bin/sh
-if [ -z "$XDG_VTNR" ]; then
-  exec /usr/bin/X -nolisten tcp "$@"
-else
-  exec /usr/bin/X -nolisten tcp "$@" vt$XDG_VTNR
-fi
+exec /usr/bin/X -nolisten tcp "$@"

Deleted: xsession
===================================================================
--- xsession	2015-03-16 17:28:26 UTC (rev 233949)
+++ xsession	2015-03-16 18:19:24 UTC (rev 233950)
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-#
-# ~/.xsession
-#
-# Executed by xdm/gdm/kdm at login
-#
-
-/bin/bash --login -i ~/.xinitrc
-