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

[Jan de Groot]

    Date: Saturday, June 21, 2008 @ 11:50:01
  Author: jgc
Revision: 3230

Merged revisions 666-3229 via svnmerge from 
svn+ssh://svn.archlinux.org/home/svn-packages/xproto/trunk

........
  r3169 | jgc | 2008-06-21 12:11:23 +0000 (Sat, 21 Jun 2008) | 1 line
  
  upgpkg: xproto 7.0.13-1
........
  r3171 | jgc | 2008-06-21 12:12:05 +0000 (Sat, 21 Jun 2008) | 2 lines
  
  Remove xorg.sh
........

Modified:
  xproto/repos/extra-i686/	(properties)
  xproto/repos/extra-i686/PKGBUILD
Deleted:
  xproto/repos/extra-i686/xorg.sh

----------+
 PKGBUILD |    6 +++---
 xorg.sh  |   15 ---------------
 2 files changed, 3 insertions(+), 18 deletions(-)


Property changes on: xproto/repos/extra-i686
___________________________________________________________________
Name: svnmerge-integrated
   - /xproto/trunk:1-665
   + /xproto/trunk:1-3229

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2008-06-21 15:24:12 UTC (rev 3229)
+++ extra-i686/PKGBUILD	2008-06-21 15:50:01 UTC (rev 3230)
@@ -2,21 +2,21 @@
 # Maintainer: Alexander Baldeck <alexander at archlinux.org>
 # Contributor: Jan de Groot <jgc at archlinux.org>
 pkgname=xproto
-pkgver=7.0.12
+pkgver=7.0.13
 pkgrel=1
 pkgdesc="X11 core wire protocol and auxiliary headers"
 arch=(i686 x86_64)
 license=('custom')
 url="http://xorg.freedesktop.org/"
 source=(${url}/releases/individual/proto/${pkgname}-${pkgver}.tar.bz2)
+md5sums=('7d26f45dca52632712a696e0631dc17b')
 
 build() {
   cd ${startdir}/src/${pkgname}-${pkgver}
-  ./configure --prefix=/usr
+  ./configure --prefix=/usr || return 1
   make || return 1
   make DESTDIR=${startdir}/pkg install || return 1
 
   install -D -m644 ${startdir}/src/${pkgname}-${pkgver}/COPYING \
                    ${startdir}/pkg/usr/share/licenses/${pkgname}/COPYING
 }
-md5sums=('388234421add6c1760b4fc99fcdc76b0')

Deleted: extra-i686/xorg.sh
===================================================================
--- extra-i686/xorg.sh	2008-06-21 15:24:12 UTC (rev 3229)
+++ extra-i686/xorg.sh	2008-06-21 15:50:01 UTC (rev 3230)
@@ -1,15 +0,0 @@
-export XDG_DATA_HOME=$HOME/.local/share
-export XDG_CONFIG_HOME=$HOME/.config
-export XDG_CACHE_HOME=$HOME/.cache
-
-if [ -z $XDG_DATA_DIRS ]; then
-	export XDG_DATA_DIRS=/usr/share:/usr/local/share
-else
-	export XDG_DATA_DIRS=/usr/share:/usr/local/share:$XDG_DATA_DIRS
-fi
-
-if [ -z $XDG_CONFIG_DIRS ]; then
-	export XDG_CONFIG_DIRS=/etc/xdg
-else
-	export XDG_CONFIG_DIRS=/etc/xdg:$XDG_CONFIG_DIRS
-fi