[arch-commits] Commit in xfce4-session/repos (extra-x86_64 extra-x86_64/PKGBUILD)

[Eric Belanger]

    Date: Sunday, September 7, 2008 @ 19:15:36
  Author: eric
Revision: 12017

fixing svn conflicts

Modified:
  xfce4-session/repos/extra-x86_64/	(properties)
  xfce4-session/repos/extra-x86_64/PKGBUILD

----------+
 PKGBUILD |   15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)


Property changes on: xfce4-session/repos/extra-x86_64
___________________________________________________________________
Name: svnmerge-integrated
   - /xfce4-session/trunk:1-5763
   + /xfce4-session/trunk:1-12016

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2008-09-07 23:11:24 UTC (rev 12016)
+++ extra-x86_64/PKGBUILD	2008-09-07 23:15:36 UTC (rev 12017)
@@ -1,22 +1,21 @@
 # $Id$
-# Maintainer: aurelien <aurelien at archlinux.org>
+# Maintainer: Tobias Kieslich <tobias at archlinux.org>
 
 pkgname=xfce4-session
 pkgver=4.4.2
-pkgrel=2
+pkgrel=3
 pkgdesc="A session manager for Xfce"
 arch=(i686 x86_64)
 license=('GPL2')
 url="http://www.xfce.org/"
 groups=('xfce4')
 depends=('libxfcegui4>=4.4.2' 'libxfce4mcs>=4.4.2' 'dbus>=1.2.1')
-makedepends=('xfce-mcs-manager>=4.4.2' 'pkgconfig')
+makedepends=('xfce-mcs-manager>=4.4.2' 'pkgconfig' 'perlxml' 'xorg-server-utils')
 replaces=('xfce4-toys')
 options=('!libtool')
 install=${pkgname}.install
-source=(http://www.xfce.org/archive/xfce-${pkgver}/src/${pkgname}-${pkgver}.tar.bz2 \
-        ftp://ftp.archlinux.org/other/xfce4-graphics/ArchLinux-xfce4-balou.tar.gz)
-md5sums=('4c3d1acb8ce37ea4dd55d82aeb38e9e7' 'c5daea785ed798147eae2fb443dfe452')
+source=(http://www.xfce.org/archive/xfce-${pkgver}/src/${pkgname}-${pkgver}.tar.bz2)
+md5sums=('4c3d1acb8ce37ea4dd55d82aeb38e9e7')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
@@ -26,8 +25,4 @@
     --with-shutdown-style=auto || return 1
   make || return 1
   make DESTDIR=${pkgdir} install || return 1
-  install -m755 -d ${pkgdir}/usr/share/themes
-  cp -r ../ArchLinux ${pkgdir}/usr/share/themes/ || return 1
-  # FIXME: remove some leftover files from artwork package
-  rm -rf ${pkgdir}/usr/share/themes/ArchLinux/balou/.thumbnails
 }