[X2go-Commits] nx-libs.git - master (branch) updated: redist-client/3.5.0.11-12-g95929b8

X2go dev team git-admin at x2go.org
Thu Mar 1 22:27:35 CET 2012


The branch, master has been updated
       via  95929b8a50ce2ea07c1a0784b58a94fb0b23e36a (commit)
       via  9b17e8a96af48181c60a2dcbd3f94445bdc18623 (commit)
      from  fb274937dea4838ff18724f556305a05282cd45a (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 95929b8a50ce2ea07c1a0784b58a94fb0b23e36a
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Thu Mar 1 22:27:26 2012 +0100

    no bashisms in package scripts

commit 9b17e8a96af48181c60a2dcbd3f94445bdc18623
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Thu Mar 1 22:26:38 2012 +0100

    changelog cleanup: fixing too-long-line

-----------------------------------------------------------------------

Summary of changes:
 debian/changelog          |    9 ++++-----
 debian/libnx-x11.postinst |    2 +-
 2 files changed, 5 insertions(+), 6 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 578cdac..f11eef9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,11 +15,10 @@ nx-libs (2:3.5.0.12-0) UNRELEASED; urgency=low
     nxcomp/Split.cpp.
 
   [ Oleksandr Shneyder ]
-  * Create patch: 203_nxagent_disable-rootless-exit.full.patch.
-    Add command line argument "-norootlessexit".
-    Usually, nxagent exits after 30 seconds if running in rootless mode
-    and no X-Clients are present.  Starting nxagent with option "-norootlessexit"
-    will change this behaviour.
+  * Add patch: 203_nxagent_disable-rootless-exit.full.patch, add command line
+    argument "-norootlessexit". Usually, nxagent exits after 30 seconds if
+    running in rootless mode and no X-Clients are present. Starting nxagent
+    with option "-norootlessexit" will change this behaviour.
 
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Wed, 22 Feb 2012 15:05:38 +0100
 
diff --git a/debian/libnx-x11.postinst b/debian/libnx-x11.postinst
index ed56bd7..514833c 100755
--- a/debian/libnx-x11.postinst
+++ b/debian/libnx-x11.postinst
@@ -23,7 +23,7 @@ case "$1" in
 		### FIXME: this is a work-around while we have not implemented
 		###        multiarch support into the Debian source package of
 		###        nx-libs.
-		if dpkg-architecture -qDEB_BUILD_MULTIARCH &>/dev/null; then
+		if dpkg-architecture -qDEB_BUILD_MULTIARCH 1>/dev/null 2>/dev/null; then
 			rm -f /usr/lib/nx/X11/Xinerama/libNX_X11.so.6
 			rm -f /usr/lib/nx/X11/Xinerama/libNX_Xext.so.6
 			libdir=/usr/lib/$(dpkg-architecture -qDEB_BUILD_MULTIARCH)


hooks/post-receive
-- 
nx-libs.git (NX (redistributed))

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 (redistributed)).




More information about the x2go-commits mailing list