summaryrefslogtreecommitdiff
path: root/extra/python2
diff options
context:
space:
mode:
authorMichał Masłowski <mtjm@mtjm.eu>2012-12-14 14:20:24 +0100
committerMichał Masłowski <mtjm@mtjm.eu>2012-12-14 14:20:24 +0100
commit20553d4814291e0960f86db52ff7d939241ff1d7 (patch)
tree8163d4cee334e471830714257e6df81d18a0ad1c /extra/python2
parentd51e9b973c5e554869e188fdc65106728c95c0c7 (diff)
parent1b9faba25721b73f30e49f0cea9c7346eedd0f73 (diff)
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts: community/netsurf/PKGBUILD extra/python/PKGBUILD extra/python2/PKGBUILD
Diffstat (limited to 'extra/python2')
-rw-r--r--extra/python2/PKGBUILD6
1 files changed, 3 insertions, 3 deletions
diff --git a/extra/python2/PKGBUILD b/extra/python2/PKGBUILD
index 31f598187..1c23d1d8a 100644
--- a/extra/python2/PKGBUILD
+++ b/extra/python2/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 157413 2012-04-28 09:27:14Z allan $
+# $Id: PKGBUILD 173214 2012-12-13 12:39:26Z stephane $
# Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
# Contributer: Allan McRae <allan@archlinux.org>
# Contributer: Jason Chu <jason@archlinux.org>
pkgname=python2
pkgver=2.7.3
-pkgrel=2.1
+pkgrel=3
_pybasever=2.7
pkgdesc="A high-level scripting language"
arch=('i686' 'x86_64' 'mips64el')
license=('PSF')
url="http://www.python.org/"
depends=('bzip2' 'gdbm' 'openssl' 'zlib' 'expat' 'sqlite' 'libffi')
-makedepends=('tk')
+makedepends=('tk' 'bluez')
optdepends=('tk: for IDLE')
conflicts=('python<3')
options=('!makeflags')