[arch-commits] CVS update of arch/build/x11/xorg-xinit (PKGBUILD xinitrc xsession)

[Aaron Griffin]

    Date: Sunday, May 13, 2007 @ 02:18:24
  Author: aaron
    Path: /home/cvs-arch/arch/build/x11/xorg-xinit

   Added: xinitrc (1.1) xsession (1.1)
Modified: PKGBUILD (1.6 -> 1.7)

upgpkg: xorg-xinit 1.0.3-2
Moving skel/.xinitrc and skel/.xsession out of filesystem package to a more appropriate place


----------+
 PKGBUILD |   17 +++++++++++++----
 xinitrc  |   13 +++++++++++++
 xsession |   10 ++++++++++
 3 files changed, 36 insertions(+), 4 deletions(-)


Index: arch/build/x11/xorg-xinit/PKGBUILD
diff -u arch/build/x11/xorg-xinit/PKGBUILD:1.6 arch/build/x11/xorg-xinit/PKGBUILD:1.7
--- arch/build/x11/xorg-xinit/PKGBUILD:1.6	Tue Dec 26 06:42:35 2006
+++ arch/build/x11/xorg-xinit/PKGBUILD	Sun May 13 02:18:24 2007
@@ -1,19 +1,28 @@
-# $Id: PKGBUILD,v 1.6 2006/12/26 11:42:35 jgc Exp $
+# $Id: PKGBUILD,v 1.7 2007/05/13 06:18:24 aaron Exp $
 #Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=xorg-xinit
 pkgver=1.0.3
-pkgrel=1
+pkgrel=2
 pkgdesc="X.Org initialisation program "
 arch=(i686 x86_64)
+license=('GPL')
 url="http://xorg.freedesktop.org/"
 depends=(libx11 xorg-xauth)
-source=(${url}/releases/individual/app/xinit-${pkgver}.tar.bz2)
-md5sums=('f04a903cc0e18b3c338f58eb90f6caf8')
+backup=(etc/skel/.xinitrc etc/skel/.xsession)
+source=(${url}/releases/individual/app/xinit-${pkgver}.tar.bz2 \
+        xinitrc xsession)
+md5sums=('f04a903cc0e18b3c338f58eb90f6caf8' \
+         'c984f45a636386408ecc505a343907ab' \
+         '7873d97db30d6c279ed37e3559e7c59d')
 
 build() {
   cd ${startdir}/src/xinit-${pkgver}
   ./configure --prefix=/usr
   make XINITDIR=/etc/X11/xinit || return 1
   make XINITDIR=/etc/X11/xinit DESTDIR=${startdir}/pkg install || return 1
+
+  mkdir -p $startdir/pkg/etc/skel/
+  install -D -m755 $startdir/src/xinitrc $startdir/pkg/etc/skel/.xinitrc
+  install -D -m755 $startdir/src/xsession $startdir/pkg/etc/skel/.xsession
 }
Index: arch/build/x11/xorg-xinit/xinitrc
diff -u /dev/null arch/build/x11/xorg-xinit/xinitrc:1.1
--- /dev/null	Sun May 13 02:18:24 2007
+++ arch/build/x11/xorg-xinit/xinitrc	Sun May 13 02:18:24 2007
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+#
+# ~/.xinitrc
+#
+# Executed by startx (run your window manager from here)
+#
+
+exec wmaker
+# exec startkde
+# exec icewm
+# exec blackbox
+# exec fluxbox
Index: arch/build/x11/xorg-xinit/xsession
diff -u /dev/null arch/build/x11/xorg-xinit/xsession:1.1
--- /dev/null	Sun May 13 02:18:24 2007
+++ arch/build/x11/xorg-xinit/xsession	Sun May 13 02:18:24 2007
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+#
+# ~/.xsession
+#
+# Executed by xdm/gdm/kdm at login
+#
+
+/bin/bash --login -i ~/.xinitrc
+