[arch-commits] Commit in x2goclient/repos (6 files)
Andreas Radke
andyrtr at archlinux.org
Wed Apr 27 19:51:54 UTC 2016
Date: Wednesday, April 27, 2016 @ 21:51:54
Author: andyrtr
Revision: 266334
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
x2goclient/repos/extra-i686/PKGBUILD
(from rev 266333, x2goclient/trunk/PKGBUILD)
x2goclient/repos/extra-x86_64/PKGBUILD
(from rev 266333, x2goclient/trunk/PKGBUILD)
Deleted:
x2goclient/repos/extra-i686/PKGBUILD
x2goclient/repos/extra-i686/x2goclient.install
x2goclient/repos/extra-x86_64/PKGBUILD
x2goclient/repos/extra-x86_64/x2goclient.install
---------------------------------+
/PKGBUILD | 142 ++++++++++++++++++++++++++++++++++++++
extra-i686/PKGBUILD | 72 -------------------
extra-i686/x2goclient.install | 11 --
extra-x86_64/PKGBUILD | 72 -------------------
extra-x86_64/x2goclient.install | 11 --
5 files changed, 142 insertions(+), 166 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2016-04-27 19:51:38 UTC (rev 266333)
+++ extra-i686/PKGBUILD 2016-04-27 19:51:54 UTC (rev 266334)
@@ -1,72 +0,0 @@
-# $Id$
-# Maintainer: AndyRTR <andyrtr at archlinux.org>
-# Contributor: Gerhard Brauer <gerbra at archlinux.de>
-# Contributor: Richard Murri <admin at richardmurri.com>
-
-pkgbase=x2goclient
-pkgname=('x2goclient' 'x2goplugin' 'x2goplugin-provider')
-pkgver=4.0.5.1
-pkgrel=1
-arch=('i686' 'x86_64')
-license=('GPL2')
-url="http://www.x2go.org"
-makedepends=('qt4' 'libldap' 'libcups' 'nxproxy' 'libssh' 'libxpm' 'man2html' 'hicolor-icon-theme' 'xdg-utils' 'xorg-xauth')
-source=(http://code.x2go.org/releases/source/${pkgname}/${pkgname}-${pkgver}.tar.gz{,.asc})
-sha256sums=('844e983fbbddfe8a626506e4140b1ad65591e14f794c735412402bee3163ed11'
- 'SKIP')
-validpgpkeys=('9BFBAEE86C0AA5FFBF2207829AF46B3025771B31' # Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
- '1AD23D1B8F087A35AB74BDE9F4A7678C9C6B0B2B') # "X2go Git Administrator <git-admin at x2go.org>"
-
-prepare() {
- cd ${pkgname}-${pkgver}
- sed -i "s:-o root -g root ::" Makefile
-}
-
-build() {
- cd ${pkgname}-${pkgver}
-# make -qp | awk -F':' '/^[a-zA-Z0-9][^$#\/\t=]*:([^=]|$)/ {split($1,A,/ /);for(i in A)print A[i]}' | grep ^install
-# return 1
-
- make PREFIX=/usr
- make PREFIX=/usr build_man # target broken and making the build hang
-
-# make PREFIX=/usr build_pluginprovider
-# make PREFIX=/usr build_client
-# make PREFIX=/usr build_plugin
-}
-
-package_x2goclient() {
-
- pkgdesc="a graphical client (Qt4) for the X2Go system"
- depends=('qt4' 'libldap' 'libcups' 'nxproxy' 'libssh' 'libxpm' 'hicolor-icon-theme' 'xdg-utils')
- # FS#48088
- optdepends=('xorg-xauth: may be required by X2goservers running a different linux distribution giving MIT-COOKIE errors')
- install=x2goclient.install
-
- cd ${pkgbase}-${pkgver}
- make PREFIX=/usr DESTDIR="$pkgdir" install_client install_man
-}
-
-package_x2goplugin() {
- pkgdesc="provides X2Go Client as QtBrowser-based Mozilla plugin"
- depends=('qt4' 'libcups' 'nxproxy' 'libssh' 'libxpm')
-
- cd ${pkgbase}-${pkgver}
- make PREFIX=/usr DESTDIR="$pkgdir" install_plugin
-}
-
-package_x2goplugin-provider() {
-
- pkgdesc="an example configuration for providing the X2Go Plugin via an Apache webserver"
- depends=('apache')
- backup=(etc/x2go/plugin-provider/x2goplugin.html
- etc/x2go/x2goplugin-apache.conf
- etc/httpd/conf/x2goplugin-apache.conf)
-
- cd ${pkgbase}-${pkgver}
- make PREFIX=/usr DESTDIR="$pkgdir" install_pluginprovider
-
- install -dm755 ${pkgdir}/etc/httpd/conf
- cd ${pkgdir}/etc/httpd/conf
- ln -svf /etc/x2go/x2goplugin-apache.conf ${pkgdir}/etc/httpd/conf/x2goplugin-apache.conf
-}
Copied: x2goclient/repos/extra-i686/PKGBUILD (from rev 266333, x2goclient/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2016-04-27 19:51:54 UTC (rev 266334)
@@ -0,0 +1,71 @@
+# $Id$
+# Maintainer: AndyRTR <andyrtr at archlinux.org>
+# Contributor: Gerhard Brauer <gerbra at archlinux.de>
+# Contributor: Richard Murri <admin at richardmurri.com>
+
+pkgbase=x2goclient
+pkgname=('x2goclient' 'x2goplugin' 'x2goplugin-provider')
+pkgver=4.0.5.1
+pkgrel=2
+arch=('i686' 'x86_64')
+license=('GPL2')
+url="http://www.x2go.org"
+makedepends=('qt4' 'libldap' 'libcups' 'nxproxy' 'libssh' 'libxpm' 'man2html' 'hicolor-icon-theme' 'xdg-utils' 'xorg-xauth')
+source=(http://code.x2go.org/releases/source/${pkgname}/${pkgname}-${pkgver}.tar.gz{,.asc})
+sha256sums=('844e983fbbddfe8a626506e4140b1ad65591e14f794c735412402bee3163ed11'
+ 'SKIP')
+validpgpkeys=('9BFBAEE86C0AA5FFBF2207829AF46B3025771B31' # Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
+ '1AD23D1B8F087A35AB74BDE9F4A7678C9C6B0B2B') # "X2go Git Administrator <git-admin at x2go.org>"
+
+prepare() {
+ cd ${pkgname}-${pkgver}
+ sed -i "s:-o root -g root ::" Makefile
+}
+
+build() {
+ cd ${pkgname}-${pkgver}
+# make -qp | awk -F':' '/^[a-zA-Z0-9][^$#\/\t=]*:([^=]|$)/ {split($1,A,/ /);for(i in A)print A[i]}' | grep ^install
+# return 1
+
+ make PREFIX=/usr
+ make PREFIX=/usr build_man # target broken and making the build hang
+
+# make PREFIX=/usr build_pluginprovider
+# make PREFIX=/usr build_client
+# make PREFIX=/usr build_plugin
+}
+
+package_x2goclient() {
+
+ pkgdesc="a graphical client (Qt4) for the X2Go system"
+ depends=('qt4' 'libldap' 'libcups' 'nxproxy' 'libssh' 'libxpm' 'hicolor-icon-theme')
+ # FS#48088
+ optdepends=('xorg-xauth: may be required by X2goservers running a different linux distribution giving MIT-COOKIE errors')
+
+ cd ${pkgbase}-${pkgver}
+ make PREFIX=/usr DESTDIR="$pkgdir" install_client install_man
+}
+
+package_x2goplugin() {
+ pkgdesc="provides X2Go Client as QtBrowser-based Mozilla plugin"
+ depends=('qt4' 'libcups' 'nxproxy' 'libssh' 'libxpm')
+
+ cd ${pkgbase}-${pkgver}
+ make PREFIX=/usr DESTDIR="$pkgdir" install_plugin
+}
+
+package_x2goplugin-provider() {
+
+ pkgdesc="an example configuration for providing the X2Go Plugin via an Apache webserver"
+ depends=('apache')
+ backup=(etc/x2go/plugin-provider/x2goplugin.html
+ etc/x2go/x2goplugin-apache.conf
+ etc/httpd/conf/x2goplugin-apache.conf)
+
+ cd ${pkgbase}-${pkgver}
+ make PREFIX=/usr DESTDIR="$pkgdir" install_pluginprovider
+
+ install -dm755 ${pkgdir}/etc/httpd/conf
+ cd ${pkgdir}/etc/httpd/conf
+ ln -svf /etc/x2go/x2goplugin-apache.conf ${pkgdir}/etc/httpd/conf/x2goplugin-apache.conf
+}
Deleted: extra-i686/x2goclient.install
===================================================================
--- extra-i686/x2goclient.install 2016-04-27 19:51:38 UTC (rev 266333)
+++ extra-i686/x2goclient.install 2016-04-27 19:51:54 UTC (rev 266334)
@@ -1,11 +0,0 @@
-post_install() {
- xdg-icon-resource forceupdate --theme hicolor
-}
-
-post_upgrade() {
- xdg-icon-resource forceupdate --theme hicolor
-}
-
-post_remove() {
- xdg-icon-resource forceupdate --theme hicolor
-}
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2016-04-27 19:51:38 UTC (rev 266333)
+++ extra-x86_64/PKGBUILD 2016-04-27 19:51:54 UTC (rev 266334)
@@ -1,72 +0,0 @@
-# $Id$
-# Maintainer: AndyRTR <andyrtr at archlinux.org>
-# Contributor: Gerhard Brauer <gerbra at archlinux.de>
-# Contributor: Richard Murri <admin at richardmurri.com>
-
-pkgbase=x2goclient
-pkgname=('x2goclient' 'x2goplugin' 'x2goplugin-provider')
-pkgver=4.0.5.1
-pkgrel=1
-arch=('i686' 'x86_64')
-license=('GPL2')
-url="http://www.x2go.org"
-makedepends=('qt4' 'libldap' 'libcups' 'nxproxy' 'libssh' 'libxpm' 'man2html' 'hicolor-icon-theme' 'xdg-utils' 'xorg-xauth')
-source=(http://code.x2go.org/releases/source/${pkgname}/${pkgname}-${pkgver}.tar.gz{,.asc})
-sha256sums=('844e983fbbddfe8a626506e4140b1ad65591e14f794c735412402bee3163ed11'
- 'SKIP')
-validpgpkeys=('9BFBAEE86C0AA5FFBF2207829AF46B3025771B31' # Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
- '1AD23D1B8F087A35AB74BDE9F4A7678C9C6B0B2B') # "X2go Git Administrator <git-admin at x2go.org>"
-
-prepare() {
- cd ${pkgname}-${pkgver}
- sed -i "s:-o root -g root ::" Makefile
-}
-
-build() {
- cd ${pkgname}-${pkgver}
-# make -qp | awk -F':' '/^[a-zA-Z0-9][^$#\/\t=]*:([^=]|$)/ {split($1,A,/ /);for(i in A)print A[i]}' | grep ^install
-# return 1
-
- make PREFIX=/usr
- make PREFIX=/usr build_man # target broken and making the build hang
-
-# make PREFIX=/usr build_pluginprovider
-# make PREFIX=/usr build_client
-# make PREFIX=/usr build_plugin
-}
-
-package_x2goclient() {
-
- pkgdesc="a graphical client (Qt4) for the X2Go system"
- depends=('qt4' 'libldap' 'libcups' 'nxproxy' 'libssh' 'libxpm' 'hicolor-icon-theme' 'xdg-utils')
- # FS#48088
- optdepends=('xorg-xauth: may be required by X2goservers running a different linux distribution giving MIT-COOKIE errors')
- install=x2goclient.install
-
- cd ${pkgbase}-${pkgver}
- make PREFIX=/usr DESTDIR="$pkgdir" install_client install_man
-}
-
-package_x2goplugin() {
- pkgdesc="provides X2Go Client as QtBrowser-based Mozilla plugin"
- depends=('qt4' 'libcups' 'nxproxy' 'libssh' 'libxpm')
-
- cd ${pkgbase}-${pkgver}
- make PREFIX=/usr DESTDIR="$pkgdir" install_plugin
-}
-
-package_x2goplugin-provider() {
-
- pkgdesc="an example configuration for providing the X2Go Plugin via an Apache webserver"
- depends=('apache')
- backup=(etc/x2go/plugin-provider/x2goplugin.html
- etc/x2go/x2goplugin-apache.conf
- etc/httpd/conf/x2goplugin-apache.conf)
-
- cd ${pkgbase}-${pkgver}
- make PREFIX=/usr DESTDIR="$pkgdir" install_pluginprovider
-
- install -dm755 ${pkgdir}/etc/httpd/conf
- cd ${pkgdir}/etc/httpd/conf
- ln -svf /etc/x2go/x2goplugin-apache.conf ${pkgdir}/etc/httpd/conf/x2goplugin-apache.conf
-}
Copied: x2goclient/repos/extra-x86_64/PKGBUILD (from rev 266333, x2goclient/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2016-04-27 19:51:54 UTC (rev 266334)
@@ -0,0 +1,71 @@
+# $Id$
+# Maintainer: AndyRTR <andyrtr at archlinux.org>
+# Contributor: Gerhard Brauer <gerbra at archlinux.de>
+# Contributor: Richard Murri <admin at richardmurri.com>
+
+pkgbase=x2goclient
+pkgname=('x2goclient' 'x2goplugin' 'x2goplugin-provider')
+pkgver=4.0.5.1
+pkgrel=2
+arch=('i686' 'x86_64')
+license=('GPL2')
+url="http://www.x2go.org"
+makedepends=('qt4' 'libldap' 'libcups' 'nxproxy' 'libssh' 'libxpm' 'man2html' 'hicolor-icon-theme' 'xdg-utils' 'xorg-xauth')
+source=(http://code.x2go.org/releases/source/${pkgname}/${pkgname}-${pkgver}.tar.gz{,.asc})
+sha256sums=('844e983fbbddfe8a626506e4140b1ad65591e14f794c735412402bee3163ed11'
+ 'SKIP')
+validpgpkeys=('9BFBAEE86C0AA5FFBF2207829AF46B3025771B31' # Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
+ '1AD23D1B8F087A35AB74BDE9F4A7678C9C6B0B2B') # "X2go Git Administrator <git-admin at x2go.org>"
+
+prepare() {
+ cd ${pkgname}-${pkgver}
+ sed -i "s:-o root -g root ::" Makefile
+}
+
+build() {
+ cd ${pkgname}-${pkgver}
+# make -qp | awk -F':' '/^[a-zA-Z0-9][^$#\/\t=]*:([^=]|$)/ {split($1,A,/ /);for(i in A)print A[i]}' | grep ^install
+# return 1
+
+ make PREFIX=/usr
+ make PREFIX=/usr build_man # target broken and making the build hang
+
+# make PREFIX=/usr build_pluginprovider
+# make PREFIX=/usr build_client
+# make PREFIX=/usr build_plugin
+}
+
+package_x2goclient() {
+
+ pkgdesc="a graphical client (Qt4) for the X2Go system"
+ depends=('qt4' 'libldap' 'libcups' 'nxproxy' 'libssh' 'libxpm' 'hicolor-icon-theme')
+ # FS#48088
+ optdepends=('xorg-xauth: may be required by X2goservers running a different linux distribution giving MIT-COOKIE errors')
+
+ cd ${pkgbase}-${pkgver}
+ make PREFIX=/usr DESTDIR="$pkgdir" install_client install_man
+}
+
+package_x2goplugin() {
+ pkgdesc="provides X2Go Client as QtBrowser-based Mozilla plugin"
+ depends=('qt4' 'libcups' 'nxproxy' 'libssh' 'libxpm')
+
+ cd ${pkgbase}-${pkgver}
+ make PREFIX=/usr DESTDIR="$pkgdir" install_plugin
+}
+
+package_x2goplugin-provider() {
+
+ pkgdesc="an example configuration for providing the X2Go Plugin via an Apache webserver"
+ depends=('apache')
+ backup=(etc/x2go/plugin-provider/x2goplugin.html
+ etc/x2go/x2goplugin-apache.conf
+ etc/httpd/conf/x2goplugin-apache.conf)
+
+ cd ${pkgbase}-${pkgver}
+ make PREFIX=/usr DESTDIR="$pkgdir" install_pluginprovider
+
+ install -dm755 ${pkgdir}/etc/httpd/conf
+ cd ${pkgdir}/etc/httpd/conf
+ ln -svf /etc/x2go/x2goplugin-apache.conf ${pkgdir}/etc/httpd/conf/x2goplugin-apache.conf
+}
Deleted: extra-x86_64/x2goclient.install
===================================================================
--- extra-x86_64/x2goclient.install 2016-04-27 19:51:38 UTC (rev 266333)
+++ extra-x86_64/x2goclient.install 2016-04-27 19:51:54 UTC (rev 266334)
@@ -1,11 +0,0 @@
-post_install() {
- xdg-icon-resource forceupdate --theme hicolor
-}
-
-post_upgrade() {
- xdg-icon-resource forceupdate --theme hicolor
-}
-
-post_remove() {
- xdg-icon-resource forceupdate --theme hicolor
-}
More information about the arch-commits
mailing list