diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-12-02 13:37:59 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-12-02 13:37:59 -0300 |
| commit | 3383a1fbd954b78716dd8ff9d9f2097e176d2279 (patch) | |
| tree | 68aa3acbd50e6d0d7bdcfa2947d1772f7edb8a0d /extra/telepathy-kde-accounts-kcm | |
| parent | 7f3d7e2203a9252280361a1d095528cb056d08dc (diff) | |
| parent | 9e9ab642711f2424f828e21d14b98c45cdef2b29 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community-testing/packagekit/PKGBUILD
community/liboglappth/PKGBUILD
community/texvc/PKGBUILD
extra/libvdpau/PKGBUILD
extra/minicom/PKGBUILD
extra/muparser/PKGBUILD
extra/netkit-bsd-finger/PKGBUILD
extra/normalize/PKGBUILD
Diffstat (limited to 'extra/telepathy-kde-accounts-kcm')
| -rw-r--r-- | extra/telepathy-kde-accounts-kcm/PKGBUILD | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/extra/telepathy-kde-accounts-kcm/PKGBUILD b/extra/telepathy-kde-accounts-kcm/PKGBUILD index bbc825d51..04308db2b 100644 --- a/extra/telepathy-kde-accounts-kcm/PKGBUILD +++ b/extra/telepathy-kde-accounts-kcm/PKGBUILD @@ -1,16 +1,20 @@ -# $Id: PKGBUILD 143561 2011-11-26 13:57:53Z andrea $ +# $Id: PKGBUILD 143877 2011-11-30 08:41:16Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Laurent Carlier <lordheavym@gmail.com> pkgname=telepathy-kde-accounts-kcm pkgver=0.2.0 -pkgrel=1 +pkgrel=2 pkgdesc="KCM Module for configuring Telepathy Instant Messaging Accounts" arch=('i686' 'x86_64' 'mips64el') url="http://www.kde.org" license=('GPL') -depends=('kdelibs' 'telepathy-qt4' 'telepathy-mission-control' 'telepathy-kde-contact-list') +depends=('kdelibs' 'telepathy-qt4' 'telepathy-mission-control' 'telepathy-kde-contact-list' + 'telepathy-kde-auth-handler' 'telepathy-kde-integration-module' 'telepathy-kde-approver' + 'telepathy-kde-filetransfer-handler') makedepends=('cmake' 'automoc4') +optdepends=('telepathy-gabble: XMPP/Jabber/GTalk support' + 'telepathy-haze: all protocols supported by libpurple') groups=('telepathy-kde') conflicts=('telepathy-kde-accounts-kcm-plugins') replaces=('telepathy-kde-accounts-kcm-plugins') |