[X2Go-Commits] nx-libs.git - build-baikal (branch) updated: redist-client/3.5.0.18
X2Go dev team
git-admin at x2go.org
Sat Mar 23 00:49:32 CET 2013
The branch, build-baikal has been updated
via 1b4092e0f1c9760e4d34e9fed7ce3a559c327417 (commit)
via f81df1a69982fb3c4cfe13248dec1b8bc3fb66af (commit)
via 8f151d797b015b7d1070151e75d56587a7f3652f (commit)
via 258902bec76cc4828ab7453df7406957ce93048a (commit)
via d439556ff1b83aecb10991cf0f031fd4da23494e (commit)
via cf521a4b6c4362a7160adbbcc83e3771e671d5d4 (commit)
via c8a5fddf1a45e3f0c3f9047424cc259d515724e2 (commit)
via b121300fde0496d06ce6bb9c58ae85a8e84cd09b (commit)
via 39e84229d6b5c744513fff3f37cd4685ecb4f74b (commit)
from 69c809af9659d1b429d832d05642beb78722f67c (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/Makefile.nx-libs | 26 +++++++-----------
debian/Makefile.replace.sh | 27 ++++++++++++++++++
debian/VERSION.x2goagent | 2 +-
debian/changelog | 26 ++++++++++++++----
.../053_nx-X11_no-xcomp1-install-target.full.patch | 29 ++++++++++++++++++++
debian/patches/series | 1 +
debian/roll-tarballs.sh | 1 +
7 files changed, 90 insertions(+), 22 deletions(-)
create mode 100644 debian/Makefile.replace.sh
create mode 100644 debian/patches/053_nx-X11_no-xcomp1-install-target.full.patch
The diff of changes is:
diff --git a/debian/Makefile.nx-libs b/debian/Makefile.nx-libs
index 5cfc96e..bb49073 100644
--- a/debian/Makefile.nx-libs
+++ b/debian/Makefile.nx-libs
@@ -58,8 +58,6 @@ install-lite:
$(INSTALL_PROGRAM) bin/$$f $(DESTDIR)$(BINDIR); done
for d in nxcomp nxproxy; do \
$(MAKE) -C $$d install; done
- $(INSTALL_DIR) $(DESTDIR)$(NXLIBDIR)/bin
- $(INSTALL_PROGRAM) nxproxy/nxproxy $(DESTDIR)$(NXLIBDIR)/bin
install-full:
for f in nxagent nxauth x2goagent; do \
@@ -68,7 +66,7 @@ install-full:
$(MAKE) -C $$d install; done
$(INSTALL_DIR) $(DESTDIR)$(X2GOLIBDIR)/bin/
- cd $(DESTDIR)$(X2GOLIBDIR)/bin/ && ln -sf ../../nx/bin/nxagent x2goagent
+ cd $(DESTDIR)$(X2GOLIBDIR)/bin/ && ln -sf $(DESTDIR)$(NXLIBDIR)/bin/nxagent x2goagent
$(INSTALL_DIR) $(DESTDIR)$(PREFIX)/share/pixmaps
$(INSTALL_FILE) nx-X11/programs/Xserver/hw/nxagent/x2go.xpm $(DESTDIR)$(PREFIX)/share/pixmaps
@@ -94,28 +92,24 @@ install-full:
# copy headers (for libnx-x11-dev)
cp -aL nx-X11/exports/include/* nx-X11/.build-exports/include
- # copy libs (for libnx-x11)
- find nx-X11/exports/lib/ | egrep "^.*\.so$$" | while read libpath; do \
+ # copy libs (for libnx-x11), we want the targets of the links
+ . replace.sh; set -x; find nx-X11/exports/lib/ | grep -F ".so" | while read libpath; do \
libfile=$$(basename $$libpath); \
libdir=$$(dirname $$libpath); \
+ link=$$(readlink $$libpath); \
\
- mkdir -p $${libdir//exports/.build-exports}; \
- cp -L $$libpath $${libdir//exports/.build-exports}; \
- \
- find $$libdir/$$libfile.* | while read symlink; do \
- ln -s $$libfile $${libdir//exports/.build-exports}/$$(basename $$symlink); \
- done; \
+ mkdir -p "$$(string_rep "$$libdir" exports .build-exports)"; \
+ cp -a "$$(string_rep "$$libpath" "$$libfile" "$$link")" "$$(string_rep "$$libdir" exports .build-exports)"; \
done;
$(INSTALL_DIR) $(DESTDIR)$(NXLIBDIR)/X11
- $(INSTALL_FILE) nx-X11/.build-exports/lib/*.so $(DESTDIR)$(NXLIBDIR)/X11/
- $(COPY_SYMLINK) nx-X11/.build-exports/lib/*.so.* $(DESTDIR)$(NXLIBDIR)/X11/
+ $(COPY_SYMLINK) nx-X11/.build-exports/lib/*.so* $(DESTDIR)$(NXLIBDIR)/X11/
- find nx-X11/.build-exports/include/ -type d | grep -v "include/X11/bitmaps" | \
+ . replace.sh; set -x; find nx-X11/.build-exports/include/ -type d | grep -v "include/X11/bitmaps" | \
while read dirname; do \
- $(INSTALL_DIR) $${dirname//"nx-X11/.build-exports/include"/"$(DESTDIR)$(PREFIX)/include/nx"}; \
+ $(INSTALL_DIR) "$$(string_rep "$$dirname" nx-X11/.build-exports/include "$(DESTDIR)$(PREFIX)/include/nx")"; \
$(INSTALL_FILE) $${dirname}/*.h \
- $${dirname//"nx-X11/.build-exports/include"/"$(DESTDIR)$(PREFIX)/include/nx"}/ || true; \
+ "$$(string_rep "$$dirname" nx-X11/.build-exports/include "$(DESTDIR)$(PREFIX)/include/nx")"/ || true; \
done; \
$(INSTALL_DIR) $(DESTDIR)$(PREFIX)/include/nx/X11/bitmaps
diff --git a/debian/Makefile.replace.sh b/debian/Makefile.replace.sh
new file mode 100644
index 0000000..d47d92b
--- /dev/null
+++ b/debian/Makefile.replace.sh
@@ -0,0 +1,27 @@
+# from http://mywiki.wooledge.org/BashFAQ/021
+
+string_rep()
+{
+ # initialize vars
+ in=$1
+ unset out
+
+ # SEARCH must not be empty
+ test -n "$2" || return
+
+ while true; do
+ # break loop if SEARCH is no longer in "$in"
+ case "$in" in
+ *"$2"*) : ;;
+ *) break;;
+ esac
+
+ # append everything in "$in", up to the first instance of SEARCH, and REP, to "$out"
+ out=$out${in%%"$2"*}$3
+ # remove everything up to and including the first instance of SEARCH from "$in"
+ in=${in#*"$2"}
+ done
+
+ # append whatever is left in "$in" after the last instance of SEARCH to out, and print
+ printf '%s%s\n' "$out" "$in"
+}
diff --git a/debian/VERSION.x2goagent b/debian/VERSION.x2goagent
index 056cec0..ce56e1c 100644
--- a/debian/VERSION.x2goagent
+++ b/debian/VERSION.x2goagent
@@ -1 +1 @@
-3.5.0.17
\ No newline at end of file
+3.5.0.18
diff --git a/debian/changelog b/debian/changelog
index 52627bc..d8f4382 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,21 @@
+nx-libs (2:3.5.0.18-0) unstable; urgency=low
+
+ [ Mike Gabriel ]
+ * Remove duplicate install of nxproxy from main Makefile. Spotted by Jan
+ Engelhard.
+ * Work-in patch from Jan Engehardt for working around different
+ improper bash implementations of string-in-string replacing. (Fixes:
+ #145).
+ * Main Makefile: Use absolute symlink when linking from $(X2GOLIBDIR)
+ into $(NXLIBDIR) (i.e. linking x2goagent -> nxagent). (Fixes: #143).
+
+ [ Orion Poplawski ]
+ * Fix wrong symlink direction of libNX_* files. (Fixes: #107).
+ * Avoid building of libxcomp1 (which actually is identical to libxcomp3,
+ just with a wrong name). (Fixes: #104).
+
+ -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de> Fri, 22 Mar 2013 23:39:39 +0100
+
nx-libs (2:3.5.0.17-0) unstable; urgency=low
[ Jan Engelhardt ]
@@ -6,7 +24,7 @@ nx-libs (2:3.5.0.17-0) unstable; urgency=low
[ Alexander Wuerstlein ]
* Add patch: 302_nxagent_configurable-keystrokes.full.patch, replaces the
hardcoded nxagent keybindings by a configurable table of keybindings.
- (Closes upstream issue: #74).
+ (Fixes: #74).
* Follow-up commit for 302_nxagent_configurable-keystrokes.full.patch, fixes
FTBFS problem with the first version of that patch.
@@ -19,8 +37,7 @@ nx-libs (2:3.5.0.17-0) unstable; urgency=low
value of CONFIGURE variable traversable through the Makefile tree.
[ Orion Poplawski ]
- * Add patches: 026_nxcomp*_honour-optflags.full*.patch. (Closes upstream
- issue #84).
+ * Add patches: 026_nxcomp*_honour-optflags.full*.patch. (Fixes: #84).
[ Reinhard Tartler ]
* Install debug symbols for all packages in a new binary package
@@ -94,8 +111,7 @@ nx-libs (2:3.5.0.15-0) unstable; urgency=low
[ Oleksandr Shneyder ]
* Add patch: 204-nxagent_repaint-solidpict.full.patch. Fixes repainting of
- SolidFill pictures by nxagent/x2goagent on reconnects. Closes upstream
- issue #16.
+ SolidFill pictures by nxagent/x2goagent on reconnects. (Fixes: #16).
-- Mike Gabriel <mike.gabriel at das-netzwerkteam.de> Fri, 21 Sep 2012 10:02:16 +0200
diff --git a/debian/patches/053_nx-X11_no-xcomp1-install-target.full.patch b/debian/patches/053_nx-X11_no-xcomp1-install-target.full.patch
new file mode 100644
index 0000000..eca4200
--- /dev/null
+++ b/debian/patches/053_nx-X11_no-xcomp1-install-target.full.patch
@@ -0,0 +1,29 @@
+--- a/nx-X11/lib/X11/Imakefile 2013-01-04 05:25:49.000000000 -0700
++++ b/nx-X11/lib/X11/Imakefile 2013-01-15 15:26:07.969167259 -0700
+@@ -63,7 +63,6 @@ NX_XCOMPLIBDIR = $(XTOP)/../nxcomp
+ 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 = $(XTOP)/../nxcompext
+@@ -1181,17 +1180,9 @@ lib$(LIBNAME).so.$(SOXLIBREV): $(NX_XCOM
+
+ all:: $(NX_XCOMPLIBTARGET)
+
+-$(NX_XCOMPDEPTARGET):
+- ln -s $(NX_XCOMPLIBDIR)/$(NX_XCOMPLIBNAME) $(BUILDLIBDIR)/$(NX_XCOMPLIBNAME)
+- ln -s $(NX_XCOMPLIBDIR)/$(NX_XCOMPLIBNAME).1 $(BUILDLIBDIR)/$(NX_XCOMPLIBNAME).1
+-
+ depend:: $(NX_XCOMPLIBTARGET)
+
+-all:: $(NX_XCOMPDEPTARGET) $(NX_XCOMPEXTLIBTARGET)
+-
+-clean::
+- rm -f $(BUILDLIBDIR)/$(NX_XCOMPLIBNAME)
+- rm -f $(BUILDLIBDIR)/$(NX_XCOMPLIBNAME).1
++all:: $(NX_XCOMPEXTLIBTARGET)
+
+ #endif
+
diff --git a/debian/patches/series b/debian/patches/series
index 5099b99..82977ef 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -26,6 +26,7 @@
031_nx-X11_parallel-make.full.patch
051_nxcomp_macos105-fdisset.full+lite.patch
052_nxcomp_macos10-nxauth-location.full+lite.patch
+053_nx-X11_no-xcomp1-install-target.full.patch
101_nxagent_set-rgb-path.full.patch
102_xserver-xext_set-securitypolicy-path.full.patch
103_nxagent_set-X0-config-path.full.patch
diff --git a/debian/roll-tarballs.sh b/debian/roll-tarballs.sh
index b43de4b..57b3aad 100755
--- a/debian/roll-tarballs.sh
+++ b/debian/roll-tarballs.sh
@@ -120,6 +120,7 @@ mv -v debian/changelog doc/changelog
# copy the top-level makefile if no quilt patch created it before
test -f Makefile || test -f debian/Makefile.nx-libs && cp -v debian/Makefile.nx-libs Makefile
+test -f replace.sh || test -f debian/Makefile.replace.sh && cp -v debian/Makefile.replace.sh replace.sh
# remove folders that we do not want to roll into the tarball
rm -Rf ".pc/"
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