x2go-commits November 2011

x2go-commits@lists.x2go.org

1 participants
130 discussions

x2goagent.git - master (branch) updated: 3.5.0.2-17-g1f2e523
by git-admin＠x2go.org 21 Nov '11

21 Nov '11

The branch, master has been updated via 1f2e523e89d592507dabb3749a922a52c591af8c (commit) from 38470ee1424fc99f3d3b1069bc68256c100098ad (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 1f2e523e89d592507dabb3749a922a52c591af8c Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Nov 21 23:46:39 2011 +0100 Use an LD_LIBRARY_PATH compliant to nx-libs (2:3.5.0) in debian/rules. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + debian/rules | 1 + 2 files changed, 2 insertions(+), 0 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 95691a2..a35065d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -24,6 +24,7 @@ x2goagent (3.5.0.5-0~x2go1) UNRELEASED; urgency=low * programs/Xserver/Imakefile: use /usr/lib/nx and /usr/lib/nx/X11 as NX library paths. * Disable building of x2goagent-dbg package. + * Use an LD_LIBRARY_PATH compliant to nx-libs (2:3.5.0) in debian/rules. -- Oleksandr Shneyder <oleksandr.shneyder(a)treuchtlingen.de> Tue, 04 Oct 2011 08:11:22 +0200 diff --git a/debian/rules b/debian/rules index 607c412..1661c1d 100755 --- a/debian/rules +++ b/debian/rules @@ -1,6 +1,7 @@ #!/usr/bin/make -f CFLAGS = -Wall -g +LD_LIBRARY_PATH=/usr/lib/nx/X11:/usr/lib/nx:$$LD_LIBRARY_PATH ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) CFLAGS += -O0 hooks/post-receive -- x2goagent.git (X2go (NX-like) Agent) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2goagent.git" (X2go (NX-like) Agent).

1 0

x2goagent.git - master (branch) updated: 3.5.0.2-16-g38470ee
by git-admin＠x2go.org 21 Nov '11

21 Nov '11

The branch, master has been updated via 38470ee1424fc99f3d3b1069bc68256c100098ad (commit) from 39551366b095ef20528f22e26ad2b64e272912f2 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 38470ee1424fc99f3d3b1069bc68256c100098ad Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Nov 21 23:27:18 2011 +0100 Disable building of x2goagent-dbg package. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + debian/rules | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index a9c2421..95691a2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -23,6 +23,7 @@ x2goagent (3.5.0.5-0~x2go1) UNRELEASED; urgency=low headers. * programs/Xserver/Imakefile: use /usr/lib/nx and /usr/lib/nx/X11 as NX library paths. + * Disable building of x2goagent-dbg package. -- Oleksandr Shneyder <oleksandr.shneyder(a)treuchtlingen.de> Tue, 04 Oct 2011 08:11:22 +0200 diff --git a/debian/rules b/debian/rules index d7a3514..607c412 100755 --- a/debian/rules +++ b/debian/rules @@ -43,7 +43,7 @@ binary-arch: build install dh_installexamples dh_installman dh_link - dh_strip --dbg-package=x2goagent-dbg +# dh_strip --dbg-package=x2goagent-dbg dh_compress dh_fixperms dh_installdeb hooks/post-receive -- x2goagent.git (X2go (NX-like) Agent) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2goagent.git" (X2go (NX-like) Agent).

1 0

x2goagent.git - master (branch) updated: 3.5.0.2-15-g3955136
by git-admin＠x2go.org 21 Nov '11

21 Nov '11

The branch, master has been updated via 39551366b095ef20528f22e26ad2b64e272912f2 (commit) from 61fa6c1604c7c8cf2615d65dd1b87b37b1c201cc (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 39551366b095ef20528f22e26ad2b64e272912f2 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Nov 21 23:00:20 2011 +0100 programs/Xserver/Imakefile: use /usr/lib/nx and /usr/lib/nx/X11 as NX library paths. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 ++ programs/Xserver/Imakefile | 2 +- 2 files changed, 3 insertions(+), 1 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 095197a..a9c2421 100644 --- a/debian/changelog +++ b/debian/changelog @@ -21,6 +21,8 @@ x2goagent (3.5.0.5-0~x2go1) UNRELEASED; urgency=low libraries. * programs/Xserver/os/Imakefile: use /usr/include/nx as include path for NX headers. + * programs/Xserver/Imakefile: use /usr/lib/nx and /usr/lib/nx/X11 as NX + library paths. -- Oleksandr Shneyder <oleksandr.shneyder(a)treuchtlingen.de> Tue, 04 Oct 2011 08:11:22 +0200 diff --git a/programs/Xserver/Imakefile b/programs/Xserver/Imakefile index fa03077..383407c 100644 --- a/programs/Xserver/Imakefile +++ b/programs/Xserver/Imakefile @@ -1019,7 +1019,7 @@ NXAGENTNXLIBS = -L ../../../nxcomp -L ../../../nxcompext \ -lXcomp -lXcompext -lXrender -lX11 -lXext -lXcomposite -lXfixes \ -L ../../../nxcompshad -lXcompshad -L../../../nx-X11/exports/lib -lXtst #else -NXAGENTNXLIBS = \ +NXAGENTNXLIBS = -L /usr/lib/nx -L /usr/lib/nx/X11 \ -lXcomp -lXcompext -lXcompshad -lXrender -lX11 -lXext -lXfixes \ -lXtst -lXdamage -lXrandr -lXcomposite #endif hooks/post-receive -- x2goagent.git (X2go (NX-like) Agent) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2goagent.git" (X2go (NX-like) Agent).

1 0

x2goagent.git - master (branch) updated: 3.5.0.2-14-g61fa6c1
by git-admin＠x2go.org 21 Nov '11

21 Nov '11

The branch, master has been updated via 61fa6c1604c7c8cf2615d65dd1b87b37b1c201cc (commit) from 72efbcab4c5eaf5bdcd9038554b028d14b02a219 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 61fa6c1604c7c8cf2615d65dd1b87b37b1c201cc Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Nov 21 22:38:52 2011 +0100 programs/Xserver/os/Imakefile: use /usr/include/nx as include path for NX headers. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 ++ programs/Xserver/os/Imakefile | 2 +- 2 files changed, 3 insertions(+), 1 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index f691d0c..095197a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -19,6 +19,8 @@ x2goagent (3.5.0.5-0~x2go1) UNRELEASED; urgency=low * lib/X11/Imakefile: use /usr/lib/nx as search path for libXcomp* libraries. * programms/Xserver/Imakefile: use /usr/lib/nx as search path for libXcomp* libraries. + * programs/Xserver/os/Imakefile: use /usr/include/nx as include path for NX + headers. -- Oleksandr Shneyder <oleksandr.shneyder(a)treuchtlingen.de> Tue, 04 Oct 2011 08:11:22 +0200 diff --git a/programs/Xserver/os/Imakefile b/programs/Xserver/os/Imakefile index 22be060..6c6e8a1 100644 --- a/programs/Xserver/os/Imakefile +++ b/programs/Xserver/os/Imakefile @@ -30,7 +30,7 @@ XCOMM $XFree86: xc/programs/Xserver/os/Imakefile,v 3.40 2003/09/09 03:20:41 dawe #if NXLibraries -NX_INCLUDES = -I../../../../nxcomp +NX_INCLUDES = -I../../../../nxcomp -I/usr/include/nx NX_DEFINES = -DNX_TRANS_SOCKET \ -DNX_TRANS_AUTH \ hooks/post-receive -- x2goagent.git (X2go (NX-like) Agent) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2goagent.git" (X2go (NX-like) Agent).

1 0

x2goagent.git - master (branch) updated: 3.5.0.2-13-g72efbca
by git-admin＠x2go.org 21 Nov '11

21 Nov '11

The branch, master has been updated via 72efbcab4c5eaf5bdcd9038554b028d14b02a219 (commit) from 8fed94d5b710e919761c7396414e1c7417e5cf01 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 72efbcab4c5eaf5bdcd9038554b028d14b02a219 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Nov 21 22:23:13 2011 +0100 programms/Xserver/Imakefile: use /usr/lib/nx as search path for libXcomp* libraries. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 ++ programs/Xserver/Imakefile | 2 +- 2 files changed, 3 insertions(+), 1 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index a3528c2..f691d0c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -17,6 +17,8 @@ x2goagent (3.5.0.5-0~x2go1) UNRELEASED; urgency=low script. * Remove xorg-dev, xutils-dev from build dependencies. * lib/X11/Imakefile: use /usr/lib/nx as search path for libXcomp* libraries. + * programms/Xserver/Imakefile: use /usr/lib/nx as search path for libXcomp* + libraries. -- Oleksandr Shneyder <oleksandr.shneyder(a)treuchtlingen.de> Tue, 04 Oct 2011 08:11:22 +0200 diff --git a/programs/Xserver/Imakefile b/programs/Xserver/Imakefile index cf2ae95..fa03077 100644 --- a/programs/Xserver/Imakefile +++ b/programs/Xserver/Imakefile @@ -1032,7 +1032,7 @@ NX_XSHADOWLIBNAME = cygXcompshad.dll NX_XSHADOWLIBNAME = libXcompshad.so #endif -NX_XSHADOWLIBDIR = /usr/lib +NX_XSHADOWLIBDIR = /usr/lib/nx NX_XSHADOWLIBTARGET = $(NX_XSHADOWLIBDIR)/$(NX_XSHADOWLIBNAME) NX_XSHADOWCONFIGTARGET = $(NX_XSHADOWLIBDIR)/config.status hooks/post-receive -- x2goagent.git (X2go (NX-like) Agent) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2goagent.git" (X2go (NX-like) Agent).

1 0

x2goagent.git - master (branch) updated: 3.5.0.2-12-g8fed94d
by git-admin＠x2go.org 21 Nov '11

21 Nov '11

The branch, master has been updated via 8fed94d5b710e919761c7396414e1c7417e5cf01 (commit) via 8c0d5b93b80109be957d5746987935abc2ea6a11 (commit) from 8318f7035b8d7d335ecef604a7ec67644b2ce57b (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 8fed94d5b710e919761c7396414e1c7417e5cf01 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Nov 21 22:10:49 2011 +0100 lib/X11/Imakefile: use /usr/lib/nx as search path for libXcomp* libraries. commit 8c0d5b93b80109be957d5746987935abc2ea6a11 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Nov 21 22:10:17 2011 +0100 permissions fix for debian/rules ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + lib/X11/Imakefile | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) mode change 100644 => 100755 debian/rules The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 13d614d..a3528c2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -16,6 +16,7 @@ x2goagent (3.5.0.5-0~x2go1) UNRELEASED; urgency=low * Use an LD_LIBRARY_PATH compliant to nx-libs (2:3.5.0) in x2goagent wrapper script. * Remove xorg-dev, xutils-dev from build dependencies. + * lib/X11/Imakefile: use /usr/lib/nx as search path for libXcomp* libraries. -- Oleksandr Shneyder <oleksandr.shneyder(a)treuchtlingen.de> Tue, 04 Oct 2011 08:11:22 +0200 diff --git a/debian/rules b/debian/rules old mode 100644 new mode 100755 diff --git a/lib/X11/Imakefile b/lib/X11/Imakefile index 7689d7b..df49a36 100644 --- a/lib/X11/Imakefile +++ b/lib/X11/Imakefile @@ -59,14 +59,14 @@ NX_XCOMPLIBNAME = libXcomp.so NX_XCOMPEXTLIBNAME = libXcompext.so #endif -NX_XCOMPLIBDIR = /usr/lib +NX_XCOMPLIBDIR = /usr/lib/nx NX_XCOMPLIBLINK = Xcomp NX_XCOMPLIBTARGET = $(NX_XCOMPLIBDIR)/$(NX_XCOMPLIBNAME) NX_REQUIREDLIBS = -L$(NX_XCOMPLIBDIR) -l$(NX_XCOMPLIBLINK) NX_XCOMPDEPTARGET = $(BUILDLIBDIR)/$(NX_XCOMPLIBNAME) NX_XCOMPCONFIGTARGET = $(NX_XCOMPLIBDIR)/config.status -NX_XCOMPEXTLIBDIR = /usr/lib +NX_XCOMPEXTLIBDIR = /usr/lib/nx NX_XCOMPEXTLIBTARGET = $(NX_XCOMPEXTLIBDIR)/$(NX_XCOMPEXTLIBNAME) NX_XCOMPEXTCONFIGTARGET = $(NX_XCOMPEXTLIBDIR)/config.status hooks/post-receive -- x2goagent.git (X2go (NX-like) Agent) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2goagent.git" (X2go (NX-like) Agent).

1 0

x2goagent.git - master (branch) updated: 3.5.0.2-10-g8318f70
by git-admin＠x2go.org 21 Nov '11

21 Nov '11

The branch, master has been updated via 8318f7035b8d7d335ecef604a7ec67644b2ce57b (commit) from c4c3b57024e193d7db7b6775051887cd79a2b072 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 8318f7035b8d7d335ecef604a7ec67644b2ce57b Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Nov 21 21:57:53 2011 +0100 Remove xorg-dev, xorg-utils from build dependencies. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + debian/control | 8 +++----- 2 files changed, 4 insertions(+), 5 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index c9dd7d1..13d614d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -15,6 +15,7 @@ x2goagent (3.5.0.5-0~x2go1) UNRELEASED; urgency=low * Build depend on headers from nx-libs (2:3.5.0). * Use an LD_LIBRARY_PATH compliant to nx-libs (2:3.5.0) in x2goagent wrapper script. + * Remove xorg-dev, xutils-dev from build dependencies. -- Oleksandr Shneyder <oleksandr.shneyder(a)treuchtlingen.de> Tue, 04 Oct 2011 08:11:22 +0200 diff --git a/debian/control b/debian/control index 7125d9d..5f244c9 100644 --- a/debian/control +++ b/debian/control @@ -4,13 +4,11 @@ Priority: extra Maintainer: Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> Build-Depends: debhelper (>= 7), - libxcomp-dev (>= 2:3.5.0), - libxcompext-dev (>= 2:3.5.0), - libxcompshad-dev (>= 2:3.5.0), + libxcomp-dev (>= 2:3.5.0-0~), + libxcompext-dev (>= 2:3.5.0-0~), + libxcompshad-dev (>= 2:3.5.0-0~), zlib1g-dev, libfreetype6-dev, - xorg-dev, - xutils-dev Standards-Version: 3.9.2 Homepage: http://code.x2go.org/releases/source/x2goagent Vcs-Git: git://code.x2go.org/x2goagent.git hooks/post-receive -- x2goagent.git (X2go (NX-like) Agent) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2goagent.git" (X2go (NX-like) Agent).

1 0

x2goserver.git - master (branch) updated: 3.0.99.8-12-g97506f8
by git-admin＠x2go.org 21 Nov '11

21 Nov '11

The branch, master has been updated via 97506f8090c0fcb0bd641a368029342f5e1e4b9e (commit) from d162a4c5ccf895e9136c930e1ce17cb860a8def7 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 97506f8090c0fcb0bd641a368029342f5e1e4b9e Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Nov 21 21:11:19 2011 +0100 version increment, changelog entry for Makefile fixes derived from work on lenny backport ----------------------------------------------------------------------- Summary of changes: debian/changelog | 7 +++++++ x2goserver-compat/VERSION.x2goserver-compat | 2 +- .../VERSION.x2goserver-extensions | 2 +- x2goserver-printing/VERSION.x2goserver-printing | 2 +- x2goserver-xsession/VERSION.x2goserver-xsession | 2 +- x2goserver/VERSION.x2goserver | 2 +- 6 files changed, 12 insertions(+), 5 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index d4926ac..3c5f5e9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +x2goserver (3.0.99.9-0~x2go1) UNRELEASED; urgency=low + + * New upstream version (3.0.99.9): + - Fix for install stanzas in several Makefiles. + + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Mon, 21 Nov 2011 21:09:07 +0100 + x2goserver (3.0.99.8-0~x2go1) unstable; urgency=low * New upstream version (3.0.99.8): diff --git a/x2goserver-compat/VERSION.x2goserver-compat b/x2goserver-compat/VERSION.x2goserver-compat index d720f99..c7d6552 100644 --- a/x2goserver-compat/VERSION.x2goserver-compat +++ b/x2goserver-compat/VERSION.x2goserver-compat @@ -1 +1 @@ -3.0.99.8 \ No newline at end of file +3.0.99.9 \ No newline at end of file diff --git a/x2goserver-extensions/VERSION.x2goserver-extensions b/x2goserver-extensions/VERSION.x2goserver-extensions index d720f99..c7d6552 100644 --- a/x2goserver-extensions/VERSION.x2goserver-extensions +++ b/x2goserver-extensions/VERSION.x2goserver-extensions @@ -1 +1 @@ -3.0.99.8 \ No newline at end of file +3.0.99.9 \ No newline at end of file diff --git a/x2goserver-printing/VERSION.x2goserver-printing b/x2goserver-printing/VERSION.x2goserver-printing index d720f99..c7d6552 100644 --- a/x2goserver-printing/VERSION.x2goserver-printing +++ b/x2goserver-printing/VERSION.x2goserver-printing @@ -1 +1 @@ -3.0.99.8 \ No newline at end of file +3.0.99.9 \ No newline at end of file diff --git a/x2goserver-xsession/VERSION.x2goserver-xsession b/x2goserver-xsession/VERSION.x2goserver-xsession index d720f99..c7d6552 100644 --- a/x2goserver-xsession/VERSION.x2goserver-xsession +++ b/x2goserver-xsession/VERSION.x2goserver-xsession @@ -1 +1 @@ -3.0.99.8 \ No newline at end of file +3.0.99.9 \ No newline at end of file diff --git a/x2goserver/VERSION.x2goserver b/x2goserver/VERSION.x2goserver index d720f99..c7d6552 100644 --- a/x2goserver/VERSION.x2goserver +++ b/x2goserver/VERSION.x2goserver @@ -1 +1 @@ -3.0.99.8 \ No newline at end of file +3.0.99.9 \ No newline at end of file hooks/post-receive -- x2goserver.git (X2go Server) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2goserver.git" (X2go Server).

1 0

buildscripts.git - master (branch) updated: 5bef6cf09c703e863aee601a09ca3afe8130e18e
by git-admin＠x2go.org 21 Nov '11

21 Nov '11

The branch, master has been updated via 5bef6cf09c703e863aee601a09ca3afe8130e18e (commit) from 1d27752bd12d2f7985462e7a135ec8d3211ac19a (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 5bef6cf09c703e863aee601a09ca3afe8130e18e Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Nov 21 21:06:41 2011 +0100 build NX libraries from nx-libs.git for heuler area (nightly builds) ----------------------------------------------------------------------- Summary of changes: bin/x2go-build-all-packages | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) The diff of changes is: diff --git a/bin/x2go-build-all-packages b/bin/x2go-build-all-packages index 19c84ae..6790b44 100755 --- a/bin/x2go-build-all-packages +++ b/bin/x2go-build-all-packages @@ -19,9 +19,7 @@ LIB_PACKAGES_HEULER="\ x2go-keyring heuler master\n -nxcomp heuler master\n -nxcompext heuler master\n -nxcompshad heuler master\n +nx-libs heuler master\n python-x2go heuler master\n " LIB_PACKAGES_MAIN="\ hooks/post-receive -- buildscripts.git (buildscripts upstream project) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "buildscripts.git" (buildscripts upstream project).

1 0

x2goagent.git - master (branch) updated: 3.5.0.2-9-gc4c3b57
by git-admin＠x2go.org 21 Nov '11

21 Nov '11

The branch, master has been updated via c4c3b57024e193d7db7b6775051887cd79a2b072 (commit) from 3130d50f7bddd42a03f36a7adf18f7b2f3f505dd (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit c4c3b57024e193d7db7b6775051887cd79a2b072 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Nov 21 21:04:58 2011 +0100 Disable x2goagent-dbg package for now. Build depend on headers from nx-libs (2:3.5.0). Use an LD_LIBRARY_PATH compliant to nx-libs (2:3.5.0) in x2goagent wrapper script. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 4 +++ debian/control | 61 ++++++++++++++++++++++++++------------------------ debian/x2goagent.sh | 5 +--- 3 files changed, 37 insertions(+), 33 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 4601de7..c9dd7d1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,6 +11,10 @@ x2goagent (3.5.0.5-0~x2go1) UNRELEASED; urgency=low * Patch for glcontextmodes.c taken from comparison between x2goagent in Git and a non-Git version of x2goagent. * Use version 3.5.0 in nxagent code (instead of version 3.5.0.5). + * Disable x2goagent-dbg package for now. + * Build depend on headers from nx-libs (2:3.5.0). + * Use an LD_LIBRARY_PATH compliant to nx-libs (2:3.5.0) in x2goagent wrapper + script. -- Oleksandr Shneyder <oleksandr.shneyder(a)treuchtlingen.de> Tue, 04 Oct 2011 08:11:22 +0200 diff --git a/debian/control b/debian/control index 9a914c6..7125d9d 100644 --- a/debian/control +++ b/debian/control @@ -4,9 +4,9 @@ Priority: extra Maintainer: Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> Build-Depends: debhelper (>= 7), - libxcomp-dev (>= 3.5.0), - libxcompext-dev (>= 3.5.0), - libxcompshad-dev (>= 3.5.0), + libxcomp-dev (>= 2:3.5.0), + libxcompext-dev (>= 2:3.5.0), + libxcompshad-dev (>= 2:3.5.0), zlib1g-dev, libfreetype6-dev, xorg-dev, @@ -19,6 +19,9 @@ Vcs-Browser: http://code.x2go.org/gitweb?p=x2goagent.git;a=summary Package: x2goagent Architecture: any Depends: + libxcomp3 (>= 2:3.5.0-0~), + libxcompext3 (>= 3:3.5.0-0~), + libxcompshad3 (>= 3:3.5.0-0~), ${shlibs:Depends}, ${misc:Depends} Description: Special X2go-ized X agent, forked from NX-X11 (NoMachine) @@ -36,29 +39,29 @@ Description: Special X2go-ized X agent, forked from NX-X11 (NoMachine) requests locally, ensuring that the most common source of round-trips are nearly reduced to zero. -Package: x2goagent-dbg -Architecture: any -Depends: - libxcomp-dbg, - libxcompext-dbg, - libxcompshad-dbg, - ${shlibs:Depends}, - ${misc:Depends} -Priority: extra -Section: debug -Description: Special X2go-ized X agent, forked from NX-X11 (NoMachine) - x2goagent is an agent providing X transport of X sessions. The application - is based on the well known Xnest "nested" server. x2goagent, like Xnest, - is an X server for its own clients, and at the same time, an X client - for a system's local X server. - . - The main scope of x2goagent is to eliminate X round-trips or transform - them into asynchronous replies. x2goagent works together with nxproxy from - NoMachine. nxproxy itself does not make any effort to minimize round-trips - by itself, this is demanded of x2goagent. - . - Being an X server, x2goagent is able to resolve all the property/atoms related - requests locally, ensuring that the most common source of round-trips are nearly - reduced to zero. - . - This package contains the debug symbols of x2goagent. \ No newline at end of file +#Package: x2goagent-dbg +#Architecture: any +#Depends: +# libxcomp-dbg, +# libxcompext-dbg, +# libxcompshad-dbg, +# ${shlibs:Depends}, +# ${misc:Depends} +#Priority: extra +#Section: debug +#Description: Special X2go-ized X agent, forked from NX-X11 (NoMachine) +# x2goagent is an agent providing X transport of X sessions. The application +# is based on the well known Xnest "nested" server. x2goagent, like Xnest, +# is an X server for its own clients, and at the same time, an X client +# for a system's local X server. +# . +# The main scope of x2goagent is to eliminate X round-trips or transform +# them into asynchronous replies. x2goagent works together with nxproxy from +# NoMachine. nxproxy itself does not make any effort to minimize round-trips +# by itself, this is demanded of x2goagent. +# . +# Being an X server, x2goagent is able to resolve all the property/atoms related +# requests locally, ensuring that the most common source of round-trips are nearly +# reduced to zero. +# . +# This package contains the debug symbols of x2goagent. diff --git a/debian/x2goagent.sh b/debian/x2goagent.sh index 6e69888..c801a50 100644 --- a/debian/x2goagent.sh +++ b/debian/x2goagent.sh @@ -1,9 +1,6 @@ #!/bin/bash -X2GO_LIBS=/usr/lib/x2go -LD_LIBRARY_PATH=/usr/lib/x2go - -export X2GO_LIBS +LD_LIBRARY_PATH=/usr/lib/nx:/usr/lib/nx/X11 export LD_LIBRARY_PATH exec /usr/lib/x2go/x2goagent "$@" hooks/post-receive -- x2goagent.git (X2go (NX-like) Agent) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2goagent.git" (X2go (NX-like) Agent).

1 0

← Newer
1
2
3
4
5
6
7
8
...
13
Older →

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

x2go-commits November 2011