[arch-commits] Commit in xfce4-dev-tools/repos (3 files)

[andyrtr at archlinux.org]

    Date: Saturday, February 28, 2009 @ 06:38:53
  Author: andyrtr
Revision: 28219

Merged revisions 356,25950,28069,28093,28095 via svnmerge from 
svn+ssh://svn.archlinux.org/srv/svn-packages/xfce4-dev-tools/trunk

........
  r356 | aaron | 2008-04-18 22:56:27 +0000 (Fr, 18 Apr 2008) | 1 line
  
  Added svn:keywords to all PKGBUILDs
........
  r25950 | andyrtr | 2009-02-01 16:26:07 +0000 (So, 01 Feb 2009) | 2 lines
  
  upgpkg: xfce4-dev-tools 4.5.99.1-1
      new verions 4.5.99.1(=4.6rc1)
........
  r28069 | andyrtr | 2009-02-27 21:12:35 +0000 (Fr, 27 Feb 2009) | 2 lines
  
  upgpkg: xfce4-dev-tools 4.6.0-1
      new version 4.6.0
........
  r28093 | andyrtr | 2009-02-27 21:54:31 +0000 (Fr, 27 Feb 2009) | 2 lines
  
  upgpkg: xfce4-dev-tools 4.6.0-1
      new version 4.6.0
........
  r28095 | andyrtr | 2009-02-27 22:12:21 +0000 (Fr, 27 Feb 2009) | 2 lines
  
  upgpkg: xfce4-dev-tools 4.6.0-1
      new version 4.6.0
........

Modified:
  xfce4-dev-tools/repos/extra-i686/	(properties)
  xfce4-dev-tools/repos/extra-i686/PKGBUILD
  xfce4-dev-tools/repos/extra-x86_64/	(properties)

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


Property changes on: xfce4-dev-tools/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /xfce4-dev-tools/trunk:1
   + /xfce4-dev-tools/trunk:1-28218

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2009-02-28 11:33:51 UTC (rev 28218)
+++ extra-i686/PKGBUILD	2009-02-28 11:38:53 UTC (rev 28219)
@@ -1,8 +1,13 @@
+<<<<<<< .working
 # $Id$
 # Maintainer: aurelien <aurelien at archlinux.org>
+=======
+# $Id$
+# Maintainer: Tobias Kieslich <tobias funnychar archlinux.org>
+>>>>>>> .merge-right.r28095
 
 pkgname=xfce4-dev-tools
-pkgver=4.4.0.1
+pkgver=4.6.0
 pkgrel=1
 pkgdesc="Xfce developer tools"
 arch=(i686 x86_64)
@@ -12,13 +17,13 @@
 depends=('gtk-doc' 'automake' 'make' 'intltool')
 makedepends=('pkgconfig')
 options=('!libtool')
-source=(http://mocha.xfce.org/archive/xfce-4.4.2/src/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('7d09d161efc7ef86b3b48791d98c8ae8')
+source=(http://mocha.xfce.org/archive/xfce-${pkgver}/src/${pkgname}-${pkgver}.tar.bz2)
+md5sums=('c9587fa78e877eee858a33391d0afd62')
 
 build() {
   cd ${startdir}/src/${pkgname}-${pkgver}
-  ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib/xfce4 \
+  ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib \
     --localstatedir=/var --disable-static
   make || return 1
-  make DESTDIR=${startdir}/pkg install
+  make DESTDIR=${startdir}/pkg install || return 1
 }


Property changes on: xfce4-dev-tools/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /xfce4-dev-tools/trunk:1
   + /xfce4-dev-tools/trunk:1-28095