x2go-commits

x2go-commits@lists.x2go.org

1 participants
37910 discussions

nx-libs.git - build-main (branch) updated: redist-client/3.5.0.18
by git-admin＠x2go.org 22 Mar '13

22 Mar '13

The branch, build-main 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(a)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(a)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)).

1 0

nx-libs.git - master (branch) updated: redist-server/3.5.0.17-9-g1b4092e
by git-admin＠x2go.org 22 Mar '13

22 Mar '13

The branch, master has been updated via 1b4092e0f1c9760e4d34e9fed7ce3a559c327417 (commit) from f81df1a69982fb3c4cfe13248dec1b8bc3fb66af (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 1b4092e0f1c9760e4d34e9fed7ce3a559c327417 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Mar 22 23:40:44 2013 +0100 release 3.5.0.18 ----------------------------------------------------------------------- Summary of changes: debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index bd680a1..d8f4382 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -nx-libs (2:3.5.0.18-0) UNRELEASED; urgency=low +nx-libs (2:3.5.0.18-0) unstable; urgency=low [ Mike Gabriel ] * Remove duplicate install of nxproxy from main Makefile. Spotted by Jan @@ -14,7 +14,7 @@ nx-libs (2:3.5.0.18-0) UNRELEASED; urgency=low * Avoid building of libxcomp1 (which actually is identical to libxcomp3, just with a wrong name). (Fixes: #104). - -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Fri, 04 Jan 2013 13:27:05 +0100 + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Fri, 22 Mar 2013 23:39:39 +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)).

1 0

nx-libs.git - master (branch) updated: redist-server/3.5.0.17-8-gf81df1a
by git-admin＠x2go.org 22 Mar '13

22 Mar '13

The branch, master has been updated via f81df1a69982fb3c4cfe13248dec1b8bc3fb66af (commit) from 8f151d797b015b7d1070151e75d56587a7f3652f (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 f81df1a69982fb3c4cfe13248dec1b8bc3fb66af Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Mar 22 23:35:40 2013 +0100 Main Makefile: Use absolute symlink when linking from $(X2GOLIBDIR) into $(NXLIBDIR) (i.e. linking x2goagent -> nxagent). (Fixes: #143). ----------------------------------------------------------------------- Summary of changes: debian/Makefile.nx-libs | 2 +- debian/changelog | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) The diff of changes is: diff --git a/debian/Makefile.nx-libs b/debian/Makefile.nx-libs index beb522c..bb49073 100644 --- a/debian/Makefile.nx-libs +++ b/debian/Makefile.nx-libs @@ -66,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 diff --git a/debian/changelog b/debian/changelog index 824d746..bd680a1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,8 @@ nx-libs (2:3.5.0.18-0) UNRELEASED; urgency=low * 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). 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)).

1 0

x2goclient.git - build-main (branch) created: 4.0.1.0
by git-admin＠x2go.org 22 Mar '13

22 Mar '13

The branch, build-main has been created at 1b4260f86a6fda01c5263fa3d27504677a3cdfac (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- hooks/post-receive -- x2goclient.git (X2Go Client) 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 "x2goclient.git" (X2Go Client).

1 0

x2goclient.git - build-baikal (branch) created: 4.0.0.4
by git-admin＠x2go.org 22 Mar '13

22 Mar '13

The branch, build-baikal has been created at c0af7a62a5a4aa6d8e63be45a0f3ba03e474f697 (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- hooks/post-receive -- x2goclient.git (X2Go Client) 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 "x2goclient.git" (X2Go Client).

1 0

x2goclient.git - master (branch) updated: 4.0.1.0-1-g085568a
by git-admin＠x2go.org 22 Mar '13

22 Mar '13

The branch, master has been updated via 085568ae95cb3eaa5e9ec26723edb800eb4f132e (commit) from 1b4260f86a6fda01c5263fa3d27504677a3cdfac (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 085568ae95cb3eaa5e9ec26723edb800eb4f132e Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Mar 22 23:22:17 2013 +0100 Continue development... ----------------------------------------------------------------------- Summary of changes: VERSION | 2 +- debian/changelog | 6 ++++++ version.h | 2 +- x2goplugin.rc | 10 +++++----- 4 files changed, 13 insertions(+), 7 deletions(-) The diff of changes is: diff --git a/VERSION b/VERSION index a7393ba..9830921 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -4.0.1.0 +4.0.1.1 diff --git a/debian/changelog b/debian/changelog index f3acdd3..4b82401 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +x2goclient (4.0.1.1-0~x2go1) UNRELEASED; urgency=low + + * Continue development... + + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Fri, 22 Mar 2013 23:21:11 +0100 + x2goclient (4.0.1.0-0~x2go1) unstable; urgency=low [ Frédéric Motte ] diff --git a/version.h b/version.h index 269a15d..77cc6c7 100644 --- a/version.h +++ b/version.h @@ -15,5 +15,5 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * ***************************************************************************/ -#define VERSION "4.0.1.0" +#define VERSION "4.0.1.1" diff --git a/x2goplugin.rc b/x2goplugin.rc index 1f830fc..d9831d9 100644 --- a/x2goplugin.rc +++ b/x2goplugin.rc @@ -1,8 +1,8 @@ 1 TYPELIB "x2goplugin.rc" 1 VERSIONINFO - FILEVERSION 4,0,1,0 - PRODUCTVERSION 4,0,1,0 + FILEVERSION 4,0,1,1 + PRODUCTVERSION 4,0,1,1 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -21,13 +21,13 @@ BEGIN VALUE "FileDescription", "Allows you to start X2Go session in a webbrowser\0" VALUE "FileExtents", "x2go\0" VALUE "FileOpenName", "Configuration File for X2Go Session (*.x2go)\0" - VALUE "FileVersion", "4, 0, 1 ,0\0" + VALUE "FileVersion", "4, 0, 1 ,1\0" VALUE "InternalName", "x2goplugin\0" VALUE "LegalCopyright", "Copyright � 2010-2013 Obviously Nice\0" VALUE "MIMEType", "application/x2go\0" VALUE "OriginalFilename", "npx2goplugin.dll\0" - VALUE "ProductName", "X2GoClient Plug-in 4.0.1.0\0" - VALUE "ProductVersion", "4, 0, 1, 0\0" + VALUE "ProductName", "X2GoClient Plug-in 4.0.1.1\0" + VALUE "ProductVersion", "4, 0, 1, 1\0" END END BLOCK "VarFileInfo" hooks/post-receive -- x2goclient.git (X2Go Client) 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 "x2goclient.git" (X2Go Client).

1 0

x2goclient.git - build-main (branch) updated: 4.0.1.0-1-g64b51fc
by git-admin＠x2go.org 22 Mar '13

22 Mar '13

The branch, build-main has been updated via 64b51fce59f9831c7dff7fdcbf951dd751a5c872 (commit) from 1b4260f86a6fda01c5263fa3d27504677a3cdfac (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 64b51fce59f9831c7dff7fdcbf951dd751a5c872 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Mar 22 23:22:17 2013 +0100 Continue development... ----------------------------------------------------------------------- Summary of changes: VERSION | 2 +- debian/changelog | 6 ++++++ version.h | 2 +- x2goplugin.rc | 10 +++++----- 4 files changed, 13 insertions(+), 7 deletions(-) The diff of changes is: diff --git a/VERSION b/VERSION index a7393ba..9830921 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -4.0.1.0 +4.0.1.1 diff --git a/debian/changelog b/debian/changelog index f3acdd3..4b82401 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +x2goclient (4.0.1.1-0~x2go1) UNRELEASED; urgency=low + + * Continue development... + + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Fri, 22 Mar 2013 23:21:11 +0100 + x2goclient (4.0.1.0-0~x2go1) unstable; urgency=low [ Frédéric Motte ] diff --git a/version.h b/version.h index 269a15d..77cc6c7 100644 --- a/version.h +++ b/version.h @@ -15,5 +15,5 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * ***************************************************************************/ -#define VERSION "4.0.1.0" +#define VERSION "4.0.1.1" diff --git a/x2goplugin.rc b/x2goplugin.rc index 1f830fc..d9831d9 100644 --- a/x2goplugin.rc +++ b/x2goplugin.rc @@ -1,8 +1,8 @@ 1 TYPELIB "x2goplugin.rc" 1 VERSIONINFO - FILEVERSION 4,0,1,0 - PRODUCTVERSION 4,0,1,0 + FILEVERSION 4,0,1,1 + PRODUCTVERSION 4,0,1,1 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -21,13 +21,13 @@ BEGIN VALUE "FileDescription", "Allows you to start X2Go session in a webbrowser\0" VALUE "FileExtents", "x2go\0" VALUE "FileOpenName", "Configuration File for X2Go Session (*.x2go)\0" - VALUE "FileVersion", "4, 0, 1 ,0\0" + VALUE "FileVersion", "4, 0, 1 ,1\0" VALUE "InternalName", "x2goplugin\0" VALUE "LegalCopyright", "Copyright � 2010-2013 Obviously Nice\0" VALUE "MIMEType", "application/x2go\0" VALUE "OriginalFilename", "npx2goplugin.dll\0" - VALUE "ProductName", "X2GoClient Plug-in 4.0.1.0\0" - VALUE "ProductVersion", "4, 0, 1, 0\0" + VALUE "ProductName", "X2GoClient Plug-in 4.0.1.1\0" + VALUE "ProductVersion", "4, 0, 1, 1\0" END END BLOCK "VarFileInfo" hooks/post-receive -- x2goclient.git (X2Go Client) 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 "x2goclient.git" (X2Go Client).

1 0

x2goclient.git - build-main (branch) created: 4.0.1.0
by git-admin＠x2go.org 22 Mar '13

22 Mar '13

1 0

x2goclient.git - master (branch) updated: 4.0.0.0-31-g1b4260f
by git-admin＠x2go.org 22 Mar '13

22 Mar '13

The branch, master has been updated via 1b4260f86a6fda01c5263fa3d27504677a3cdfac (commit) from 2849d5c6d15a0ce84035cc7b7290ed6411339214 (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 1b4260f86a6fda01c5263fa3d27504677a3cdfac Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Mar 22 23:16:43 2013 +0100 release 4.0.1.0 ----------------------------------------------------------------------- Summary of changes: debian/changelog | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index b6ea983..f3acdd3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -x2goclient (4.0.1.0-0~x2go1) UNRELEASED; urgency=low +x2goclient (4.0.1.0-0~x2go1) unstable; urgency=low [ Frédéric Motte ] * New upstream version (4.0.1.0): @@ -7,19 +7,19 @@ x2goclient (4.0.1.0-0~x2go1) UNRELEASED; urgency=low [ Oleksandr Shneyder ] * New upstream version (4.0.1.0): - Launching parec to init pulseaudio input only on Windows. - - Hide profilecard area on broker authentication - - fix ONMainWindow layout in broker mode - - set passphrase for key to reverse ssh connection - fix closing client after getting passphrase (Fixes #137) - - support for recent cygwin API on Windows - - add checkbox for -noclipboardprimary argument for internal vcxsrv + - Hide profilecard area on broker authentication. + - Fix ONMainWindow layout in broker mode. + - Set passphrase for key to reverse SSH connection. + Fix closing client after getting passphrase (Fixes #137) + - Support for recent cygwin API on Windows. + - Add checkbox for -noclipboardprimary argument for internal vcxsrv. [ Mike Gabriel ] * New upstream version (4.0.1.0): - Fix position shifts of broker login widget on repetetive authentication failures. (Fixes: #71). - -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Sun, 30 Dec 2012 15:41:04 +0100 + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Fri, 22 Mar 2013 23:15:45 +0100 x2goclient (4.0.0.4-0~x2go1) unstable; urgency=low hooks/post-receive -- x2goclient.git (X2Go Client) 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 "x2goclient.git" (X2Go Client).

1 0

nx-libs.git - master (branch) updated: redist-server/3.5.0.17-7-g8f151d7
by git-admin＠x2go.org 22 Mar '13

22 Mar '13

The branch, master has been updated via 8f151d797b015b7d1070151e75d56587a7f3652f (commit) from 258902bec76cc4828ab7453df7406957ce93048a (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 8f151d797b015b7d1070151e75d56587a7f3652f Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Mar 22 22:33:40 2013 +0100 Work-in patch from Jan Engehardt for working around different improper bash implementations of string-in-string replacing. (Fixes: #145). ----------------------------------------------------------------------- Summary of changes: debian/Makefile.nx-libs | 12 ++++++------ debian/Makefile.replace.sh | 27 +++++++++++++++++++++++++++ debian/changelog | 3 +++ debian/roll-tarballs.sh | 1 + 4 files changed, 37 insertions(+), 6 deletions(-) create mode 100644 debian/Makefile.replace.sh The diff of changes is: diff --git a/debian/Makefile.nx-libs b/debian/Makefile.nx-libs index 74f0d3a..beb522c 100644 --- a/debian/Makefile.nx-libs +++ b/debian/Makefile.nx-libs @@ -93,23 +93,23 @@ install-full: cp -aL nx-X11/exports/include/* nx-X11/.build-exports/include # copy libs (for libnx-x11), we want the targets of the links - find nx-X11/exports/lib/ | grep -F ".so" | while read libpath; do \ + . 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 -a $${libpath/$$libfile/$$link} $${libdir//exports/.build-exports}; \ + 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 $(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/changelog b/debian/changelog index 7260164..824d746 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,9 @@ 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. + * Work-in patch from Jan Engehardt for working around different + improper bash implementations of string-in-string replacing. (Fixes: + #145). [ Orion Poplawski ] * Fix wrong symlink direction of libNX_* files. (Fixes: #107). 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)).

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

x2go-commits