[arch-commits] Commit in nx/repos (8 files)
andyrtr at archlinux.org
andyrtr at archlinux.org
Sun Apr 15 13:55:12 UTC 2012
Date: Sunday, April 15, 2012 @ 09:55:12
Author: andyrtr
Revision: 156185
archrelease: copy trunk to staging-i686, staging-x86_64
Added:
nx/repos/staging-i686/PKGBUILD
(from rev 156184, nx/trunk/PKGBUILD)
nx/repos/staging-i686/nx-x11.ld.so.conf.d
(from rev 156184, nx/trunk/nx-x11.ld.so.conf.d)
nx/repos/staging-x86_64/PKGBUILD
(from rev 156184, nx/trunk/PKGBUILD)
nx/repos/staging-x86_64/nx-x11.ld.so.conf.d
(from rev 156184, nx/trunk/nx-x11.ld.so.conf.d)
Deleted:
nx/repos/staging-i686/PKGBUILD
nx/repos/staging-i686/nx-x11.ld.so.conf.d
nx/repos/staging-x86_64/PKGBUILD
nx/repos/staging-x86_64/nx-x11.ld.so.conf.d
------------------------------------+
staging-i686/PKGBUILD | 171 ++++++++++++++++++-----------------
staging-i686/nx-x11.ld.so.conf.d | 2
staging-x86_64/PKGBUILD | 171 ++++++++++++++++++-----------------
staging-x86_64/nx-x11.ld.so.conf.d | 2
4 files changed, 182 insertions(+), 164 deletions(-)
Deleted: staging-i686/PKGBUILD
===================================================================
--- staging-i686/PKGBUILD 2012-04-15 13:54:31 UTC (rev 156184)
+++ staging-i686/PKGBUILD 2012-04-15 13:55:12 UTC (rev 156185)
@@ -1,81 +0,0 @@
-# $Id$
-# Maintainer: Andreas Radke <andyrtr at archlinux.org>
-
-pkgbase=nx
-pkgname=('libxcomp' 'nxproxy' 'nx-x11' 'nx-xcompext' 'nxagent')
-pkgver=3.5.0.12
-pkgrel=0.1
-arch=('i686' 'x86_64')
-url="http://wiki.x2go.org/"
-license=('GPL')
-options=('!makeflags')
-makedepends=('libjpeg-turbo' 'libpng' 'bash' 'perl' # runtime dependencies from subpackages
- 'xproto' 'freetype2' 'libxaw' 'libxrender' 'libxp' 'libxpm' 'libxdamage' 'libxrandr' 'libxcomposite' 'libxtst' 'xorg-sessreg' # makedepends
- )
-source=(http://code.x2go.org/releases/source/nx-libs/nx-libs_$pkgver-full.tar.gz
- nx-x11.ld.so.conf.d)
-md5sums=('a2011e034a318016cf2260c30a567301'
- 'f2ec60c7e2d81bef2f7292d2b33681a6')
-
-build() {
- cd "${srcdir}/nx-libs_$pkgver"
- make CONFIGURE="./configure --prefix=/usr --libdir=/usr/lib --libexecdir=/usr/lib --includedir=/usr/include"
- # fake install
- mkdir $srcdir/fakeinstall
- make DESTDIR="$srcdir/fakeinstall" install
-}
-
-package_libxcomp() {
-
- pkgdesc="NX X compression library"
- depends=('libjpeg-turbo' 'libpng' 'gcc-libs')
-
- cd "${srcdir}/fakeinstall"
- install -dm755 ${pkgdir}/usr/lib/
- cp -a ${srcdir}/fakeinstall/usr/lib/nx/libXcomp.so* ${pkgdir}/usr/lib
-}
-
-package_nxproxy() {
-
- pkgdesc="NX proxy"
- depends=('libxcomp')
-
- cd "${srcdir}/fakeinstall"
- install -dm755 ${pkgdir}/usr/{bin,share/man/man1}
- cp -a ${srcdir}/fakeinstall/usr/bin/nxproxy ${pkgdir}/usr/bin
- cp -a ${srcdir}/fakeinstall/usr/share/man/man1/nxproxy.1 ${pkgdir}/usr/share/man/man1
-}
-
-package_nx-xcompext() {
-
- pkgdesc="Xcompext/Xcompshad library for NX"
- depends=('libxcomp' 'nx-x11')
-
- cd "${srcdir}/fakeinstall"
- install -dm755 ${pkgdir}/usr/lib/
- cp -a ${srcdir}/fakeinstall/usr/lib/nx/libXcompext.so* ${pkgdir}/usr/lib
-}
-
-package_nx-x11() {
-
- pkgdesc="NX-X11 lib for the NX framework"
- depends=('libxcomp')
-
- cd "${srcdir}/fakeinstall"
- install -dm755 ${pkgdir}/{etc/ld.so.conf.d,/usr/lib/nx}
- cp -aR ${srcdir}/fakeinstall/usr/lib/NX3/lib*/nx/lib*.so* ${pkgdir}/usr/lib/nx
-
- install -m 644 "$srcdir/nx-x11.ld.so.conf.d" "$pkgdir/etc/ld.so.conf.d/nx.conf"
-}
-
-package_nxagent() {
-
- pkgdesc="NX X server based on Xnest"
- depends=('nx-xcompext')
-
- cd "${srcdir}/fakeinstall"
- install -dm755 ${pkgdir}/usr/{bin,lib/nx}
- cp -a ${srcdir}/fakeinstall/usr/lib/NX3/bin/nxagent ${pkgdir}/usr/lib/nx
- cd ${pkgdir}/usr/bin
- ln -sv /usr/lib/nx/nxagent .
-}
Copied: nx/repos/staging-i686/PKGBUILD (from rev 156184, nx/trunk/PKGBUILD)
===================================================================
--- staging-i686/PKGBUILD (rev 0)
+++ staging-i686/PKGBUILD 2012-04-15 13:55:12 UTC (rev 156185)
@@ -0,0 +1,90 @@
+# $Id$
+# Maintainer: Andreas Radke <andyrtr at archlinux.org>
+
+pkgbase=nx
+pkgname=('libxcomp' 'nxproxy' 'nx-x11' 'nx-xcompext' 'nxagent' 'nx-headers')
+pkgver=3.5.0.12
+pkgrel=0.2
+arch=('i686' 'x86_64')
+url="http://wiki.x2go.org/"
+license=('GPL')
+options=('!makeflags')
+makedepends=('libjpeg-turbo' 'libpng' 'bash' 'perl' # runtime dependencies from subpackages
+ 'xproto' 'freetype2' 'libxaw' 'libxrender' 'libxp' 'libxpm' 'libxdamage' 'libxrandr' 'libxcomposite' 'libxtst' 'xorg-sessreg' # makedepends
+ )
+source=(http://code.x2go.org/releases/source/nx-libs/nx-libs_$pkgver-full.tar.gz
+ nx-x11.ld.so.conf.d)
+md5sums=('a2011e034a318016cf2260c30a567301'
+ 'f2ec60c7e2d81bef2f7292d2b33681a6')
+
+build() {
+ cd "${srcdir}/nx-libs_$pkgver"
+ make CONFIGURE="./configure --prefix=/usr --libdir=/usr/lib --libexecdir=/usr/lib --includedir=/usr/include"
+ # fake install
+ mkdir $srcdir/fakeinstall
+ make DESTDIR="$srcdir/fakeinstall" install
+}
+
+package_libxcomp() {
+
+ pkgdesc="NX X compression library"
+ depends=('libjpeg-turbo' 'libpng' 'gcc-libs')
+
+ cd "${srcdir}/fakeinstall"
+ install -dm755 ${pkgdir}/usr/lib/
+ cp -a ${srcdir}/fakeinstall/usr/lib/nx/libXcomp.so* ${pkgdir}/usr/lib
+}
+
+package_nxproxy() {
+
+ pkgdesc="NX proxy"
+ depends=('libxcomp')
+
+ cd "${srcdir}/fakeinstall"
+ install -dm755 ${pkgdir}/usr/{bin,share/man/man1}
+ cp -a ${srcdir}/fakeinstall/usr/bin/nxproxy ${pkgdir}/usr/bin
+ cp -a ${srcdir}/fakeinstall/usr/share/man/man1/nxproxy.1 ${pkgdir}/usr/share/man/man1
+}
+
+package_nx-xcompext() {
+
+ pkgdesc="Xcompext/Xcompshad library for NX"
+ depends=('libxcomp' 'nx-x11')
+
+ cd "${srcdir}/fakeinstall"
+ install -dm755 ${pkgdir}/usr/lib/
+ cp -a ${srcdir}/fakeinstall/usr/lib/nx/libXcompext.so* ${pkgdir}/usr/lib
+}
+
+package_nx-x11() {
+
+ pkgdesc="NX-X11 lib for the NX framework"
+ depends=('libxcomp')
+
+ cd "${srcdir}/fakeinstall"
+ install -dm755 ${pkgdir}/{etc/ld.so.conf.d,/usr/lib/nx}
+ cp -aR ${srcdir}/fakeinstall/usr/lib/NX3/lib*/nx/lib*.so* ${pkgdir}/usr/lib/nx
+
+ install -m 644 "$srcdir/nx-x11.ld.so.conf.d" "$pkgdir/etc/ld.so.conf.d/nx.conf"
+}
+
+package_nxagent() {
+
+ pkgdesc="NX X server based on Xnest"
+ depends=('nx-xcompext')
+
+ cd "${srcdir}/fakeinstall"
+ install -dm755 ${pkgdir}/usr/{bin,lib/nx}
+ cp -a ${srcdir}/fakeinstall/usr/lib/NX3/bin/nxagent ${pkgdir}/usr/lib/nx
+ cd ${pkgdir}/usr/bin
+ ln -sv /usr/lib/nx/nxagent .
+}
+
+package_nx-headers() {
+
+ pkgdesc="NX headers"
+
+ cd "${srcdir}/fakeinstall"
+ install -dm755 ${pkgdir}/usr/include/nx
+ cp -aR ${srcdir}/fakeinstall/usr/include/nx/* ${pkgdir}/usr/include/nx
+}
Deleted: staging-i686/nx-x11.ld.so.conf.d
===================================================================
--- staging-i686/nx-x11.ld.so.conf.d 2012-04-15 13:54:31 UTC (rev 156184)
+++ staging-i686/nx-x11.ld.so.conf.d 2012-04-15 13:55:12 UTC (rev 156185)
@@ -1 +0,0 @@
-/usr/lib/nx/
Copied: nx/repos/staging-i686/nx-x11.ld.so.conf.d (from rev 156184, nx/trunk/nx-x11.ld.so.conf.d)
===================================================================
--- staging-i686/nx-x11.ld.so.conf.d (rev 0)
+++ staging-i686/nx-x11.ld.so.conf.d 2012-04-15 13:55:12 UTC (rev 156185)
@@ -0,0 +1 @@
+/usr/lib/nx/
Deleted: staging-x86_64/PKGBUILD
===================================================================
--- staging-x86_64/PKGBUILD 2012-04-15 13:54:31 UTC (rev 156184)
+++ staging-x86_64/PKGBUILD 2012-04-15 13:55:12 UTC (rev 156185)
@@ -1,81 +0,0 @@
-# $Id$
-# Maintainer: Andreas Radke <andyrtr at archlinux.org>
-
-pkgbase=nx
-pkgname=('libxcomp' 'nxproxy' 'nx-x11' 'nx-xcompext' 'nxagent')
-pkgver=3.5.0.12
-pkgrel=0.1
-arch=('i686' 'x86_64')
-url="http://wiki.x2go.org/"
-license=('GPL')
-options=('!makeflags')
-makedepends=('libjpeg-turbo' 'libpng' 'bash' 'perl' # runtime dependencies from subpackages
- 'xproto' 'freetype2' 'libxaw' 'libxrender' 'libxp' 'libxpm' 'libxdamage' 'libxrandr' 'libxcomposite' 'libxtst' 'xorg-sessreg' # makedepends
- )
-source=(http://code.x2go.org/releases/source/nx-libs/nx-libs_$pkgver-full.tar.gz
- nx-x11.ld.so.conf.d)
-md5sums=('a2011e034a318016cf2260c30a567301'
- 'f2ec60c7e2d81bef2f7292d2b33681a6')
-
-build() {
- cd "${srcdir}/nx-libs_$pkgver"
- make CONFIGURE="./configure --prefix=/usr --libdir=/usr/lib --libexecdir=/usr/lib --includedir=/usr/include"
- # fake install
- mkdir $srcdir/fakeinstall
- make DESTDIR="$srcdir/fakeinstall" install
-}
-
-package_libxcomp() {
-
- pkgdesc="NX X compression library"
- depends=('libjpeg-turbo' 'libpng' 'gcc-libs')
-
- cd "${srcdir}/fakeinstall"
- install -dm755 ${pkgdir}/usr/lib/
- cp -a ${srcdir}/fakeinstall/usr/lib/nx/libXcomp.so* ${pkgdir}/usr/lib
-}
-
-package_nxproxy() {
-
- pkgdesc="NX proxy"
- depends=('libxcomp')
-
- cd "${srcdir}/fakeinstall"
- install -dm755 ${pkgdir}/usr/{bin,share/man/man1}
- cp -a ${srcdir}/fakeinstall/usr/bin/nxproxy ${pkgdir}/usr/bin
- cp -a ${srcdir}/fakeinstall/usr/share/man/man1/nxproxy.1 ${pkgdir}/usr/share/man/man1
-}
-
-package_nx-xcompext() {
-
- pkgdesc="Xcompext/Xcompshad library for NX"
- depends=('libxcomp' 'nx-x11')
-
- cd "${srcdir}/fakeinstall"
- install -dm755 ${pkgdir}/usr/lib/
- cp -a ${srcdir}/fakeinstall/usr/lib/nx/libXcompext.so* ${pkgdir}/usr/lib
-}
-
-package_nx-x11() {
-
- pkgdesc="NX-X11 lib for the NX framework"
- depends=('libxcomp')
-
- cd "${srcdir}/fakeinstall"
- install -dm755 ${pkgdir}/{etc/ld.so.conf.d,/usr/lib/nx}
- cp -aR ${srcdir}/fakeinstall/usr/lib/NX3/lib*/nx/lib*.so* ${pkgdir}/usr/lib/nx
-
- install -m 644 "$srcdir/nx-x11.ld.so.conf.d" "$pkgdir/etc/ld.so.conf.d/nx.conf"
-}
-
-package_nxagent() {
-
- pkgdesc="NX X server based on Xnest"
- depends=('nx-xcompext')
-
- cd "${srcdir}/fakeinstall"
- install -dm755 ${pkgdir}/usr/{bin,lib/nx}
- cp -a ${srcdir}/fakeinstall/usr/lib/NX3/bin/nxagent ${pkgdir}/usr/lib/nx
- cd ${pkgdir}/usr/bin
- ln -sv /usr/lib/nx/nxagent .
-}
Copied: nx/repos/staging-x86_64/PKGBUILD (from rev 156184, nx/trunk/PKGBUILD)
===================================================================
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2012-04-15 13:55:12 UTC (rev 156185)
@@ -0,0 +1,90 @@
+# $Id$
+# Maintainer: Andreas Radke <andyrtr at archlinux.org>
+
+pkgbase=nx
+pkgname=('libxcomp' 'nxproxy' 'nx-x11' 'nx-xcompext' 'nxagent' 'nx-headers')
+pkgver=3.5.0.12
+pkgrel=0.2
+arch=('i686' 'x86_64')
+url="http://wiki.x2go.org/"
+license=('GPL')
+options=('!makeflags')
+makedepends=('libjpeg-turbo' 'libpng' 'bash' 'perl' # runtime dependencies from subpackages
+ 'xproto' 'freetype2' 'libxaw' 'libxrender' 'libxp' 'libxpm' 'libxdamage' 'libxrandr' 'libxcomposite' 'libxtst' 'xorg-sessreg' # makedepends
+ )
+source=(http://code.x2go.org/releases/source/nx-libs/nx-libs_$pkgver-full.tar.gz
+ nx-x11.ld.so.conf.d)
+md5sums=('a2011e034a318016cf2260c30a567301'
+ 'f2ec60c7e2d81bef2f7292d2b33681a6')
+
+build() {
+ cd "${srcdir}/nx-libs_$pkgver"
+ make CONFIGURE="./configure --prefix=/usr --libdir=/usr/lib --libexecdir=/usr/lib --includedir=/usr/include"
+ # fake install
+ mkdir $srcdir/fakeinstall
+ make DESTDIR="$srcdir/fakeinstall" install
+}
+
+package_libxcomp() {
+
+ pkgdesc="NX X compression library"
+ depends=('libjpeg-turbo' 'libpng' 'gcc-libs')
+
+ cd "${srcdir}/fakeinstall"
+ install -dm755 ${pkgdir}/usr/lib/
+ cp -a ${srcdir}/fakeinstall/usr/lib/nx/libXcomp.so* ${pkgdir}/usr/lib
+}
+
+package_nxproxy() {
+
+ pkgdesc="NX proxy"
+ depends=('libxcomp')
+
+ cd "${srcdir}/fakeinstall"
+ install -dm755 ${pkgdir}/usr/{bin,share/man/man1}
+ cp -a ${srcdir}/fakeinstall/usr/bin/nxproxy ${pkgdir}/usr/bin
+ cp -a ${srcdir}/fakeinstall/usr/share/man/man1/nxproxy.1 ${pkgdir}/usr/share/man/man1
+}
+
+package_nx-xcompext() {
+
+ pkgdesc="Xcompext/Xcompshad library for NX"
+ depends=('libxcomp' 'nx-x11')
+
+ cd "${srcdir}/fakeinstall"
+ install -dm755 ${pkgdir}/usr/lib/
+ cp -a ${srcdir}/fakeinstall/usr/lib/nx/libXcompext.so* ${pkgdir}/usr/lib
+}
+
+package_nx-x11() {
+
+ pkgdesc="NX-X11 lib for the NX framework"
+ depends=('libxcomp')
+
+ cd "${srcdir}/fakeinstall"
+ install -dm755 ${pkgdir}/{etc/ld.so.conf.d,/usr/lib/nx}
+ cp -aR ${srcdir}/fakeinstall/usr/lib/NX3/lib*/nx/lib*.so* ${pkgdir}/usr/lib/nx
+
+ install -m 644 "$srcdir/nx-x11.ld.so.conf.d" "$pkgdir/etc/ld.so.conf.d/nx.conf"
+}
+
+package_nxagent() {
+
+ pkgdesc="NX X server based on Xnest"
+ depends=('nx-xcompext')
+
+ cd "${srcdir}/fakeinstall"
+ install -dm755 ${pkgdir}/usr/{bin,lib/nx}
+ cp -a ${srcdir}/fakeinstall/usr/lib/NX3/bin/nxagent ${pkgdir}/usr/lib/nx
+ cd ${pkgdir}/usr/bin
+ ln -sv /usr/lib/nx/nxagent .
+}
+
+package_nx-headers() {
+
+ pkgdesc="NX headers"
+
+ cd "${srcdir}/fakeinstall"
+ install -dm755 ${pkgdir}/usr/include/nx
+ cp -aR ${srcdir}/fakeinstall/usr/include/nx/* ${pkgdir}/usr/include/nx
+}
Deleted: staging-x86_64/nx-x11.ld.so.conf.d
===================================================================
--- staging-x86_64/nx-x11.ld.so.conf.d 2012-04-15 13:54:31 UTC (rev 156184)
+++ staging-x86_64/nx-x11.ld.so.conf.d 2012-04-15 13:55:12 UTC (rev 156185)
@@ -1 +0,0 @@
-/usr/lib/nx/
Copied: nx/repos/staging-x86_64/nx-x11.ld.so.conf.d (from rev 156184, nx/trunk/nx-x11.ld.so.conf.d)
===================================================================
--- staging-x86_64/nx-x11.ld.so.conf.d (rev 0)
+++ staging-x86_64/nx-x11.ld.so.conf.d 2012-04-15 13:55:12 UTC (rev 156185)
@@ -0,0 +1 @@
+/usr/lib/nx/
More information about the arch-commits
mailing list