diff options
author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-05-09 20:23:53 -0300 |
---|---|---|
committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-05-09 20:23:53 -0300 |
commit | 7c6a0188a5ac63d4bb6c667c2f1bcf26792312e6 (patch) | |
tree | 706c3ba50b28eb4e1414d122b28ce69cf2c8a285 /extra/qscintilla | |
parent | 25828de60b05b955dc23d7226b591b416f955875 (diff) | |
parent | d2f2d3b5c845807249680c275031f94047f9e762 (diff) |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/libtextcat/PKGBUILD
extra/glsof/PKGBUILD
extra/orca/PKGBUILD
extra/python-qt/PKGBUILD
extra/python-sip/PKGBUILD
extra/python2-qt/PKGBUILD
extra/python2-sip/PKGBUILD
extra/swfdec-mozilla/PKGBUILD
extra/swfdec/PKGBUILD
extra/trayer/PKGBUILD
extra/xbill/PKGBUILD
extra/xfce4-xfapplet-plugin/PKGBUILD
Diffstat (limited to 'extra/qscintilla')
-rw-r--r-- | extra/qscintilla/PKGBUILD | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/extra/qscintilla/PKGBUILD b/extra/qscintilla/PKGBUILD index fa2b2aaa8..d8c966d4d 100644 --- a/extra/qscintilla/PKGBUILD +++ b/extra/qscintilla/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 119950 2011-04-17 11:43:04Z andrea $ +# $Id: PKGBUILD 123072 2011-05-07 23:41:27Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Douglas Soares de Andrade <dsa@aur.archlinux.org> pkgbase=qscintilla pkgname=('qscintilla' 'python-qscintilla' 'python2-qscintilla') pkgver=2.5.1 -pkgrel=1 +pkgrel=2 license=('GPL') arch=('i686' 'x86_64' 'mips64el') url="http://www.riverbankcomputing.co.uk/software/qscintilla/intro" -makedepends=('python-qt') +makedepends=('python2-pyqt') source=("http://riverbankcomputing.com/static/Downloads/QScintilla2/QScintilla-gpl-${pkgver}.tar.gz" 'configure.py-objdir-support.diff') md5sums=('dd7edef5ff674d307057a3c12dbd8fce' @@ -52,7 +52,7 @@ package_qscintilla() { package_python-qscintilla() { pkgdesc="Python 3 bindings for QScintilla2" - depends=('python-qt' 'python2-qscintilla') + depends=('pyqt' 'qscintilla') cd "${srcdir}/QScintilla-gpl-${pkgver}/Python" install -Dm755 Qsci.so \ @@ -61,7 +61,7 @@ package_python-qscintilla() { package_python2-qscintilla() { pkgdesc="Python 2 bindings for QScintilla2" - depends=('qscintilla' 'python2-qt') + depends=('python-qscintilla' 'python2-pyqt') cd "${srcdir}/QScintilla-gpl-${pkgver}/Python2" make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install |