summaryrefslogtreecommitdiff
path: root/community/python-psutil
diff options
context:
space:
mode:
authorNicolás Reynolds <fauno@kiwwwi.com.ar>2012-10-18 10:38:15 -0300
committerNicolás Reynolds <fauno@kiwwwi.com.ar>2012-10-18 10:38:15 -0300
commit59d570b2f4d752b3cd4dfcdf2ce8c75993d9c2eb (patch)
tree452fb18314fb6d4393552d1ef1190a3168353f44 /community/python-psutil
parentbb3524a1ba0370174d0c586ae94cd503b562a207 (diff)
parent9e3985ed7c9851da65023a0ab3d0739cce1858e2 (diff)
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts: community-staging/gambas2/PKGBUILD community-staging/gambas3/PKGBUILD community-staging/libextractor/PKGBUILD community-staging/pdf2djvu/PKGBUILD community/dante/PKGBUILD community/gnunet/PKGBUILD community/luafilesystem/PKGBUILD community/luajit/PKGBUILD community/python-mpi4py/PKGBUILD community/python-psutil/PKGBUILD extra/gnome-python-desktop/PKGBUILD extra/pycrypto/PKGBUILD extra/pygobject/PKGBUILD extra/pygobject2/PKGBUILD extra/pyopenssl/PKGBUILD extra/python/PKGBUILD extra/vde2/PKGBUILD gnome-unstable/clutter-gtk/PKGBUILD gnome-unstable/clutter/PKGBUILD gnome-unstable/eog/PKGBUILD gnome-unstable/evolution-data-server/PKGBUILD gnome-unstable/gcr/PKGBUILD gnome-unstable/gnome-desktop/PKGBUILD gnome-unstable/gnome-keyring/PKGBUILD gnome-unstable/gnome-themes-standard/PKGBUILD gnome-unstable/gobject-introspection/PKGBUILD staging/kdebase-workspace/PKGBUILD testing/iputils/PKGBUILD testing/php/PKGBUILD testing/php/php-fpm.conf.in.patch testing/php/php-fpm.service testing/php/rc.d.php-fpm
Diffstat (limited to 'community/python-psutil')
-rw-r--r--community/python-psutil/PKGBUILD4
1 files changed, 2 insertions, 2 deletions
diff --git a/community/python-psutil/PKGBUILD b/community/python-psutil/PKGBUILD
index 763fcb9ba..bd8641c1e 100644
--- a/community/python-psutil/PKGBUILD
+++ b/community/python-psutil/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 75268 2012-08-17 10:49:54Z seblu $
+# $Id: PKGBUILD 78236 2012-10-17 10:26:22Z allan $
# Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org>
pkgbase=python-psutil
pkgname=('python-psutil' 'python2-psutil')
pkgver=0.6.1
-pkgrel=1
+pkgrel=2
arch=('i686' 'x86_64' 'mips64el')
url='http://code.google.com/p/psutil/'
license=('custom: BSD')