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

[andyrtr at archlinux.org]

    Date: Saturday, July 11, 2009 @ 10:13:23
  Author: andyrtr
Revision: 45426

fix svn conflict

Modified:
  libelf/repos/extra-i686/PKGBUILD
  libelf/repos/extra-x86_64/	(properties)
  libelf/repos/extra-x86_64/PKGBUILD

-----------------------+
 extra-i686/PKGBUILD   |   11 ++++++-----
 extra-x86_64/PKGBUILD |   11 ++++++-----
 2 files changed, 12 insertions(+), 10 deletions(-)

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2009-07-11 14:08:18 UTC (rev 45425)
+++ extra-i686/PKGBUILD	2009-07-11 14:13:23 UTC (rev 45426)
@@ -1,17 +1,18 @@
 # $Id$
-# Maintainer: arjan <arjan at archlinux.org>
+# Maintainer: Andreas Radke <andyrtr at archlinux.org>
+# Maintainer: Jan de Groot <jgc at archlinux.org>
 # Contributor: Tom Newsom <Jeepster at gmx.co.uk>
 
 pkgname=libelf
-pkgver=0.8.10
-pkgrel=3
+pkgver=0.8.12
+pkgrel=1
 pkgdesc="libelf is a free ELF object file access library"
 arch=(i686 x86_64)
 license=('GPL')
 source=(http://www.mr511.de/software/${pkgname}-${pkgver}.tar.gz)
-url="http://directory.fsf.org/libs/misc/libelf.html"
+url="http://www.mr511.de/software/"
 depends=('glibc')
-md5sums=('9db4d36c283d9790d8fa7df1f4d7b4d9')
+md5sums=('e21f8273d9f5f6d43a59878dc274fec7')
 
 build() {
     cd "${srcdir}/${pkgname}-${pkgver}"


Property changes on: libelf/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /libelf/trunk:1-20525
   + /libelf/trunk:1-45425

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2009-07-11 14:08:18 UTC (rev 45425)
+++ extra-x86_64/PKGBUILD	2009-07-11 14:13:23 UTC (rev 45426)
@@ -1,17 +1,18 @@
 # $Id$
-# Maintainer: arjan <arjan at archlinux.org>
+# Maintainer: Andreas Radke <andyrtr at archlinux.org>
+# Maintainer: Jan de Groot <jgc at archlinux.org>
 # Contributor: Tom Newsom <Jeepster at gmx.co.uk>
 
 pkgname=libelf
-pkgver=0.8.10
-pkgrel=3.1
+pkgver=0.8.12
+pkgrel=1
 pkgdesc="libelf is a free ELF object file access library"
 arch=(i686 x86_64)
 license=('GPL')
 source=(http://www.mr511.de/software/${pkgname}-${pkgver}.tar.gz)
-url="http://directory.fsf.org/libs/misc/libelf.html"
+url="http://www.mr511.de/software/"
 depends=('glibc')
-md5sums=('9db4d36c283d9790d8fa7df1f4d7b4d9')
+md5sums=('e21f8273d9f5f6d43a59878dc274fec7')
 
 build() {
     cd "${srcdir}/${pkgname}-${pkgver}"