diff options
author | Michał Masłowski <mtjm@mtjm.eu> | 2012-04-18 10:54:09 +0200 |
---|---|---|
committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-04-18 10:54:09 +0200 |
commit | d4a02502a9a74a21bc0ca0a0fa9813efe0fe70f4 (patch) | |
tree | 3e5dfb37d192bd42d9218934800e1f5aeeb0990e /community/remmina/PKGBUILD | |
parent | 16d51ac66fa18675d49ef64f4a3c1dbe53b5711a (diff) | |
parent | 637c1cfdcd258a870ad5367cbf47a8a2799039c7 (diff) |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community-testing/shotwell/PKGBUILD
community/recoll/PKGBUILD
cross/cross-mips64el-unknown-linux-gnu-gcc-core/PKGBUILD
cross/cross-mips64el-unknown-linux-gnu-glibc-headers/PKGBUILD
cross/cross-mips64el-unknown-linux-gnu-glibc-headers/glibc-2.12.2-ignore-origin-of-privileged-program.patch
cross/cross-mips64el-unknown-linux-gnu-glibc-headers/glibc-__i686.patch
cross/mips64el-unknown-linux-gnu-binutils/PKGBUILD
cross/mips64el-unknown-linux-gnu-glibc/PKGBUILD
cross/mips64el-unknown-linux-gnu-glibc/glibc-2.12.2-ignore-origin-of-privileged-program.patch
cross/mips64el-unknown-linux-gnu-glibc/glibc-__i686.patch
staging/nx-common/PKGBUILD
staging/nx/PKGBUILD
testing/devhelp/PKGBUILD
testing/empathy/PKGBUILD
testing/evolution-data-server/PKGBUILD
testing/evolution-ews/PKGBUILD
testing/evolution-exchange/PKGBUILD
testing/evolution/PKGBUILD
testing/folks/PKGBUILD
testing/gcr/PKGBUILD
testing/gnome-control-center/PKGBUILD
testing/gnome-desktop/PKGBUILD
testing/gnome-documents/PKGBUILD
testing/gnome-keyring/PKGBUILD
testing/gnome-panel/PKGBUILD
testing/gnome-session/PKGBUILD
testing/gnome-settings-daemon/PKGBUILD
testing/gnome-terminal/PKGBUILD
testing/gnome-themes-standard/PKGBUILD
testing/gthumb/PKGBUILD
testing/gtkhtml4/PKGBUILD
testing/gtksourceview3/PKGBUILD
testing/gvfs/PKGBUILD
testing/libgnome-keyring/PKGBUILD
testing/librsvg/PKGBUILD
testing/librsvg/librsvg.install
testing/mousetweaks/PKGBUILD
testing/seahorse/PKGBUILD
testing/sushi/PKGBUILD
testing/totem-plparser/PKGBUILD
testing/totem/PKGBUILD
testing/vte3/PKGBUILD
Diffstat (limited to 'community/remmina/PKGBUILD')
-rw-r--r-- | community/remmina/PKGBUILD | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/community/remmina/PKGBUILD b/community/remmina/PKGBUILD index 4e5a6c99c..c1369ee0b 100644 --- a/community/remmina/PKGBUILD +++ b/community/remmina/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 69336 2012-04-14 04:21:10Z lcarlier $ +# $Id: PKGBUILD 69472 2012-04-16 15:12:51Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=remmina pkgver=1.0.0 -pkgrel=4 +pkgrel=5 pkgdesc="Remmina is a remote desktop client written in GTK+. " arch=(i686 x86_64 'mips64el') url="http://remmina.sourceforge.net/" @@ -11,7 +11,11 @@ license=('GPL') depends=('gtk2' 'zlib' 'libjpeg' 'libssh' 'libunique' 'avahi' 'vte3' 'libgcrypt' 'libxdmcp' 'libgnome-keyring') makedepends=('intltool' 'pkgconfig' 'cmake' 'avahi' 'libxkbfile' 'freerdp' 'telepathy-glib') -optdepends=('avahi' 'libxkbfile' 'freerdp' 'telepathy-glib') +optdepends=('avahi' + 'libxkbfile' + 'freerdp' + 'telepathy-glib' + 'gnome-keyring') replaces=('remmina-plugins') provides=("grdc" "grdc=$pkgver" 'remmina-plugins') conflicts=("grdc") |