[X2go-Commits] nx-libs.git - client-only (branch) updated: redist-client/3.5.0.1-4-geb19e11

X2go dev team git-admin at x2go.org
Tue Jan 10 15:15:01 CET 2012


The branch, client-only has been updated
       via  eb19e114da385f402de27b59db821c55a546d9a0 (commit)
       via  8a49deb4c78debf2807dc380fdd990eafa56fe03 (commit)
       via  e0ada9a680c47c941d1319ed26764342b3c0a8ab (commit)
       via  3cea2eac5a6cce2383919a07b23dce4dd8e95ae6 (commit)
      from  467fc9136413b01c5f2a6bff7d432ffee66d2143 (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 eb19e114da385f402de27b59db821c55a546d9a0
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Tue Jan 10 15:14:54 2012 +0100

    Remove -X autom4te.cache from override_dh_clean in /debian/rules.

commit 8a49deb4c78debf2807dc380fdd990eafa56fe03
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Tue Jan 10 15:13:58 2012 +0100

    Fix nxproxy wrapper installation (dh_install).

commit e0ada9a680c47c941d1319ed26764342b3c0a8ab
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Tue Jan 10 15:10:59 2012 +0100

    Build with source format 3.0 (native) for the NX-redistributed project.

commit 3cea2eac5a6cce2383919a07b23dce4dd8e95ae6
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Tue Jan 10 15:08:52 2012 +0100

    Make nxproxy wrapper available via patch, not in /debian/bin folder.

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

Summary of changes:
 debian/changelog                             |    9 ++++++++
 debian/nxproxy.install                       |    2 +-
 debian/patches/022_add-nxproxy-wrapper.patch |   27 ++++++++++++++++++++++++++
 debian/patches/series                        |    2 +
 debian/rules                                 |    2 +-
 debian/source/format                         |    2 +-
 6 files changed, 41 insertions(+), 3 deletions(-)
 create mode 100644 debian/patches/022_add-nxproxy-wrapper.patch

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 2888186..4413bc2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+nx-libs (3.5.0.2-2) UNRELEASED; urgency=low
+
+  * Make nxproxy wrapper available via patch, not in /debian/bin folder.
+  * Build with source format 3.0 (native) for the NX-redistributed project.
+  * Fix nxproxy wrapper installation (dh_install).
+  * Remove -X autom4te.cache from override_dh_clean in /debian/rules.
+
+ -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Tue, 10 Jan 2012 15:07:39 +0100
+
 nx-libs (3.5.0.1-0) unstable; urgency=low
 
   * Fix README.NX-redistributed. Adapt to client-only branch.
diff --git a/debian/nxproxy.install b/debian/nxproxy.install
index 4db97ca..42a49f2 100644
--- a/debian/nxproxy.install
+++ b/debian/nxproxy.install
@@ -1,3 +1,3 @@
 nxproxy/nxproxy                    usr/lib/nx
-debian/bin/nxproxy                 usr/bin
+bin/nxproxy                        usr/bin
 
diff --git a/debian/patches/022_add-nxproxy-wrapper.patch b/debian/patches/022_add-nxproxy-wrapper.patch
new file mode 100644
index 0000000..cedfde3
--- /dev/null
+++ b/debian/patches/022_add-nxproxy-wrapper.patch
@@ -0,0 +1,27 @@
+--- /dev/null
++++ b/bin/nxproxy
+@@ -0,0 +1,24 @@
++#!/bin/bash
++
++# Copyright (C) 2012 Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
++#
++# This program is free software: you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation, either version 3 of the License, or
++# (at your option) any later version.
++#
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++# GNU General Public License for more details.
++#
++# You should have received a copy of the GNU General Public License
++# along with this program.  If not, see http://www.gnu.org/licenses/.
++
++NX_LIBS=/usr/lib/nx
++LD_LIBRARY_PATH=/usr/lib/nx:/usr/lib/nx/X11:$LD_LIBRARY_PATH
++
++export NX_LIBS
++export LD_LIBRARY_PATH
++
++exec /usr/lib/nx/nxproxy "$@"
diff --git a/debian/patches/series b/debian/patches/series
index 680d346..61f71a7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,3 +6,5 @@
 011_nxcomp_sa-restorer.patch
 012_nxcomp_makefile-uninstall.patch
 015_nxproxy_makefile-uninstall.patch
+022_add-nxproxy-wrapper.patch
+
diff --git a/debian/rules b/debian/rules
index 3ddac71..0d04159 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,7 +14,7 @@ endif
 override_dh_clean:
 	rm -f nxcomp/changelog
 	rm -f nxproxy/changelog
-	dh_clean -X autom4te.cache
+	dh_clean
 
 override_dh_auto_build:
 	debian/pre-build-nx.sh
diff --git a/debian/source/format b/debian/source/format
index 163aaf8..89ae9db 100644
--- a/debian/source/format
+++ b/debian/source/format
@@ -1 +1 @@
-3.0 (quilt)
+3.0 (native)


hooks/post-receive
-- 
nx-libs.git (NX libraries (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 libraries (redistributed)).




More information about the x2go-commits mailing list