The branch, master has been updated via a84dd07bbe38bc4d8ed12b84c64930c8c2b6227d (commit) via 5ea24ed1e222be8b569bccd5d63359d778af9aad (commit) via 867c3b9785f7da1f66588c24a6191ea43df5639e (commit) from 63bdc1f87004082372cddfcf0b6aab13bbe68a16 (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 a84dd07bbe38bc4d8ed12b84c64930c8c2b6227d Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Sun Nov 20 15:40:39 2011 +0100 rename 005_add-nxagent-wrapper.patch commit 5ea24ed1e222be8b569bccd5d63359d778af9aad Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Sun Nov 20 15:39:31 2011 +0100 Add patch: 008_add-nxproxy-wrapper.patch. Build nxproxy package. commit 867c3b9785f7da1f66588c24a6191ea43df5639e Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Sun Nov 20 15:36:37 2011 +0100 Add autoconf as build dependency. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 4 ++- debian/control | 27 +++++++++++++++++++- debian/{nxagent.dirs => nxproxy.dirs} | 0 debian/nxproxy.install | 3 ++ ...wrapper.patch => 005_add-nxagent-wrapper.patch} | 0 ...rapper.patch => 008_add-nx-proxy-wrapper.patch} | 5 ++- debian/patches/series | 3 +- 7 files changed, 37 insertions(+), 5 deletions(-) copy debian/{nxagent.dirs => nxproxy.dirs} (100%) create mode 100644 debian/nxproxy.install copy debian/patches/{005_add_nxagent_wrapper.patch => 005_add-nxagent-wrapper.patch} (100%) rename debian/patches/{005_add_nxagent_wrapper.patch => 008_add-nx-proxy-wrapper.patch} (64%) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 28e57aa..38cfafc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,12 +7,14 @@ nx-libs (2:3.5.0-0~x2go1) UNRELEASED; urgency=low * Add patch: 002_nxcompshad-build-against-nx-x11-only.patch. * Add patch: 003_nxcompshad-gcc43.patch. * Add patch: 004_nx-x11-fix-nxcompshad-build.patch. - * Add patch: 005_add_nxagent_wrapper.patch. + * Add patch: 005_add-nxagent-wrapper.patch. * Fix for lintian issue: missing-build-dependency quilt (>= 0.46-7~). * Fix for lintian issue: extended-description-line-too-long (nxagent). * Disabling build of *-dbg packages for now... * Add patch: 006_remove-configure-files.patch. * Add patch: 007_nxcompshad-clean-gch-files.patch. * Remove unknown option --with from dh_auto_clean. + * Add autoconf as build dependency. + * Add patch: 008_add-nxproxy-wrapper.patch. Build nxproxy package. -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Fri, 14 Oct 2011 03:01:39 +0200 diff --git a/debian/control b/debian/control index 46cad6e..dcc6483 100644 --- a/debian/control +++ b/debian/control @@ -9,7 +9,8 @@ Build-Depends: libpng-dev, libjpeg-dev, zlib1g-dev, - quilt (>= 0.46-7~) + quilt (>= 0.46-7~), + autoconf Build-Conflicts: x11proto-core-dev, x11proto-kb-dev, @@ -109,6 +110,30 @@ Description: NX agent (NoMachine) # . # This package contains the debug symbols of nxagent. Source: nx-libs +Package: nxproxy +Architecture: any +Depends: + libxcomp3 (>= ${source:Version}), libxcomp3 (<< ${source:Version}.1~), + ${shlibs:Depends}, + ${misc:Depends} +Description: NX proxy (NoMachine) + NX provides a differential X compression library for X11. + . + This package provides the NX proxy (client) binary. + +#Package: nxproxy-dbg +#Architecture: any +#Depends: +# libxcomp3 (>= ${source:Version}), libxcomp3 (<< ${source:Version}.1~), +# ${shlibs:Depends}, +# ${misc:Depends} +#Priority: extra +#Section: debug +#Description: NX proxy (NoMachine), debug symbols +# NX provides a differential X compression library for X11. +# . +# This package provides the NX proxy (client) binary. + Package: libxcomp3 Architecture: any Depends: diff --git a/debian/nxagent.dirs b/debian/nxproxy.dirs similarity index 100% copy from debian/nxagent.dirs copy to debian/nxproxy.dirs diff --git a/debian/nxproxy.install b/debian/nxproxy.install new file mode 100644 index 0000000..42a49f2 --- /dev/null +++ b/debian/nxproxy.install @@ -0,0 +1,3 @@ +nxproxy/nxproxy usr/lib/nx +bin/nxproxy usr/bin + diff --git a/debian/patches/005_add_nxagent_wrapper.patch b/debian/patches/005_add-nxagent-wrapper.patch similarity index 100% copy from debian/patches/005_add_nxagent_wrapper.patch copy to debian/patches/005_add-nxagent-wrapper.patch diff --git a/debian/patches/005_add_nxagent_wrapper.patch b/debian/patches/008_add-nx-proxy-wrapper.patch similarity index 64% rename from debian/patches/005_add_nxagent_wrapper.patch rename to debian/patches/008_add-nx-proxy-wrapper.patch index a2a9f92..9c208e2 100644 --- a/debian/patches/005_add_nxagent_wrapper.patch +++ b/debian/patches/008_add-nx-proxy-wrapper.patch @@ -1,5 +1,5 @@ --- /dev/null -+++ b/bin/nxagent ++++ b/bin/nxproxy @@ -0,0 +1,9 @@ +#!/bin/bash + @@ -9,4 +9,5 @@ +export NX_LIBS +export LD_LIBRARY_PATH + -+exec /usr/lib/nx/nxagent "$@" ++exec /usr/lib/nx/nxproxy "$@" +\ No newline at end of file diff --git a/debian/patches/series b/debian/patches/series index 0067975..a2f96da 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -2,6 +2,7 @@ 002_nxcompshad-build-against-nx-x11-only.patch 003_nxcompshad-gcc43.patch 004_nx-x11-fix-nxcompshad-build.patch -005_add_nxagent_wrapper.patch +005_add-nxagent-wrapper.patch 006_remove-configure-files.patch 007_nxcompshad-clean-gch-files.patch +008_add-nx-proxy-wrapper.patch hooks/post-receive -- nx-libs.git (NX libraries) 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 "nx-libs.git" (NX libraries).
-
git-admin＠x2go.org