diff options
author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-03-23 12:18:02 -0300 |
---|---|---|
committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-03-23 12:18:02 -0300 |
commit | bf1c001b59869cf10e5921b4f38d1f69db2db76c (patch) | |
tree | a472ad2701076586f54fbd0859fe2e5c8311184b /extra/nx-common | |
parent | aebba8cfcb8c0ef8befa351c73fbd228e07475e2 (diff) | |
parent | 1512c792951d7fbd2c9c336f9bf35654bbb85cc6 (diff) |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community-testing/cdemu-daemon/60-vhba.rules
community-testing/cdemu-daemon/PKGBUILD
community-testing/cdemu-daemon/cdemud.install
community/guake/PKGBUILD
core/openssl/PKGBUILD
extra/mesa/PKGBUILD
gnome-unstable/epiphany/PKGBUILD
gnome-unstable/folks/PKGBUILD
gnome-unstable/gjs/PKGBUILD
gnome-unstable/gnome-online-accounts/PKGBUILD
gnome-unstable/gobject-introspection/PKGBUILD
multilib/lib32-mesa/PKGBUILD
multilib/lib32-openssl/PKGBUILD
testing/dhcpcd/PKGBUILD
Diffstat (limited to 'extra/nx-common')
-rw-r--r-- | extra/nx-common/PKGBUILD | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/extra/nx-common/PKGBUILD b/extra/nx-common/PKGBUILD index 1ff9322eb..2edd8e0f1 100644 --- a/extra/nx-common/PKGBUILD +++ b/extra/nx-common/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 148862 2012-02-05 11:53:15Z ibiru $ +# $Id: PKGBUILD 153969 2012-03-21 06:21:07Z pierre $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Contributed: eliott <eliott@solarblue.net>, Andre Naumann <anaumann@SPARCed.org> pkgname=nx-common pkgver=3.5.0 -pkgrel=3 +pkgrel=4 pkgdesc="NoMachine NX common package for client and server" arch=('i686' 'x86_64' 'mips64el') license=('GPL') url="http://nomachine.com/" -depends=('libjpeg-turbo>=1.1.1' 'libpng>=1.5.7' 'openssl>=1.0.0' 'gcc-libs' 'bash') +depends=('libjpeg-turbo' 'libpng' 'openssl' 'gcc-libs' 'bash') makedepends=('xorg-server-devel') source=( #Compression libs and proxy sources http://64.34.161.181/download/$pkgver/sources/nxcomp-$pkgver-2.tar.gz |