diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-11-17 15:19:29 +0100 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-11-17 15:19:29 +0100 |
| commit | a66ad9f55f1788fcab4028fefb2c91e563fec35c (patch) | |
| tree | 93e3cfd6d5cee5dc334cd6582c789b1429f23694 /extra/telepathy-qt | |
| parent | 36128f354db7ef055305ffd69c29af225c6ca182 (diff) | |
| parent | 071ecd58a9b69020ec170e7f89009a603e885371 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/keepassx/PKGBUILD
core/iputils/PKGBUILD
extra/avidemux/PKGBUILD
extra/gstreamer0.10-ugly/PKGBUILD
extra/kismet/PKGBUILD
extra/maxima/PKGBUILD
extra/sbcl/PKGBUILD
extra/sound-juicer/PKGBUILD
extra/wxgtk/PKGBUILD
kde-unstable/akonadi/PKGBUILD
libre/gstreamer0.10-bad-libre/PKGBUILD
Diffstat (limited to 'extra/telepathy-qt')
| -rw-r--r-- | extra/telepathy-qt/PKGBUILD | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/extra/telepathy-qt/PKGBUILD b/extra/telepathy-qt/PKGBUILD index b94a42764..e411312a5 100644 --- a/extra/telepathy-qt/PKGBUILD +++ b/extra/telepathy-qt/PKGBUILD @@ -1,16 +1,17 @@ -# $Id: PKGBUILD 163541 2012-07-15 10:41:34Z andrea $ +# $Id: PKGBUILD 171095 2012-11-16 16:58:51Z andrea $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=telepathy-qt pkgver=0.9.3 -pkgrel=1 +pkgrel=2 pkgdesc="A library for Qt-based Telepathy clients" arch=('i686' 'x86_64' 'mips64el') url="http://telepathy.freedesktop.org/wiki/" license=('LGPL') options=('!libtool') -depends=('qt' 'telepathy-farstream') +depends=('qt' 'telepathy-glib') +#depends=('qt' 'telepathy-farstream') makedepends=('libxslt' 'python2' 'cmake' 'doxygen') conflicts=('telepathy-qt4') replaces=('telepathy-qt4') |