[X2Go-Commits] nx-libs.git - build-baikal (branch) updated: redist-server/3.5.0.1-1-geac87da

X2Go dev team git-admin at x2go.org
Fri Aug 30 16:24:48 CEST 2013


The branch, build-baikal has been updated
       via  eac87da64af18af989b0a151e8eb773c21dab0f7 (commit)
      from  c84ad97a771dad6e093cfe32f90b31c031bb8b93 (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 -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 debian/bin/nxagent                           |   24 -----------------------
 debian/bin/nxauth                            |   24 -----------------------
 debian/bin/nxproxy                           |   24 -----------------------
 debian/changelog                             |    7 +++++++
 debian/nxagent.install                       |    2 +-
 debian/nxauth.install                        |    2 +-
 debian/nxproxy.install                       |    2 +-
 debian/patches/020_add-nxagent-wrapper.patch |   27 ++++++++++++++++++++++++++
 debian/patches/021_add-nxauth-wrapper.patch  |   27 ++++++++++++++++++++++++++
 debian/patches/022_add-nxproxy-wrapper.patch |   27 ++++++++++++++++++++++++++
 debian/patches/series                        |    3 +++
 11 files changed, 94 insertions(+), 75 deletions(-)
 delete mode 100755 debian/bin/nxagent
 delete mode 100755 debian/bin/nxauth
 delete mode 100755 debian/bin/nxproxy
 create mode 100644 debian/patches/020_add-nxagent-wrapper.patch
 create mode 100644 debian/patches/021_add-nxauth-wrapper.patch
 create mode 100644 debian/patches/022_add-nxproxy-wrapper.patch

The diff of changes is:
diff --git a/debian/bin/nxagent b/debian/bin/nxagent
deleted file mode 100755
index 5bbbcbc..0000000
--- a/debian/bin/nxagent
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/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/nxagent "$@"
diff --git a/debian/bin/nxauth b/debian/bin/nxauth
deleted file mode 100755
index eaa1f84..0000000
--- a/debian/bin/nxauth
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/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/nxauth "$@"
diff --git a/debian/bin/nxproxy b/debian/bin/nxproxy
deleted file mode 100755
index 06765a8..0000000
--- a/debian/bin/nxproxy
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/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/changelog b/debian/changelog
index 3a882cd..488c9f6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+nx-libs (2:3.5.0.2-0) UNRELEASED; urgency=low
+
+  * Re-add binary wrapper scripts to the patch system as we
+    want to provide them in the tarball.
+
+ -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Tue, 10 Jan 2012 14:33:50 +0100
+
 nx-libs (2:3.5.0.1-0) unstable; urgency=low
 
   * Increment version to stay in sync with client-only branch.
diff --git a/debian/nxagent.install b/debian/nxagent.install
index a2d05b3..76b62fc 100644
--- a/debian/nxagent.install
+++ b/debian/nxagent.install
@@ -1,5 +1,5 @@
 nx-X11/programs/Xserver/nxagent                usr/lib/nx
-debian/bin/nxagent                             usr/bin
+bin/nxagent                                    usr/bin
 debian/rgb                                     usr/share/nx
 debian/nxagent.keyboard                        etc/nxagent
 nx-X11/programs/Xserver/hw/nxagent/nxagent.xpm usr/share/pixmaps
\ No newline at end of file
diff --git a/debian/nxauth.install b/debian/nxauth.install
index d5e28ec..52d801c 100644
--- a/debian/nxauth.install
+++ b/debian/nxauth.install
@@ -1,2 +1,2 @@
 nx-X11/programs/nxauth/nxauth                    usr/lib/nx/
-debian/bin/nxauth                                usr/bin
+bin/nxauth                                       usr/bin
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/020_add-nxagent-wrapper.patch b/debian/patches/020_add-nxagent-wrapper.patch
new file mode 100644
index 0000000..93eb92a
--- /dev/null
+++ b/debian/patches/020_add-nxagent-wrapper.patch
@@ -0,0 +1,27 @@
+--- /dev/null
++++ b/bin/nxagent
+@@ -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/nxagent "$@"
diff --git a/debian/patches/021_add-nxauth-wrapper.patch b/debian/patches/021_add-nxauth-wrapper.patch
new file mode 100644
index 0000000..ce51ea8
--- /dev/null
+++ b/debian/patches/021_add-nxauth-wrapper.patch
@@ -0,0 +1,27 @@
+--- /dev/null
++++ b/bin/nxauth
+@@ -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/nxauth "$@"
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 a1b6582..a02a19b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -17,6 +17,9 @@
 017_nx-x11_update-autotools-helper-files.patch
 018_nx-x11_update-libtool-ltmain-script.patch
 019_nx-x11_expat-build-against-system-libxmltok.patch
+020_add-nxagent-wrapper.patch
+021_add-nxauth-wrapper.patch
+022_add-nxproxy-wrapper.patch
 101_nxagent_set-rgb-path.patch
 102_xserver-xext_set-securitypolicy-path.patch
 103_nxagent_set-X0-config-path.patch


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