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

[Eric Bélanger]

    Date: Thursday, October 15, 2009 @ 00:13:16
  Author: eric
Revision: 55867

fixed svn merge problem

Modified:
  imagemagick/repos/extra-i686/ChangeLog
  imagemagick/repos/extra-i686/PKGBUILD

-----------+
 ChangeLog |    5 +++++
 PKGBUILD  |    6 +++---
 2 files changed, 8 insertions(+), 3 deletions(-)

Modified: ChangeLog
===================================================================
--- ChangeLog	2009-10-15 03:14:32 UTC (rev 55866)
+++ ChangeLog	2009-10-15 04:13:16 UTC (rev 55867)
@@ -1,3 +1,8 @@
+2009-10-14  Eric Belanger  <eric at archlinux.org>
+
+	* imagemagick 6.5.6.10-1
+	* Upstream update
+
 2009-09-18  Eric Belanger  <eric at archlinux.org>
 
 	* imagemagick 6.5.6.1-1

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2009-10-15 03:14:32 UTC (rev 55866)
+++ PKGBUILD	2009-10-15 04:13:16 UTC (rev 55867)
@@ -6,7 +6,7 @@
 # Just uninstalling ImageMagick before build fails as it is used during the build processs
 
 pkgname=imagemagick
-pkgver=6.5.6.1
+pkgver=6.5.6.10
 pkgrel=1
 pkgdesc="An image viewing/manipulation program"
 arch=('i686' 'x86_64')
@@ -18,9 +18,9 @@
 options=('!makeflags' '!docs')
 source=(ftp://ftp.imagemagick.org/pub/ImageMagick/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.bz2 \
         libpng_mmx_patch_x86_64.patch add_delegate.patch perlmagick.rpath.patch)
-md5sums=('e74cc971e0e6dbf14e498fceba86a33a' '069980fc2590c02aed86420996259302'\
+md5sums=('126011a6ae3196f5aac252217380e962' '069980fc2590c02aed86420996259302'\
          '7f5851c4450b73d52df55c7e806cc316' 'ff9974decbfe9846f8e347239d87e4eb')
-sha1sums=('73b4125e14f4cce577a7d861c58275cc49b768b3' 'e42f3acbe85b6098af75c5cecc9a254baaa0482c'\
+sha1sums=('53d732cadf7bc62b4342c103796f8d8f30424d8f' 'e42f3acbe85b6098af75c5cecc9a254baaa0482c'\
          '19b40dcbc5bf8efb8ce7190fed17e2921de32ea5' '23405f80904b1de94ebd7bd6fe2a332471b8c283')
 
 build() {