[arch-commits] Commit in exo/repos (extra-i686 extra-i686/PKGBUILD)

[andyrtr at archlinux.org]

    Date: Monday, April 20, 2009 @ 18:08:13
  Author: andyrtr
Revision: 36305

fix svn conflicts

Modified:
  exo/repos/extra-i686/	(properties)
  exo/repos/extra-i686/PKGBUILD

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


Property changes on: exo/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /exo/trunk:1-28205
   + /exo/trunk:1-36304

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2009-04-20 22:04:24 UTC (rev 36304)
+++ extra-i686/PKGBUILD	2009-04-20 22:08:13 UTC (rev 36305)
@@ -3,21 +3,21 @@
 # Contributor: Aurelien Foret <orelien at chez.com>
 
 pkgname=exo
-pkgver=0.3.100
+pkgver=0.3.101
 pkgrel=1
 pkgdesc="Extensions to Xfce by os-cillation"
 arch=('i686' 'x86_64')
 license=('GPL2' 'LGPL2')
 url="http://www.os-cillation.com/article.php?sid=40"
 groups=('xfce4')
-depends=("libxfce4util>=4.6.0" "hal>=0.5.11-7" 'hicolor-icon-theme')
-makedepends=("pygtk>=2.14.0" 'pkgconfig' 'libnotify' 'perl-uri' 'intltool')
+depends=("libxfce4util>=4.6.1" "hal>=0.5.12git20090406" 'hicolor-icon-theme')
+makedepends=("pygtk>=2.14.1" 'pkgconfig' 'libnotify' 'perl-uri' 'intltool')
 optdepends=('libnotify		enables notification support' \
             'perl		enables mail-compose helper script')
 options=('!libtool')
 install=${pkgname}.install
-source=(http://www.xfce.org/archive/xfce-4.6.0/src/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('ebded97ff55f43cd0fe6b16242992ecf')
+source=(http://www.xfce.org/archive/xfce-4.6.1/src/${pkgname}-${pkgver}.tar.bz2)
+md5sums=('1c0eebb360f53eab70454b70e1bde36e')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}