[arch-commits] Commit in kexec-tools/repos (extra-x86_64 extra-x86_64/PKGBUILD)

[Eric Belanger]

    Date: Friday, June 20, 2008 @ 15:32:35
  Author: eric
Revision: 3155

fixing svn conflict

Modified:
  kexec-tools/repos/extra-x86_64/	(properties)
  kexec-tools/repos/extra-x86_64/PKGBUILD

----------+
 PKGBUILD |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)


Property changes on: kexec-tools/repos/extra-x86_64
___________________________________________________________________
Name: svnmerge-integrated
   - /kexec-tools/trunk:1
   + /kexec-tools/trunk:1-3154

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2008-06-20 19:25:24 UTC (rev 3154)
+++ extra-x86_64/PKGBUILD	2008-06-20 19:32:35 UTC (rev 3155)
@@ -6,12 +6,13 @@
 pkgver=1.101
 pkgrel=7
 pkgdesc="Load another kernel from the currently executing Linux kernel"
+arch=(i686 x86_64)
 url="http://www.xmission.com/~ebiederm/files/kexec/"
 source=(http://www.xmission.com/~ebiederm/files/kexec/$pkgname-$pkgver.tar.gz \
         kexec.conf.d kexec kexec-vesafb.diff)
 depends=('zlib' 'awk')
 backup=('etc/conf.d/kexec')
-arch=('i686' 'x86_64')
+arch=('i686')
 md5sums=('b4f7ffcc294d41a6a4c40d6e44b7734d' 'b9ddfb9fbcc7e4e7e7294fe94fa60aeb'\
          '15599234f174ddc4d2611f32effec6ab' '3c61494a396110768a60ba341bab2058')