x2go-commits February 2012

x2go-commits@lists.x2go.org

1 participants
198 discussions

x2gothinclient.git - master (branch) updated: 1.0.1.5-10-gcbd8454
by git-admin＠x2go.org 23 Feb '12

23 Feb '12

The branch, master has been updated via cbd84540554db2861d2fd431d12e1ca7754c9fe2 (commit) from 696eb25fbf77be21c7ea533f5558e65d56987d65 (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 cbd84540554db2861d2fd431d12e1ca7754c9fe2 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Feb 23 19:00:26 2012 +0100 Revert "Not mounting /dev/pts by default." This reverts commit b3183e568be6d346452c6727b4798812e6646f4a. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 - .../sbin/x2gothinclient_create | 2 +- 2 files changed, 1 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 609b7d1..37f7dbb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,6 @@ x2gothinclient (1.0.1.6-0~x2go1) UNRELEASED; urgency=low * New upstream version (1.0.1.6): - - Not mounting /dev/pts by default. - Add background image support. - Add new boot splash background image. - New look'n'feel for boot splash menu. diff --git a/x2gothinclientmanagement/sbin/x2gothinclient_create b/x2gothinclientmanagement/sbin/x2gothinclient_create index 20baebd..a14ae17 100755 --- a/x2gothinclientmanagement/sbin/x2gothinclient_create +++ b/x2gothinclientmanagement/sbin/x2gothinclient_create @@ -81,7 +81,7 @@ echo "x2gothinclient" > $TC_CHROOT/etc/hostname echo "127.0.0.1 localhost" >> $TC_CHROOT/etc/hosts cat > $TC_CHROOT/etc/fstab <<EOF #proc /proc proc defaults 0 0 -#none /dev/pts devpts gid=5,mode=620 0 0 +none /dev/pts devpts gid=5,mode=620 0 0 none /tmp tmpfs size=50M,mode=1777 0 0 none /root tmpfs size=100M,mode=700 0 0 none /etc/udev/rules.d tmpfs size=50M 0 0 hooks/post-receive -- x2gothinclient.git (X2Go Thin Client Environment) 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 "x2gothinclient.git" (X2Go Thin Client Environment).

1 0

x2gothinclient.git - master (branch) updated: 1.0.1.5-9-g696eb25
by git-admin＠x2go.org 23 Feb '12

23 Feb '12

The branch, master has been updated via 696eb25fbf77be21c7ea533f5558e65d56987d65 (commit) from 4eecd1c05c8383bcbe42627aedf1221f8d319fcc (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 696eb25fbf77be21c7ea533f5558e65d56987d65 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Feb 23 17:59:25 2012 +0100 install x2goclient-background.svg into Debian package ----------------------------------------------------------------------- Summary of changes: debian/x2gothinclientmanagement.install | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) The diff of changes is: diff --git a/debian/x2gothinclientmanagement.install b/debian/x2gothinclientmanagement.install index 8b44295..98eca2a 100644 --- a/debian/x2gothinclientmanagement.install +++ b/debian/x2gothinclientmanagement.install @@ -1,4 +1,5 @@ x2gothinclientmanagement/sbin/x2gothinclient_* usr/sbin/ x2gothinclientmanagement/etc/x2gothinclient_* etc/x2go/ x2gothinclientmanagement/share/x2gothinclient_* usr/share/x2go/tce/ +x2gothinclientmanagement/share/x2goclient-background.svg usr/share/x2go/tce/ x2gothinclientmanagement/share/tftpboot usr/share/x2go/tce/ hooks/post-receive -- x2gothinclient.git (X2Go Thin Client Environment) 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 "x2gothinclient.git" (X2Go Thin Client Environment).

1 0

x2gothinclient.git - master (branch) updated: 1.0.1.5-8-g4eecd1c
by git-admin＠x2go.org 23 Feb '12

23 Feb '12

The branch, master has been updated via 4eecd1c05c8383bcbe42627aedf1221f8d319fcc (commit) via 60ae7466f84477e3459fa12ef195f3b14005a3e4 (commit) from e050d7bd54f124e913d0ecf1658ec1a96d0f9fcb (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 4eecd1c05c8383bcbe42627aedf1221f8d319fcc Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Feb 23 17:25:12 2012 +0100 whitespace fix commit 60ae7466f84477e3459fa12ef195f3b14005a3e4 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Feb 23 17:24:28 2012 +0100 New look'n'feel for boot splash menu. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + .../share/tftpboot/default.cfg | 26 ++++++++++++++++---- 2 files changed, 22 insertions(+), 5 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index d967c26..609b7d1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,7 @@ x2gothinclient (1.0.1.6-0~x2go1) UNRELEASED; urgency=low - Not mounting /dev/pts by default. - Add background image support. - Add new boot splash background image. + - New look'n'feel for boot splash menu. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 01 Feb 2012 13:51:00 +0100 diff --git a/x2gothinclientmanagement/share/tftpboot/default.cfg b/x2gothinclientmanagement/share/tftpboot/default.cfg index 33bac2b..49a25de 100644 --- a/x2gothinclientmanagement/share/tftpboot/default.cfg +++ b/x2gothinclientmanagement/share/tftpboot/default.cfg @@ -13,18 +13,34 @@ MENU SEPARATOR include memtest.cfg # menu settings -MENU VSHIFT 12 -MENU WIDTH 80 +MENU VSHIFT 3 +MENU HSHIFT 18 +MENU WIDTH 60 MENU MARGIN 10 MENU ROWS 12 MENU TABMSGROW 13 -MENU CMDLINEROW 14 +MENU CMDLINEROW 23 MENU ENDROW 12 -MENU TIMEOUTROW 15 +MENU TIMEOUTROW 18 + +MENU COLOR border 30;44 #40ffffff #a0000000 std +MENU COLOR title 1;36;44 #9033ccff #a0000000 std +MENU COLOR sel 7;37;40 #e0000000 #20ffffff all +MENU COLOR unsel 37;44 #50ffffff #a0000000 std +MENU COLOR help 37;40 #c0ffffff #a0000000 std +MENU COLOR timeout_msg 37;40 #80ffffff #00000000 std +MENU COLOR timeout 1;37;40 #c0ffffff #00000000 std +MENU COLOR msg07 37;40 #90ffffff #a0000000 std +MENU COLOR tabmsg 37;40 #e0ffffff #a0000000 std +MENU COLOR disabled 37;44 #50ffffff #a0000000 std +MENU COLOR hotkey 1;30;47 #ffff0000 #a0000000 std +MENU COLOR hotsel 1;7;30;47 #ffff0000 #20ffffff all +MENU COLOR scrollbar 30;47 #ffff0000 #00000000 std +MENU COLOR cmdmark 1;36;47 #e0ff0000 #00000000 std +MENU COLOR cmdline 30;47 #ff000000 #00000000 none # possible boot profiles for ONTIMEOUT: # localboot, x2go-tce-686, x2go-tce-486 # (... or any other profile you defined in your customized menu) ONTIMEOUT localboot TIMEOUT 100 - hooks/post-receive -- x2gothinclient.git (X2Go Thin Client Environment) 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 "x2gothinclient.git" (X2Go Thin Client Environment).

1 0

x2gothinclient.git - master (branch) updated: 1.0.1.5-6-ge050d7b
by git-admin＠x2go.org 23 Feb '12

23 Feb '12

The branch, master has been updated via e050d7bd54f124e913d0ecf1658ec1a96d0f9fcb (commit) from 79675568402ebb0f7e908698a876adb955e34522 (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 e050d7bd54f124e913d0ecf1658ec1a96d0f9fcb Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Feb 23 17:20:37 2012 +0100 add logos to x2go-splash.png ----------------------------------------------------------------------- Summary of changes: .../share/tftpboot/x2go-splash.png | Bin 11047 -> 18746 bytes 1 files changed, 0 insertions(+), 0 deletions(-) The diff of changes is: diff --git a/x2gothinclientmanagement/share/tftpboot/x2go-splash.png b/x2gothinclientmanagement/share/tftpboot/x2go-splash.png index fec1e25..159ecff 100644 Binary files a/x2gothinclientmanagement/share/tftpboot/x2go-splash.png and b/x2gothinclientmanagement/share/tftpboot/x2go-splash.png differ hooks/post-receive -- x2gothinclient.git (X2Go Thin Client Environment) 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 "x2gothinclient.git" (X2Go Thin Client Environment).

1 0

x2gothinclient.git - master (branch) updated: 1.0.1.5-5-g7967556
by git-admin＠x2go.org 23 Feb '12

23 Feb '12

The branch, master has been updated via 79675568402ebb0f7e908698a876adb955e34522 (commit) from d219b0c2ad609b13c204ad8fe5ebc436f9f9fab3 (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 79675568402ebb0f7e908698a876adb955e34522 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Feb 23 17:08:43 2012 +0100 Add new boot splash background image. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + .../{x2go-splash.png => x2go-simple-splash.png} | Bin 4314 -> 4314 bytes .../share/tftpboot/x2go-splash.png | Bin 4314 -> 11047 bytes 3 files changed, 1 insertions(+), 0 deletions(-) copy x2gothinclientmanagement/share/tftpboot/{x2go-splash.png => x2go-simple-splash.png} (100%) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index c5e0014..d967c26 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ x2gothinclient (1.0.1.6-0~x2go1) UNRELEASED; urgency=low * New upstream version (1.0.1.6): - Not mounting /dev/pts by default. - Add background image support. + - Add new boot splash background image. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 01 Feb 2012 13:51:00 +0100 diff --git a/x2gothinclientmanagement/share/tftpboot/x2go-splash.png b/x2gothinclientmanagement/share/tftpboot/x2go-splash.png index 0886917..fec1e25 100644 Binary files a/x2gothinclientmanagement/share/tftpboot/x2go-splash.png and b/x2gothinclientmanagement/share/tftpboot/x2go-splash.png differ hooks/post-receive -- x2gothinclient.git (X2Go Thin Client Environment) 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 "x2gothinclient.git" (X2Go Thin Client Environment).

1 0

x2gothinclient.git - master (branch) updated: 1.0.1.5-4-gd219b0c
by git-admin＠x2go.org 23 Feb '12

23 Feb '12

The branch, master has been updated via d219b0c2ad609b13c204ad8fe5ebc436f9f9fab3 (commit) from 80cc30a96a18f076d23eb6dc8a185ca34db80653 (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 d219b0c2ad609b13c204ad8fe5ebc436f9f9fab3 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Feb 23 16:31:30 2012 +0100 Add background image support. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + .../sbin/x2gothinclient_create | 1 + .../sbin/x2gothinclient_update | 23 ++- .../share/x2goclient-background.svg | 158 ++++++++++++++++++++ .../share/x2gothinclient_start | 1 + 5 files changed, 178 insertions(+), 6 deletions(-) create mode 100644 x2gothinclientmanagement/share/x2goclient-background.svg The diff of changes is: diff --git a/debian/changelog b/debian/changelog index c1e4b66..c5e0014 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ x2gothinclient (1.0.1.6-0~x2go1) UNRELEASED; urgency=low * New upstream version (1.0.1.6): - Not mounting /dev/pts by default. + - Add background image support. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 01 Feb 2012 13:51:00 +0100 diff --git a/x2gothinclientmanagement/sbin/x2gothinclient_create b/x2gothinclientmanagement/sbin/x2gothinclient_create index 751a1f6..20baebd 100755 --- a/x2gothinclientmanagement/sbin/x2gothinclient_create +++ b/x2gothinclientmanagement/sbin/x2gothinclient_create @@ -63,6 +63,7 @@ mkdir -p $TC_CONFIG test -f $TC_CONFIG/x2gothinclient_init || cp $SHAREDIR/x2gothinclient_init $TC_CONFIG test -f $TC_CONFIG/x2gothinclient_start || cp $SHAREDIR/x2gothinclient_start $TC_CONFIG test -f $TC_CONFIG/x2gothinclient_sessions || cp $SHAREDIR/x2gothinclient_sessions $TC_CONFIG +test -f $TC_CONFIG/x2goclient-background.svg || cp $SHAREDIR/x2goclient-background.svg $TC_CONFIG apt-get install debootstrap mkdir -p $TC_CHROOT diff --git a/x2gothinclientmanagement/sbin/x2gothinclient_update b/x2gothinclientmanagement/sbin/x2gothinclient_update index 4a83145..4df9ff3 100755 --- a/x2gothinclientmanagement/sbin/x2gothinclient_update +++ b/x2gothinclientmanagement/sbin/x2gothinclient_update @@ -57,14 +57,25 @@ mkdir -p "$TC_CHROOT/etc/x2go" echo "Installing X2Go TCE configuration into chroot environment..." echo "------------------------------------------------------------" -cp -v "$TC_CONFIG/x2gothinclient_init" "$TC_CHROOT/etc/x2go/x2gothinclient_init" -chmod a+rx $TC_CHROOT/etc/x2go/x2gothinclient_init +if test -f $TC_CONFIG/x2gothinclient_init; then + cp -v "$TC_CONFIG/x2gothinclient_init" "$TC_CHROOT/etc/x2go/x2gothinclient_init" + chmod a+rx $TC_CHROOT/etc/x2go/x2gothinclient_init +fi -cp -v "$TC_CONFIG/x2gothinclient_start" "$TC_CHROOT/etc/x2go/x2gothinclient_start" -chmod a+rx "$TC_CHROOT/etc/x2go/x2gothinclient_start" +if test -f $TC_CONFIG/x2gothinclient_start; then + cp -v "$TC_CONFIG/x2gothinclient_start" "$TC_CHROOT/etc/x2go/x2gothinclient_start" + chmod a+rx "$TC_CHROOT/etc/x2go/x2gothinclient_start" +fi -cp -v "$TC_CONFIG/x2gothinclient_sessions" "$TC_CHROOT/etc/x2go/x2gothinclient_sessions" -chmod a+rx "$TC_CHROOT/etc/x2go/x2gothinclient_sessions" +if test -f $TC_CONFIG/x2gothinclient_sessions; then + cp -v "$TC_CONFIG/x2gothinclient_sessions" "$TC_CHROOT/etc/x2go/x2gothinclient_sessions" + chmod a+rx "$TC_CHROOT/etc/x2go/x2gothinclient_sessions" +fi + +if test -f $TC_CONFIG/x2goclient-background.svg; then + cp -v "$TC_CONFIG/x2goclient-background.svg" "$TC_CHROOT/etc/x2go/x2goclient-background.svg" + chmod a+rx $TC_CHROOT/etc/x2go/x2goclient-background.svg +fi echo diff --git a/x2gothinclientmanagement/share/x2goclient-background.svg b/x2gothinclientmanagement/share/x2goclient-background.svg new file mode 100644 index 0000000..e3c6580 --- /dev/null +++ b/x2gothinclientmanagement/share/x2goclient-background.svg @@ -0,0 +1,158 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> + + +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + version="1.0" + width="361.04999" + height="271.92001" + viewBox="0 0 361.244 270.933" + id="svg2" + xml:space="preserve" + inkscape:version="0.47 r22583" + sodipodi:docname="bg-anim.svg"><metadata + id="metadata30"><rdf:RDF><cc:Work + rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><sodipodi:namedview + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1" + objecttolerance="10" + gridtolerance="10" + guidetolerance="10" + inkscape:pageopacity="0" + inkscape:pageshadow="2" + inkscape:window-width="1598" + inkscape:window-height="879" + id="namedview28" + showgrid="false" + inkscape:zoom="2" + inkscape:cx="132.20018" + inkscape:cy="132.38275" + inkscape:window-x="0" + inkscape:window-y="19" + inkscape:window-maximized="1" + inkscape:current-layer="svg2" /> + <defs + id="defs4"><inkscape:perspective + sodipodi:type="inkscape:persp3d" + inkscape:vp_x="0 : 135.96001 : 1" + inkscape:vp_y="0 : 1000 : 0" + inkscape:vp_z="361.04999 : 135.96001 : 1" + inkscape:persp3d-origin="180.52499 : 90.640004 : 1" + id="perspective32" /><linearGradient + id="linearGradient2802"><stop + style="stop-color:#ffffff;stop-opacity:1" + offset="0" + id="stop2804" /><stop + style="stop-color:#ffffff;stop-opacity:0" + offset="1" + id="stop2806" /></linearGradient><linearGradient + id="linearGradient2852"><stop + style="stop-color:#ffffff;stop-opacity:1" + offset="0" + id="stop2854" /><stop + style="stop-color:#6699ff;stop-opacity:0" + offset="1" + id="stop2856" /></linearGradient><linearGradient + id="linearGradient2844"><stop + style="stop-color:#deeaed;stop-opacity:1" + offset="0" + id="stop2846" /><stop + style="stop-color:#ffffff;stop-opacity:1" + offset="1" + id="stop2848" /></linearGradient><linearGradient + id="linearGradient1948"><stop + style="stop-color:#b2856b;stop-opacity:0.4235808;" + offset="0" + id="stop1950" /><stop + style="stop-color:#6699ff;stop-opacity:0" + offset="1" + id="stop1952" /></linearGradient> + <style + type="text/css" + id="style6" /> + <linearGradient + x1="202.494" + y1="135.464" + x2="207.00999" + y2="135.464" + id="id0" + gradientUnits="userSpaceOnUse"> + <stop + style="stop-color:#000000;stop-opacity:1" + offset="0" + id="stop9" /> + <stop + style="stop-color:#6e707f;stop-opacity:1" + offset="1" + id="stop11" /> + </linearGradient> + + + + + + + + + + <linearGradient + x1="202.494" + y1="135.464" + x2="207.00999" + y2="135.464" + id="linearGradient1942" + xlink:href="#id0" + gradientUnits="userSpaceOnUse" /><linearGradient + x1="107.24445" + y1="268.11078" + x2="107.64762" + y2="207.717" + id="linearGradient1954" + xlink:href="#linearGradient1948" + gradientUnits="userSpaceOnUse" /><linearGradient + x1="278.59366" + y1="-49.590809" + x2="133.85397" + y2="120.54888" + id="linearGradient2808" + xlink:href="#linearGradient2802" + gradientUnits="userSpaceOnUse" /></defs> + + + <rect + style="fill:#800000;fill-opacity:1" + id="hintergrund" + height="270.92899" + width="361.23801" + y="0.00456294" + x="-361.23801" + class="fil0" + transform="scale(-1,1)"> + <animateColor + attributeName="fill" + attributeType="XML" + from="#000000" + to="#246ed8" + begin="0s" + dur="4s" + fill="freeze" + id="animateColor24" /> + </rect> + + + <path + d="M 162.557,0.0045 L 0,0.0045 L 0,57.8027 C 0,146.6071 334.145,182.1287 334.145,270.9327 L 334.145,270.9327 C 334.145,182.1283 162.557,88.8087 162.557,0.0037 L 162.557,0.0045 z " + style="fill:url(#linearGradient2808);fill-opacity:1" + id="path19" /> + + +</svg> \ No newline at end of file diff --git a/x2gothinclientmanagement/share/x2gothinclient_start b/x2gothinclientmanagement/share/x2gothinclient_start index d006485..abc1b6f 100755 --- a/x2gothinclientmanagement/share/x2gothinclient_start +++ b/x2gothinclientmanagement/share/x2gothinclient_start @@ -28,6 +28,7 @@ --set-kbd=1 \ --geometry=fullscreen \ --read-exports-from=/home/x2goclient/export \ + --background=/etc/x2go/x2goclient-background.svg \ --no-session-edit \ --session=X2Go.Example \ --add-to-known-hosts & hooks/post-receive -- x2gothinclient.git (X2Go Thin Client Environment) 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 "x2gothinclient.git" (X2Go Thin Client Environment).

1 0

x2gothinclient.git - master (branch) updated: 1.0.1.5-3-g80cc30a
by git-admin＠x2go.org 23 Feb '12

23 Feb '12

The branch, master has been updated via 80cc30a96a18f076d23eb6dc8a185ca34db80653 (commit) via b3183e568be6d346452c6727b4798812e6646f4a (commit) from 8c924cc190db585497aeb8bd22cdc1a880f32f12 (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 80cc30a96a18f076d23eb6dc8a185ca34db80653 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Feb 23 16:30:47 2012 +0100 changelog: fix in version number commit b3183e568be6d346452c6727b4798812e6646f4a Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Feb 23 16:11:41 2012 +0100 Not mounting /dev/pts by default. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 3 ++- .../sbin/x2gothinclient_create | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 81255ad..c1e4b66 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ x2gothinclient (1.0.1.6-0~x2go1) UNRELEASED; urgency=low - * Continue development... + * New upstream version (1.0.1.6): + - Not mounting /dev/pts by default. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 01 Feb 2012 13:51:00 +0100 diff --git a/x2gothinclientmanagement/sbin/x2gothinclient_create b/x2gothinclientmanagement/sbin/x2gothinclient_create index e0da318..751a1f6 100755 --- a/x2gothinclientmanagement/sbin/x2gothinclient_create +++ b/x2gothinclientmanagement/sbin/x2gothinclient_create @@ -80,7 +80,7 @@ echo "x2gothinclient" > $TC_CHROOT/etc/hostname echo "127.0.0.1 localhost" >> $TC_CHROOT/etc/hosts cat > $TC_CHROOT/etc/fstab <<EOF #proc /proc proc defaults 0 0 -none /dev/pts devpts gid=5,mode=620 0 0 +#none /dev/pts devpts gid=5,mode=620 0 0 none /tmp tmpfs size=50M,mode=1777 0 0 none /root tmpfs size=100M,mode=700 0 0 none /etc/udev/rules.d tmpfs size=50M 0 0 hooks/post-receive -- x2gothinclient.git (X2Go Thin Client Environment) 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 "x2gothinclient.git" (X2Go Thin Client Environment).

1 0

x2goclient.git - master (branch) updated: 3.99.1.0-6-g0cf7b36
by git-admin＠x2go.org 23 Feb '12

23 Feb '12

The branch, master has been updated via 0cf7b36b26b81dd2bbb650474ee8af71f82e2ff1 (commit) from ad93ba72500277997ffb92b966dc7d14a5fbe14a (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 0cf7b36b26b81dd2bbb650474ee8af71f82e2ff1 Author: Oleksandr Shneyder <oleksandr.shneyder(a)treuchtlingen.de> Date: Thu Feb 23 09:49:57 2012 +0100 command line argument "--xinerama": use Xinerama by default. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + onmainwindow.cpp | 1 + onmainwindow.h | 1 + onmainwindow_part3.cpp | 6 ++++++ onmainwindow_part4.cpp | 24 +++++++++++++----------- 5 files changed, 22 insertions(+), 11 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 3d1b9dd..b5cacc8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,7 @@ x2goclient (3.99.1.1-0~x2go1) UNRELEASED; urgency=low * New upstream version (3.99.1.1): - not including <netinet/in.h> on Q_OS_WIN platform. - not updating Xinerama configuration in "fullscreen" mode. + - command line argument "--xinerama": use Xinerama by default. [ Mike Gabriel ] * New upstream version (3.99.1.1): diff --git a/onmainwindow.cpp b/onmainwindow.cpp index a543ce1..87f9b94 100644 --- a/onmainwindow.cpp +++ b/onmainwindow.cpp @@ -64,6 +64,7 @@ ONMainWindow::ONMainWindow ( QWidget *parent ) :QMainWindow ( parent ) extStarted=false; defaultLink=2; defaultFullscreen=false; + defaultXinerama=false; acceptRsa=false; cardStarted=false; cardReady=false; diff --git a/onmainwindow.h b/onmainwindow.h index f3aaff4..5aa76f6 100644 --- a/onmainwindow.h +++ b/onmainwindow.h @@ -465,6 +465,7 @@ private: bool startMaximized; bool startHidden; bool defaultUseSound; + bool defaultXinerama; bool cardStarted; bool defaultSetKbd; bool showExport; diff --git a/onmainwindow_part3.cpp b/onmainwindow_part3.cpp index a2e4b07..69a0493 100644 --- a/onmainwindow_part3.cpp +++ b/onmainwindow_part3.cpp @@ -247,6 +247,11 @@ bool ONMainWindow::parseParameter ( QString param ) startMaximized=true; return true; } + if ( param=="--xinerama" ) + { + defaultXinerama=true; + return true; + } if ( param=="--hide" ) { startHidden=true; @@ -694,6 +699,7 @@ void ONMainWindow::showHelp() "--hide\t\t\t\t start hidden\n" "--portable\t\t\t start in \"portable\" mode\n" "--pgp-card\t\t\t use openPGP card authentication\n" + "--xinerama\t\t\t use Xinerama by default\n" "--ldap-printing\t\t\t allow client side printing in LDAP mode\n" "--add-to-known-hosts\t\t add RSA key fingerprint to " ".ssh/known_hosts\n" diff --git a/onmainwindow_part4.cpp b/onmainwindow_part4.cpp index 9bbdecb..25ca9a1 100644 --- a/onmainwindow_part4.cpp +++ b/onmainwindow_part4.cpp @@ -1147,8 +1147,8 @@ void ONMainWindow::slotConfigXinerama() void ONMainWindow::slotXineramaConfigured() { - if(resumingSession.fullscreen) - return; + if (resumingSession.fullscreen) + return; if (xinSizeInc == -1) xinSizeInc=1; else @@ -1173,8 +1173,8 @@ void ONMainWindow::slotFindProxyWin() { #ifndef Q_OS_DARWIN x2goDebug<<"search proxy win: "<<"X2GO-"+resumingSession.sessionId; - proxyWinId=findWindow ( "X2GO-"+resumingSession.sessionId ); + bool xinerama=defaultXinerama; if ( proxyWinId ) { x2goDebug<<"proxy win found:"<<proxyWinId; @@ -1194,14 +1194,8 @@ void ONMainWindow::slotFindProxyWin() else st= new X2goSettings( "sessions" ); uint displays=QApplication::desktop()->numScreens(); - if (st->setting()->value ( sid+"/xinerama", - ( QVariant ) false ).toBool()) - { - x2goDebug<<"Starting xinerama timer\n"; - lastDisplayGeometry=QRect(); - xineramaScreens.clear(); - xineramaTimer->start(500); - } + xinerama=st->setting()->value ( sid+"/xinerama", + ( QVariant ) defaultXinerama ).toBool(); if (st->setting()->value ( sid+"/multidisp", ( QVariant ) false ).toBool()) { @@ -1215,6 +1209,14 @@ void ONMainWindow::slotFindProxyWin() return; } } + if (xinerama) + { + x2goDebug<<"Starting xinerama timer\n"; + lastDisplayGeometry=QRect(); + xineramaScreens.clear(); + xineramaTimer->start(500); + } + if ( embedMode ) { if ( config.rootless ) 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: 3.99.1.0-5-gad93ba7
by git-admin＠x2go.org 23 Feb '12

23 Feb '12

The branch, master has been updated via ad93ba72500277997ffb92b966dc7d14a5fbe14a (commit) from 4a931302e089e07c9d9f01ca263c1c682ce00974 (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 ad93ba72500277997ffb92b966dc7d14a5fbe14a Author: Oleksandr Shneyder <oleksandr.shneyder(a)treuchtlingen.de> Date: Thu Feb 23 09:21:47 2012 +0100 not updating Xinerama configuration in "fullscreen" mode. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 3 ++- onmainwindow.h | 1 + onmainwindow_part2.cpp | 2 ++ onmainwindow_part4.cpp | 14 ++++++++++---- 4 files changed, 15 insertions(+), 5 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index e3e0b5e..3d1b9dd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,7 +3,8 @@ x2goclient (3.99.1.1-0~x2go1) UNRELEASED; urgency=low [ Oleksandr Shneyder ] * New upstream version (3.99.1.1): - not including <netinet/in.h> on Q_OS_WIN platform. - + - not updating Xinerama configuration in "fullscreen" mode. + [ Mike Gabriel ] * New upstream version (3.99.1.1): - Update copyright year in about window. Including all translations. diff --git a/onmainwindow.h b/onmainwindow.h index 79d60e4..f3aaff4 100644 --- a/onmainwindow.h +++ b/onmainwindow.h @@ -132,6 +132,7 @@ struct x2goSession QString sndPort; QString fsPort; int colorDepth; + bool fullscreen; enum {DESKTOP,ROOTLESS,SHADOW} sessionType; QString command; void operator = ( const x2goSession& s ); diff --git a/onmainwindow_part2.cpp b/onmainwindow_part2.cpp index 7d1a206..f43c179 100644 --- a/onmainwindow_part2.cpp +++ b/onmainwindow_part2.cpp @@ -730,6 +730,7 @@ void ONMainWindow::startNewSession() cmd+=sessTypeStr+QString::number ( shadowMode ) +"XSHAD"+ shadowUser+"XSHAD"+shadowDisplay; } + resumingSession.fullscreen=fullscreen; x2goDebug<<cmd<<endl; if ( managedMode ) { @@ -908,6 +909,7 @@ void ONMainWindow::resumeSession ( const x2goSession& s ) geometry=QString::number ( width ) +"x"+ QString::number ( height ); } + resumingSession.fullscreen=fullscreen; QString link; switch ( speed ) { diff --git a/onmainwindow_part4.cpp b/onmainwindow_part4.cpp index 39343a1..9bbdecb 100644 --- a/onmainwindow_part4.cpp +++ b/onmainwindow_part4.cpp @@ -1107,18 +1107,22 @@ void ONMainWindow::slotConfigXinerama() if (newGeometry==lastDisplayGeometry) return; lastDisplayGeometry=newGeometry; - x2goDebug<<"New proxy geometry: "<<lastDisplayGeometry<<endl; + x2goDebug<<"New proxy geometry: "<<lastDisplayGeometry<<endl; QDesktopWidget* root=QApplication::desktop(); QList<QRect> newXineramaScreens; for (int i=0; i< root->numScreens();++i) { - QRect intersection=root->screenGeometry(i).intersected(lastDisplayGeometry); + QRect intersection; + if (resumingSession.fullscreen) + intersection=root->screenGeometry(i); + else + intersection=root->screenGeometry(i).intersected(lastDisplayGeometry); if (!intersection.isNull()) { - x2goDebug<<"intersected with "<<i<<": "<<intersection<<endl; + x2goDebug<<"intersected with "<<i<<": "<<intersection<<endl; intersection.moveLeft(intersection.x()-lastDisplayGeometry.x()); intersection.moveTop(intersection.y()-lastDisplayGeometry.y()); - x2goDebug<<"xinerama screen: "<<intersection<<endl; + x2goDebug<<"xinerama screen: "<<intersection<<endl; newXineramaScreens<<intersection; } } @@ -1143,6 +1147,8 @@ void ONMainWindow::slotConfigXinerama() void ONMainWindow::slotXineramaConfigured() { + if(resumingSession.fullscreen) + return; if (xinSizeInc == -1) xinSizeInc=1; else 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-client/3.5.0.11-2-g0586f0d
by git-admin＠x2go.org 22 Feb '12

22 Feb '12

The branch, master has been updated via 0586f0d6e83cfa9ea12a3bf6a0015a4e84d09ae2 (commit) from a8bf2dd819ac55535b11e38848ffc9b076a5d307 (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 0586f0d6e83cfa9ea12a3bf6a0015a4e84d09ae2 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Feb 22 22:49:06 2012 +0100 Update patch: 001_add-main-makefile.full+lite.patch, adapt patch from packaging. Test for Makefiles in subfolders before calling them. Fixes build failure during ,,make distclean'' calls. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 4 +++- .../patches/001_add-main-makefile.full+lite.patch | 10 +++++----- 2 files changed, 8 insertions(+), 6 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 295c82e..f1697bc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,8 @@ nx-libs (2:3.5.0.12-0) UNRELEASED; urgency=low - * Continue development... + * Update patch: 001_add-main-makefile.full+lite.patch, adapt patch from + packaging. Test for Makefiles in subfolders before calling them. + Fixes build failure during ,,make distclean'' calls. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 22 Feb 2012 15:05:38 +0100 diff --git a/debian/patches/001_add-main-makefile.full+lite.patch b/debian/patches/001_add-main-makefile.full+lite.patch index 3c236b9..fffa4dc 100644 --- a/debian/patches/001_add-main-makefile.full+lite.patch +++ b/debian/patches/001_add-main-makefile.full+lite.patch @@ -11,12 +11,12 @@ Last-Update: 2011-12-31 +CONFIGURE=./configure + +%: -+ ${MAKE} -C nxcomp $@ -+ ${MAKE} -C nxproxy $@ ++ if test -f nxcomp/Makefile; then ${MAKE} -C nxcomp $@; fi ++ if test -f nxproxy/Makefile; then ${MAKE} -C nxproxy $@; fi + if test -d nx-X11; then \ -+ ${MAKE} -C nxcompext $@; \ -+ ${MAKE} -C nxcompshad; \ -+ ${MAKE} -C nx-X11 $@; \ ++ if test -f nxcompext/Makefile; then ${MAKE} -C nxcompext $@; fi; \ ++ if test -f nxcompshad/Makefile; then ${MAKE} -C nxcompshad $@; fi; \ ++ if test -f nx-X11/Makefile; then ${MAKE} -C nx-X11 $@; fi; \ + fi + +all: build 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

← Newer
1
2
3
4
5
6
7
...
20
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

x2go-commits February 2012