[X2Go-Commits] nx-libs.git - build-baikal (branch) updated: redist-server/3.5.0.17-5-gd439556
X2Go dev team
git-admin at x2go.org
Fri Aug 30 16:25:45 CEST 2013
The branch, build-baikal has been updated
via d439556ff1b83aecb10991cf0f031fd4da23494e (commit)
from cf521a4b6c4362a7160adbbcc83e3771e671d5d4 (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 | 14 +++++---------
debian/changelog | 4 ++++
2 files changed, 9 insertions(+), 9 deletions(-)
The diff of changes is:
diff --git a/debian/Makefile.nx-libs b/debian/Makefile.nx-libs
index 93c7627..74f0d3a 100644
--- a/debian/Makefile.nx-libs
+++ b/debian/Makefile.nx-libs
@@ -92,22 +92,18 @@ 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
+ 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; \
+ cp -a $${libpath/$$libfile/$$link} $${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" | \
while read dirname; do \
diff --git a/debian/changelog b/debian/changelog
index b7f95fe..e437dc2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,12 @@
nx-libs (2:3.5.0.18-0) UNRELEASED; urgency=low
+ [ Mike Gabriel ]
* Remove duplicate install of nxproxy from main Makefile. Spotted by Jan
Engelhard.
+ [ Orion Poplawski ]
+ * Fix wrong symlink direction of libNX_* files. (Fixes: #107).
+
-- Mike Gabriel <mike.gabriel at das-netzwerkteam.de> Fri, 04 Jan 2013 13:27:05 +0100
nx-libs (2:3.5.0.17-0) unstable; urgency=low
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