Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el

Conflicts:
	community-staging/happy/PKGBUILD
	community-staging/haskell-quickcheck/PKGBUILD
	community/mingw32-gcc-base/PKGBUILD
	core/mlocate/PKGBUILD
	core/procps-ng/PKGBUILD
	core/sysvinit/PKGBUILD
	elementary/gtk-engine-equinox/PKGBUILD
	extra/audacious/PKGBUILD
	extra/libsigc++/PKGBUILD
	extra/postgresql-old-upgrade/PKGBUILD
	extra/qt/PKGBUILD
	extra/tftp-hpa/PKGBUILD
	extra/transmission/PKGBUILD
	gnome-unstable/at-spi2-atk/PKGBUILD
	gnome-unstable/at-spi2-core/PKGBUILD
	gnome-unstable/atk/PKGBUILD
	gnome-unstable/clutter/PKGBUILD
	gnome-unstable/evolution-data-server/PKGBUILD
	gnome-unstable/evolution/PKGBUILD
	gnome-unstable/gjs/PKGBUILD
	gnome-unstable/glib-networking/PKGBUILD
	gnome-unstable/glib2/PKGBUILD
	gnome-unstable/gnome-desktop/PKGBUILD
	gnome-unstable/gnome-online-accounts/PKGBUILD
	gnome-unstable/gnome-settings-daemon/PKGBUILD
	gnome-unstable/gnome-themes-standard/PKGBUILD
	gnome-unstable/gobject-introspection/PKGBUILD
	gnome-unstable/gtk3/PKGBUILD
	gnome-unstable/gtkhtml4/PKGBUILD
	gnome-unstable/gvfs/PKGBUILD
	gnome-unstable/libsoup/PKGBUILD
	gnome-unstable/nautilus/PKGBUILD
	gnome-unstable/vala/PKGBUILD
	gnome-unstable/webkitgtk3/PKGBUILD
	libre/libretools/PKGBUILD
	multilib/lib32-gtk2/PKGBUILD
	multilib/lib32-qt/PKGBUILD
	multilib/lib32-util-linux/PKGBUILD
	testing/mlocate/PKGBUILD
	testing/openmpi/PKGBUILD
	testing/run-parts/PKGBUILD
	testing/systemd/PKGBUILD
	testing/transmission/PKGBUILD
	testing/transmission/transmission-cli.install
	testing/transmission/transmission.systemd

1 files changed, 8 insertions, 8 deletions

diff --git a/extra/nx/PKGBUILD b/extra/nx/PKGBUILD
index 39de08afd..fa5bc6408 100644
--- a/extra/nx/PKGBUILD
+++ b/extra/nx/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 162757 2012-06-29 15:32:58Z andyrtr $
+# $Id: PKGBUILD 166924 2012-09-22 09:16:46Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
 pkgbase=nx
 pkgname=('libxcomp' 'nxproxy' 'nx-x11' 'nx-xcompext' 'nxagent' 'nx-headers')
-pkgver=3.5.0.14
+pkgver=3.5.0.15
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 url="http://wiki.x2go.org/"
@@ -14,11 +14,11 @@ makedepends=('libjpeg-turbo' 'libpng' 'bash' 'perl' # runtime dependencies from
              )
 source=(http://code.x2go.org/releases/source/nx-libs/nx-libs-$pkgver-full.tar.gz
         nx-x11.ld.so.conf.d)
-md5sums=('f20f5a12e15849bae8a1f2d7b44830ab'
+md5sums=('d5b3dba1ecbd2989cd7ce20fee6683a0'
          'f2ec60c7e2d81bef2f7292d2b33681a6')
 
 build() {
-  cd "${srcdir}/nx-libs_$pkgver"
+  cd "${srcdir}/nx-libs-$pkgver"
   make CONFIGURE="./configure --prefix=/usr --libdir=/usr/lib --libexecdir=/usr/lib --includedir=/usr/include"
   # fake install
   mkdir $srcdir/fakeinstall
@@ -47,7 +47,7 @@ package_nxproxy() {
   ln -sv /usr/lib/nx/bin/nxproxy .
   
   # the wrapper
-  cp -a ${srcdir}/nx-libs_$pkgver/bin/nxproxy ${pkgdir}/usr/bin
+  cp -a ${srcdir}/nx-libs-$pkgver/bin/nxproxy ${pkgdir}/usr/bin
   chmod +x ${pkgdir}/usr/bin/nxproxy
   cp -a ${srcdir}/fakeinstall/usr/share/man/man1/nxproxy.1 ${pkgdir}/usr/share/man/man1
 }
@@ -79,7 +79,7 @@ package_nx-x11() {
   ln -sv /usr/lib/nx/bin/nxauth .
   
   # the wrapper
-  cp -a ${srcdir}/nx-libs_$pkgver/bin/nxauth ${pkgdir}/usr/bin
+  cp -a ${srcdir}/nx-libs-$pkgver/bin/nxauth ${pkgdir}/usr/bin
   chmod +x ${pkgdir}/usr/bin/nxauth
   
   install -m 644 "$srcdir/nx-x11.ld.so.conf.d" "$pkgdir/etc/ld.so.conf.d/nx.conf"
@@ -96,10 +96,10 @@ package_nxagent() {
   ln -sv /usr/lib/nx/bin/nxagent .
   
   # the wrapper
-  cp -a ${srcdir}/nx-libs_$pkgver/bin/nxagent ${pkgdir}/usr/bin
+  cp -a ${srcdir}/nx-libs-$pkgver/bin/nxagent ${pkgdir}/usr/bin
   chmod +x ${pkgdir}/usr/bin/nxagent
   # required nxcompshad libs
-  cp -a ${srcdir}/nx-libs_$pkgver/nxcompshad/libXcompshad.so.3.5.0 ${pkgdir}/usr/lib/nx
+  cp -a ${srcdir}/nx-libs-$pkgver/nxcompshad/libXcompshad.so.3.5.0 ${pkgdir}/usr/lib/nx
   cd ${pkgdir}/usr/lib/nx
   ln -sv libXcompshad.so.3.5.0 libXcompshad.so.3
   ln -sv libXcompshad.so.3.5.0 libXcompshad.so