summaryrefslogtreecommitdiff
path: root/extra/imagemagick
diff options
context:
space:
mode:
authorNicolás Reynolds <fauno@kiwwwi.com.ar>2012-10-17 10:20:19 -0300
committerNicolás Reynolds <fauno@kiwwwi.com.ar>2012-10-17 10:20:19 -0300
commit66e4c91d4531eef5adcd9dbe4a71e63c9b72cd7e (patch)
tree19e3e26a15f15fc8405ba2016fe9d4cc19919833 /extra/imagemagick
parentc646bdd97c63b2d81bc27060203fabfebabda716 (diff)
parentc84b2cd310f86dc50c4f52a5907cb17652e8c87c (diff)
Merged upstream, mesa needs revision
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el Conflicts: community-staging/gigi/PKGBUILD community-staging/lxdm/PKGBUILD community-staging/lxdm/lxdm-pam community-staging/lxdm/lxdm.install community-staging/lxdm/service community-testing/gigi/PKGBUILD community/calf/PKGBUILD community/freedroidrpg/PKGBUILD community/gmic/PKGBUILD community/gnash/PKGBUILD community/prboom/PKGBUILD community/scorched3d/PKGBUILD community/tmux/PKGBUILD community/torcs/PKGBUILD core/curl/PKGBUILD core/systemd/PKGBUILD core/sysvinit/PKGBUILD extra/akonadi/PKGBUILD extra/bzflag/PKGBUILD extra/dhcp/PKGBUILD extra/ftgl/PKGBUILD extra/gcin/PKGBUILD extra/imagemagick/PKGBUILD extra/mesa/PKGBUILD extra/python-telepathy/PKGBUILD extra/qtiplot/PKGBUILD extra/ruby/PKGBUILD extra/wireshark/PKGBUILD extra/xfce4-xkb-plugin/PKGBUILD extra/xine-lib/PKGBUILD extra/xorg-server/PKGBUILD gnome-unstable/at-spi2-atk/PKGBUILD gnome-unstable/at-spi2-core/PKGBUILD gnome-unstable/baobab/PKGBUILD gnome-unstable/epiphany/PKGBUILD gnome-unstable/gdm/PKGBUILD gnome-unstable/glib2/PKGBUILD gnome-unstable/gnome-games/PKGBUILD gnome-unstable/gnome-screensaver/PKGBUILD gnome-unstable/gnome-session/PKGBUILD gnome-unstable/gtk3/PKGBUILD gnome-unstable/libpeas/PKGBUILD gnome-unstable/libsoup/PKGBUILD gnome-unstable/mutter/PKGBUILD gnome-unstable/networkmanager/PKGBUILD multilib/lib32-glew/PKGBUILD multilib/lib32-gnutls/PKGBUILD multilib/lib32-mesa/PKGBUILD multilib/lib32-sqlite/PKGBUILD multilib/wine/PKGBUILD multilib/wine_gecko/PKGBUILD staging/calligra/PKGBUILD staging/inkscape/PKGBUILD staging/kdebase-workspace/PKGBUILD staging/kdebase-workspace/kde-np.pam staging/kdebase-workspace/kde.pam staging/kdebase-workspace/kdm.service staging/libreoffice/PKGBUILD staging/libreoffice/libreoffice-common.csh staging/libreoffice/libreoffice-common.sh staging/poppler/PKGBUILD testing/dbus-python/PKGBUILD testing/e2fsprogs/PKGBUILD testing/iproute2/PKGBUILD testing/iptables/PKGBUILD testing/kdebase-workspace/PKGBUILD testing/kdebase-workspace/kde-np.pam testing/kdebase-workspace/kde.pam testing/kdebindings-python/PKGBUILD testing/lvm2/PKGBUILD testing/lvm2/lvm-on-crypt.service testing/lvm2/lvm.service testing/miro/PKGBUILD testing/postgresql/PKGBUILD testing/postgresql/postgresql.install testing/postgresql/postgresql.service testing/ppp/PKGBUILD testing/ppp/ip-down testing/pyqt/PKGBUILD testing/qscintilla/PKGBUILD testing/sip/PKGBUILD testing/systemd/PKGBUILD testing/systemd/systemd.install testing/util-linux/PKGBUILD testing/wpa_supplicant/PKGBUILD testing/wpa_supplicant/config testing/xf86-video-intel/PKGBUILD
Diffstat (limited to 'extra/imagemagick')
-rw-r--r--extra/imagemagick/PKGBUILD6
1 files changed, 3 insertions, 3 deletions
diff --git a/extra/imagemagick/PKGBUILD b/extra/imagemagick/PKGBUILD
index 416959b14..745801964 100644
--- a/extra/imagemagick/PKGBUILD
+++ b/extra/imagemagick/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 167199 2012-09-27 17:38:29Z eric $
+# $Id: PKGBUILD 168520 2012-10-13 05:48:33Z eric $
# Maintainer: Eric Bélanger <eric@archlinux.org>
pkgbase=imagemagick
pkgname=('imagemagick' 'imagemagick-doc')
-pkgver=6.7.9.9
-pkgrel=1
+pkgver=6.7.9.8
+pkgrel=2
arch=('i686' 'x86_64' 'mips64el')
url="http://www.imagemagick.org/"
license=('custom')