x2go-commits March 2013

x2go-commits@lists.x2go.org

2 participants
1021 discussions

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… [View More]

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… [View More]

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… [View More]> 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). [View Less]

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.… [View More]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). [View Less]

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… [View More]> 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). [View Less]

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… [View More]> 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)). [View Less]

1 0

x2goserver.git - build-baikal (branch) updated: 4.0.0.0-8-g6a78a84
by git-admin＠x2go.org 22 Mar '13

22 Mar '13

The branch, build-baikal has been updated via 6a78a843e29b9169ed7e64735908f308eacd4951 (commit) via cbf163e5cc48f8b02caccf6cdc1b5e0c41aa6f01 (commit) via c12aa8e82a53f041c64a8f8de68abba2e1108d35 (commit) via df45ea1b2327e0ec7672234a7370002fc8347529 (commit) via 5a29dae3550069dc53ffb2d12b25bac51e02596d (commit) via a147c0c3885d856a22f0fbba1191223b05564f64 (commit) via 397b7e0a06353a42189269334f0c889212218b9f (commit) via … [View More]

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

x2go-commits March 2013