[arch-commits] Commit in xorg-xinit/repos (extra-x86_64 extra-x86_64/PKGBUILD)

[Jan de Groot]

    Date: Saturday, June 21, 2008 @ 08:25:42
  Author: jgc
Revision: 3176

Merged revisions 2-3175 via svnmerge from 
svn+ssh://svn.archlinux.org/home/svn-packages/xorg-xinit/trunk

........
  r356 | aaron | 2008-04-18 22:56:27 +0000 (Fri, 18 Apr 2008) | 1 line
  
  Added svn:keywords to all PKGBUILDs
........
  r3175 | jgc | 2008-06-21 12:25:21 +0000 (Sat, 21 Jun 2008) | 1 line
  
  upgpkg: xorg-xinit 1.1.0-1
........

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

----------+
 PKGBUILD |   36 +++++++++++++++++++++---------------
 1 file changed, 21 insertions(+), 15 deletions(-)


Property changes on: xorg-xinit/repos/extra-x86_64
___________________________________________________________________
Name: svnmerge-integrated
   - /xorg-xinit/trunk:1
   + /xorg-xinit/trunk:1-3175

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2008-06-21 12:25:21 UTC (rev 3175)
+++ extra-x86_64/PKGBUILD	2008-06-21 12:25:42 UTC (rev 3176)
@@ -2,19 +2,28 @@
 # Maintainer: Alexander Baldeck <alexander at archlinux.org>
 # Contributor: Jan de Groot <jgc at archlinux.org>
 pkgname=xorg-xinit
-pkgver=1.0.7
-pkgrel=3
+pkgver=1.1.0
+pkgrel=1
 pkgdesc="X.Org initialisation program "
 arch=(i686 x86_64)
 license=('GPL')
 url="http://xorg.freedesktop.org/"
-depends=(libx11 xorg-xauth)
-makedepends=(pkgconfig)
-backup=(etc/skel/.xinitrc etc/skel/.xsession etc/X11/xinit/xserverrc etc/X11/xinit/xinitrc)
+depends=('libx11' 'xorg-xauth')
+makedepends=('pkgconfig')
+backup=('etc/skel/.xinitrc'
+	'etc/skel/.xsession'
+	'etc/X11/xinit/xserverrc'
+	'etc/X11/xinit/xinitrc')
 groups=('xorg')
-source=(${url}/releases/individual/app/xinit-${pkgver}.tar.bz2 \
-        xinitrc xsession xserverrc)
+source=(${url}/releases/individual/app/xinit-${pkgver}.tar.bz2
+	xinitrc
+	xsession
+	xserverrc)
 options=(!emptydirs)
+md5sums=('9144097186c3d2454beffe8ac3b53c6e'
+         'f165d9a52284ef8cd4c8a129463a2b49'
+         '7873d97db30d6c279ed37e3559e7c59d'
+         'bb550d3b9a2d2b6cbe6e2667a3a7cd03')
 
 build() {
   cd ${startdir}/src/xinit-${pkgver}
@@ -22,12 +31,9 @@
   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
-  install -m755 ${startdir}/src/xserverrc ${startdir}/pkg/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
 }
-md5sums=('8b882d9e2deed9d85469a3beaec566a3'
-         'f165d9a52284ef8cd4c8a129463a2b49'
-         '7873d97db30d6c279ed37e3559e7c59d'
-         'bb550d3b9a2d2b6cbe6e2667a3a7cd03')