[arch-commits] Commit in xorg-xinit/repos (3 files)

[andyrtr at archlinux.org]

    Date: Friday, February 13, 2009 @ 12:13:44
  Author: andyrtr
Revision: 26870

Merged revisions 26174,26599 via svnmerge from 
svn+ssh://svn.archlinux.org/srv/svn-packages/xorg-xinit/trunk

........
  r26174 | aaron | 2009-02-03 18:01:17 +0000 (Di, 03 Feb 2009) | 1 line
  
  FS#7202: Clean up the list of WM/DE choices
........
  r26599 | jgc | 2009-02-09 21:44:56 +0000 (Mo, 09 Feb 2009) | 1 line
  
  upgpkg: xorg-xinit 1.1.1-1
........

Modified:
  xorg-xinit/repos/extra-i686/	(properties)
  xorg-xinit/repos/extra-i686/PKGBUILD
  xorg-xinit/repos/extra-i686/xinitrc

----------+
 PKGBUILD |   22 +++++++++++-----------
 xinitrc  |   10 +---------
 2 files changed, 12 insertions(+), 20 deletions(-)


Property changes on: xorg-xinit/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /xorg-xinit/trunk:1-3231
   + /xorg-xinit/trunk:1-26869

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2009-02-13 17:11:51 UTC (rev 26869)
+++ extra-i686/PKGBUILD	2009-02-13 17:13:44 UTC (rev 26870)
@@ -2,7 +2,7 @@
 # Maintainer: Alexander Baldeck <alexander at archlinux.org>
 # Contributor: Jan de Groot <jgc at archlinux.org>
 pkgname=xorg-xinit
-pkgver=1.1.0
+pkgver=1.1.1
 pkgrel=1
 pkgdesc="X.Org initialisation program "
 arch=(i686 x86_64)
@@ -20,20 +20,20 @@
 	xsession
 	xserverrc)
 options=(!emptydirs)
-md5sums=('9144097186c3d2454beffe8ac3b53c6e'
-         'f165d9a52284ef8cd4c8a129463a2b49'
+md5sums=('93c73705ed9eb1e1a6b6938405672f2b'
+         'cee2d70748a089fbc7db64a4a6e8fdb1'
          '7873d97db30d6c279ed37e3559e7c59d'
          'bb550d3b9a2d2b6cbe6e2667a3a7cd03')
 
 build() {
-  cd ${startdir}/src/xinit-${pkgver}
-  ./configure --prefix=/usr
+  cd "${srcdir}/xinit-${pkgver}"
+  ./configure --prefix=/usr || return 1
   make XINITDIR=/etc/X11/xinit || return 1
-  make XINITDIR=/etc/X11/xinit DESTDIR=${startdir}/pkg install || return 1
+  make XINITDIR=/etc/X11/xinit DESTDIR="${pkgdir}" install || return 1
 
-  install -m755 -d ${pkgdir}/etc/skel
-  install -m755 -d ${pkgdir}/etc/X11/xinit
-  install -m755 ${srcdir}/xinitrc ${pkgdir}/etc/skel/.xinitrc || return 1
-  install -m755 ${srcdir}/xsession ${pkgdir}/etc/skel/.xsession || return 1
-  install -m755 ${srcdir}/xserverrc ${pkgdir}/etc/X11/xinit/xserverrc
+  install -m755 -d "${pkgdir}/etc/skel"
+  install -m755 -d "${pkgdir}/etc/X11/xinit"
+  install -m755 "${srcdir}/xinitrc" "${pkgdir}/etc/skel/.xinitrc" || return 1
+  install -m755 "${srcdir}/xsession" "${pkgdir}/etc/skel/.xsession" || return 1
+  install -m755 "${srcdir}/xserverrc" "${pkgdir}/etc/X11/xinit/xserverrc" || return 1
 }

Modified: extra-i686/xinitrc
===================================================================
--- extra-i686/xinitrc	2009-02-13 17:11:51 UTC (rev 26869)
+++ extra-i686/xinitrc	2009-02-13 17:13:44 UTC (rev 26870)
@@ -1,18 +1,10 @@
 #!/bin/sh
-
 #
 # ~/.xinitrc
 #
 # Executed by startx (run your window manager from here)
-#
 
 # exec gnome-session
 # exec startkde
 # exec startxfce4
-# exec icewm
-# exec openbox
-# exec blackbox
-# exec fluxbox
-# exec ratpoison
-# exec dwm
-# ... or any other WM of your choosing ...
+# ...or the Window Manager of your choice