x2go-commits July 2013

x2go-commits@lists.x2go.org

2 participants
625 discussions

x2gothinclient.git - build-main (branch) updated: 1.0.1.8-7-g1451569
by git-admin＠x2go.org 19 Jul '13

19 Jul '13

The branch, build-main has been updated via 145156970740eaa40ec081ced9a5d047f6f0919d (commit) from 12d42ec1454f055391d4039371873a9503705396 (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/… [View More]changelog | 1 + .../sbin/x2gothinclient_create | 14 ++++++++++---- x2gothinclientmanagement/sbin/x2gothinclient_shell | 16 +++++++++++----- .../sbin/x2gothinclient_upgrade | 16 +++++++++++----- 4 files changed, 33 insertions(+), 14 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 8942478..714fbc0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,7 @@ x2gothinclient (1.0.1.9-0~x2go1) UNRELEASED; urgency=low - Use sed to patch initramfs configuration (rather than a patch that fails on wheezy). The change is needed for squeeze only. - Fix x2go_tce_shell.sh script, escape braces. + - Change method of mounting /proc, /sys and /dev inside of chroots. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Fri, 10 Aug 2012 14:13:49 +0200 diff --git a/x2gothinclientmanagement/sbin/x2gothinclient_create b/x2gothinclientmanagement/sbin/x2gothinclient_create index ebe10fc..3d1de34 100755 --- a/x2gothinclientmanagement/sbin/x2gothinclient_create +++ b/x2gothinclientmanagement/sbin/x2gothinclient_create @@ -103,8 +103,6 @@ cat > $TC_CHROOT/x2go_tce_install.sh <<EOF #!/bin/bash export LANG=C -mount /proc -mount /dev/pts export HOME=/root export http_proxy=$TC_HTTP_PROXY export https_proxy=$TC_HTTPS_PROXY @@ -166,12 +164,20 @@ chmod +x /sbin/start-stop-daemon # restore start-stop-daemon [ \$(stat --format '%s' /sbin/start-stop-daemon) -lt 200 ] && mv /sbin/start-stop-daemon.keep /sbin/start-stop-daemon -umount -l /proc &>/dev/null -umount -l /dev/pts &>/dev/null EOF chmod u+x $TC_CHROOT/x2go_tce_install.sh + +mkdir -p $TC_CHROOT/{proc,dev,sys} +mount --bind /proc $TC_CHROOT/proc +mount --bind /dev $TC_CHROOT/dev +mount --bind /sys $TC_CHROOT/sys + chroot $TC_CHROOT /x2go_tce_install.sh +umount $TC_CHROOT/proc +umount $TC_CHROOT/dev +umount $TC_CHROOT/sys + rm -f $TC_CHROOT/etc/udev/rules.d/*-persistent-*.rules x2gothinclient_update diff --git a/x2gothinclientmanagement/sbin/x2gothinclient_shell b/x2gothinclientmanagement/sbin/x2gothinclient_shell index 1d448bf..67a8203 100755 --- a/x2gothinclientmanagement/sbin/x2gothinclient_shell +++ b/x2gothinclientmanagement/sbin/x2gothinclient_shell @@ -49,8 +49,6 @@ test -e "$TC_CHROOT" || { cat > "$TC_CHROOT/x2go_tce_shell.sh" <<EOF #!/bin/bash -mount /proc &> /dev/null -mount /dev/pts &> /dev/null export HOME=/root # export the proxy server (if any) to the shell. @@ -79,12 +77,20 @@ chmod +x /sbin/start-stop-daemon # restore start-stop-daemon [ \$(stat --format '%s' /sbin/start-stop-daemon) -lt 200 ] && mv /sbin/start-stop-daemon.keep /sbin/start-stop-daemon -umount -l /proc &> /dev/null -umount -l /dev/pts &> /dev/null - echo echo "X2go Thin Client Shell has exited." echo EOF chmod u+x "$TC_CHROOT/x2go_tce_shell.sh" + +mkdir -p $TC_CHROOT/{proc,dev,sys} +mount --bind /proc $TC_CHROOT/proc +mount --bind /dev $TC_CHROOT/dev +mount --bind /sys $TC_CHROOT/sys + chroot "$TC_CHROOT" /x2go_tce_shell.sh + +umount $TC_CHROOT/proc +umount $TC_CHROOT/dev +umount $TC_CHROOT/sys + diff --git a/x2gothinclientmanagement/sbin/x2gothinclient_upgrade b/x2gothinclientmanagement/sbin/x2gothinclient_upgrade index dbf804e..8f8c61e 100755 --- a/x2gothinclientmanagement/sbin/x2gothinclient_upgrade +++ b/x2gothinclientmanagement/sbin/x2gothinclient_upgrade @@ -48,8 +48,6 @@ test -e "$TC_CHROOT" || { cat > "$TC_CHROOT/x2go_tce_upgrade.sh" <<EOF #!/bin/bash -mount /proc &> /dev/null -mount /dev/pts &> /dev/null export HOME=/root export http_proxy=$TC_HTTP_PROXY @@ -77,12 +75,20 @@ done # restore start-stop-daemon [ \$(stat --format '%s' /sbin/start-stop-daemon) -lt 200 ] && mv /sbin/start-stop-daemon.keep /sbin/start-stop-daemon -umount -l /proc &> /dev/null -umount -l /dev/pts &> /dev/null - echo echo "X2go Thin Client Shell upgrade has finished." echo EOF chmod u+x "$TC_CHROOT/x2go_tce_upgrade.sh" + +mkdir -p $TC_CHROOT/{proc,dev,sys} +mount --bind /proc $TC_CHROOT/proc +mount --bind /dev $TC_CHROOT/dev +mount --bind /sys $TC_CHROOT/sys + chroot "$TC_CHROOT" /x2go_tce_upgrade.sh + +umount $TC_CHROOT/proc +umount $TC_CHROOT/dev +umount $TC_CHROOT/sys + 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). [View Less]

1 0

x2gothinclient.git - build-main (branch) updated: 1.0.1.8-4-gd7ce549
by git-admin＠x2go.org 19 Jul '13

19 Jul '13

The branch, build-main has been updated via d7ce549428428b76c605a24c6d117fac2072358c (commit) from a449f64ce0b6054485d90da45092d7b306405cd3 (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/… [View More]changelog | 1 + .../sbin/x2gothinclient_cleanup | 16 +++++++++++----- .../sbin/x2gothinclient_create | 4 +++- .../sbin/x2gothinclient_preptftpboot | 3 ++- x2gothinclientmanagement/sbin/x2gothinclient_shell | 3 ++- .../sbin/x2gothinclient_update | 6 ++++-- .../sbin/x2gothinclient_upgrade | 3 ++- 7 files changed, 25 insertions(+), 11 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 2f360a0..1ae3cae 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ x2gothinclient (1.0.1.9-0~x2go1) UNRELEASED; urgency=low * New upstream version (1.0.1.9): - When X2Go TCE has plymouth installed, make sure pressing the halt button does not change to the wrong tty. + - Truncate echo output lines to less than 80 chars. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Fri, 10 Aug 2012 14:13:49 +0200 diff --git a/x2gothinclientmanagement/sbin/x2gothinclient_cleanup b/x2gothinclientmanagement/sbin/x2gothinclient_cleanup index 98855fd..c17ab19 100755 --- a/x2gothinclientmanagement/sbin/x2gothinclient_cleanup +++ b/x2gothinclientmanagement/sbin/x2gothinclient_cleanup @@ -38,14 +38,17 @@ TC_CONFIG="${TC_CONFIG:-$TC_BASE/etc}" TC_TFTP_BOOT="${TC_TFTP_BOOT:-/srv/tftp}" [ "x$USER" == "xroot" ] || { - echo "ERROR: X2Go Thin Client management scripts have to run as super-user root." + echo "ERROR: X2Go Thin Client management scripts have to run" + echo "as super-user root." exit -2 } echo "X2go TCE cleanup..." echo "-------------------" -echo "Hit <RETURN> to purge all X2Go TCE related files (chroot, TCE config, PXE boot env)..." +echo "Hit <RETURN> to purge all X2Go TCE related files (chroot," +echo "TCE config, PXE boot env)..." +echo echo "Alternatively, hit STRG-C to cancel the operation now!!!" read @@ -54,13 +57,15 @@ test -e "$TC_CHROOT" && { echo "Removing $TC_CHROOT..." rm -Rf "${TC_CHROOT}" } || { - echo "WARNING: X2Go Thin Client chroot does not exist at $TC_CHROOT. No cleanup necessary..." + echo "WARNING: X2Go Thin Client chroot does not exist" + echo "at $TC_CHROOT. No cleanup necessary..." } test -e "$TC_CONFIG" && { echo "Removing $TC_CONFIG..." rm -Rf "${TC_CONFIG}" } || { - echo "WARNING: X2Go Thin Client config does not exist at $TC_CONFIG. No cleanup necessary..." + echo "WARNING: X2Go Thin Client config does not exist" + echo "at $TC_CONFIG. No cleanup necessary..." } ### PXE/Syslinux @@ -68,7 +73,8 @@ test -e "$TC_TFTP_BOOT/pxelinux.cfg" && { echo "Emptying $TC_TFTP_BOOT..." rm -Rf "${TC_TFTP_BOOT}"/* } || { - echo "WARNING: X2Go PXE/Syslinux boot environment does not exist at $TC_TFTP_BOOT. No cleanup necessary..." + echo "WARNING: X2Go PXE/Syslinux boot environment does not exist" + echo "at $TC_TFTP_BOOT. No cleanup necessary..." } echo diff --git a/x2gothinclientmanagement/sbin/x2gothinclient_create b/x2gothinclientmanagement/sbin/x2gothinclient_create index a14ae17..434ec14 100755 --- a/x2gothinclientmanagement/sbin/x2gothinclient_create +++ b/x2gothinclientmanagement/sbin/x2gothinclient_create @@ -53,7 +53,9 @@ test -e "$TC_CHROOT" && { exit -2 } -echo "Hit <RETURN> to continue with X2Go TCE chroot creation using the above TCE parameters..." +echo "Hit <RETURN> to continue with X2Go TCE chroot creation using" +echo "the above TCE parameters..." +echo echo "Alternatively, hit STRG-C to cancel the operation now!!!" read diff --git a/x2gothinclientmanagement/sbin/x2gothinclient_preptftpboot b/x2gothinclientmanagement/sbin/x2gothinclient_preptftpboot index a011f8b..1dd9101 100755 --- a/x2gothinclientmanagement/sbin/x2gothinclient_preptftpboot +++ b/x2gothinclientmanagement/sbin/x2gothinclient_preptftpboot @@ -49,7 +49,8 @@ test -e "$TC_TFTP_BOOT/pxelinux.cfg" && { } [ "x$USER" == "xroot" ] || { - echo "ERROR: X2Go Thin Client management scripts have to run as super-user root." + echo "ERROR: X2Go Thin Client management scripts have to run" + echo "as super-user root." exit -2 } diff --git a/x2gothinclientmanagement/sbin/x2gothinclient_shell b/x2gothinclientmanagement/sbin/x2gothinclient_shell index 625bb16..3360dda 100755 --- a/x2gothinclientmanagement/sbin/x2gothinclient_shell +++ b/x2gothinclientmanagement/sbin/x2gothinclient_shell @@ -42,7 +42,8 @@ test -e "$TC_CHROOT" || { } [ "x$USER" == "xroot" ] || { - echo "ERROR: X2Go Thin Client management scripts have to run as super-user root." + echo "ERROR: X2Go Thin Client management scripts have to run" + echo "as super-user root." exit -2 } diff --git a/x2gothinclientmanagement/sbin/x2gothinclient_update b/x2gothinclientmanagement/sbin/x2gothinclient_update index 4df9ff3..24f2d8b 100755 --- a/x2gothinclientmanagement/sbin/x2gothinclient_update +++ b/x2gothinclientmanagement/sbin/x2gothinclient_update @@ -43,12 +43,14 @@ test -e "$TC_CHROOT" || { } test -e "$TC_CONFIG" || { - echo "ERROR: No X2Go Thin Client configuration found at $TC_CONFIG. Please check..." + echo "ERROR: No X2Go Thin Client configuration found" + echo "at $TC_CONFIG. Please check..." exit -1 } [ "x$USER" == "xroot" ] || { - echo "ERROR: X2Go Thin Client management scripts have to run as super-user root." + echo "ERROR: X2Go Thin Client management scripts have to run" + echo "as super-user root." exit -2 } diff --git a/x2gothinclientmanagement/sbin/x2gothinclient_upgrade b/x2gothinclientmanagement/sbin/x2gothinclient_upgrade index a206837..dbf804e 100755 --- a/x2gothinclientmanagement/sbin/x2gothinclient_upgrade +++ b/x2gothinclientmanagement/sbin/x2gothinclient_upgrade @@ -41,7 +41,8 @@ test -e "$TC_CHROOT" || { } [ "x$USER" == "xroot" ] || { - echo "ERROR: X2Go Thin Client management scripts have to run as super-user root." + echo "ERROR: X2Go Thin Client management scripts have to run" + echo "as super-user root." exit -2 } 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). [View Less]

1 0

x2gothinclient.git - build-main (branch) updated: 1.0.1.8-8-gc325184
by git-admin＠x2go.org 19 Jul '13

19 Jul '13

The branch, build-main has been updated via c325184220284304da96a190b5380db4d590dfdd (commit) from 145156970740eaa40ec081ced9a5d047f6f0919d (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/… [View More]changelog | 5 +++-- debian/control | 5 ++++- .../etc/x2gothinclient_settings | 18 ++++++++++++++---- .../sbin/x2gothinclient_create | 8 ++++++-- 4 files changed, 27 insertions(+), 9 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 714fbc0..4119c32 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,6 @@ -x2gothinclient (1.0.1.9-0~x2go1) UNRELEASED; urgency=low +x2gothinclient (1.0.99.1-0~x2go1) UNRELEASED; urgency=low - * New upstream version (1.0.1.9): + * New upstream version (1.0.99.1): - When X2Go TCE has plymouth installed, make sure pressing the halt button does not change to the wrong tty. - Truncate echo output lines to less than 80 chars. @@ -8,6 +8,7 @@ x2gothinclient (1.0.1.9-0~x2go1) UNRELEASED; urgency=low that fails on wheezy). The change is needed for squeeze only. - Fix x2go_tce_shell.sh script, escape braces. - Change method of mounting /proc, /sys and /dev inside of chroots. + - Step towards wheezy, enable plymouth boot splash. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Fri, 10 Aug 2012 14:13:49 +0200 diff --git a/debian/control b/debian/control index 21bf456..c87e6fc 100644 --- a/debian/control +++ b/debian/control @@ -50,7 +50,8 @@ Depends: x2goclient (>= 3.99.1.1-0~), xauth, xinit, - locales + locales, + plymouth, Recommends: x2gocdmanager, x2gousbmount, @@ -62,6 +63,8 @@ Recommends: mc, acpid, memtest86+ +Suggests: + plymouth-themes-all Breaks: x2gothinshutdown Replaces: diff --git a/x2gothinclientmanagement/etc/x2gothinclient_settings b/x2gothinclientmanagement/etc/x2gothinclient_settings index 283a62d..5140599 100644 --- a/x2gothinclientmanagement/etc/x2gothinclient_settings +++ b/x2gothinclientmanagement/etc/x2gothinclient_settings @@ -18,6 +18,9 @@ # Free Software Foundation, Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. +# name of this instance of the X2Go TCE (appears during thinclient boot process) +TC_PRETTY_NAME="X2Go TCE" + # base path for X2Go thin client files TC_BASE="/opt/x2gothinclient" @@ -33,13 +36,18 @@ TC_SHELL="bash" # Debian package mirror to use... TC_DEBMIRROR_URL="http://ftp.debian.org/debian" +# Distro codename to use... +#TC_DISTRO_CODENAME="wheezy" +# or use older Debian squeeze... +TC_DISTRO_CODENAME="squeeze" + # Retrieve X2Go packages from this URL -TC_X2GO_DEBURL="deb http://packages.x2go.org/debian stable main" +TC_X2GO_DEBURL="deb http://packages.x2go.org/debian $TC_DISTRO_CODENAME main" # Use a http/ftp proxy during debootstrap (leave empty if direct connections to http/ftp are allowed) -# TC_HTTP_PROXY="http://proxy.mydomain.com:8080" -# TC_HTTPS_PROXY="http://proxy.mydomain.com:8080" -# TC_FTP_PROXY="http://proxy.mydomain.com:8080" +#TC_HTTP_PROXY="http://webcache.intern:3128" +#TC_HTTPS_PROXY="http://webcache.intern:3128" +#TC_FTP_PROXY="http://webcache.intern:3128" TC_HTTP_PROXY="" TC_HTTPS_PROXY="" TC_FTP_PROXY="" @@ -56,10 +64,12 @@ echo "=============================" echo "The X2Go Thin Client Environment is using the following" echo "settings:" echo +echo "TC_PRETTY_NAME=$TC_PRETTY_NAME" echo "TC_BASE=$TC_BASE" echo "TC_CONFIG=$TC_CONFIG" echo "TC_CHROOT=$TC_CHROOT" echo "TC_SHELL=$TC_SHELL" +ecjp "TC_DISTRO_CODENAME=$TC_DISTRO_CODENAME" echo "TC_DEBMIRROR_URL=$TC_DEBMIRROR_URL" echo "TC_X2GO_DEBURL=$TC_X2GO_DEBURL" echo "TC_HTTP_PROXY=$TC_HTTP_PROXY" diff --git a/x2gothinclientmanagement/sbin/x2gothinclient_create b/x2gothinclientmanagement/sbin/x2gothinclient_create index 3d1de34..6da1543 100755 --- a/x2gothinclientmanagement/sbin/x2gothinclient_create +++ b/x2gothinclientmanagement/sbin/x2gothinclient_create @@ -38,8 +38,9 @@ source $ETCDIR/x2gothinclient_settings TC_BASE="${TC_BASE:-/opt/x2gothinclient}" TC_CHROOT="${TC_CHROOT:-$TC_BASE/chroot}" TC_CONFIG="${TC_CONFIG:-$TC_BASE/etc}" +TC_DISTRO_CODENAME="${IK_DISTRO_CODENAME:-squeeze}" TC_DEBMIRROR_URL="${TC_DEBMIRROR_URL:-'http://ftp.debian.org/debian'}" -TC_X2GO_DEBURL="${TC_X2GO_DEBURL:-'deb http://packages.x2go.org stable main'}" +TC_X2GO_DEBURL="${TC_X2GO_DEBURL:-'deb http://packages.x2go.org $TC_DISTRO_CODENAME main'}" TC_MODULE_BLACKLIST="${TC_MODULE_BLACKLIST:-'pcspkr'}" test -e "$TC_CHROOT" && { @@ -75,7 +76,7 @@ export http_proxy="$TC_HTTP_PROXY" export https_proxy="$TC_HTTPS_PROXY" export ftp_proxy="$TC_FTP_PROXY" -debootstrap --arch i386 stable $TC_CHROOT/ $TC_DEBMIRROR_URL +debootstrap --arch i386 $TC_DISTRO_CODENAME $TC_CHROOT/ $TC_DEBMIRROR_URL cp /etc/resolv.conf $TC_CHROOT/etc/resolv.conf echo "auto lo" >> $TC_CHROOT/etc/network/interfaces echo "iface lo inet loopback" >> $TC_CHROOT/etc/network/interfaces @@ -161,6 +162,9 @@ chmod +x /sbin/start-stop-daemon [ \$? -eq 0 ] && rm -f /etc/mtab [ \$? -eq 0 ] && ln -sf /proc/mounts /etc/mtab +# tweak plymouth +[ \$? -eq 0 ] && test -e /etc/os-release && sed -e 's/PRETTY_NAME=.*/PRETTY_NAME=$IK_PRETTY_NAME/' -i /etc/os-release || echo "PRETTY_NAME=$IK_PRETTY_NAME" >> /etc/os-release + # restore start-stop-daemon [ \$(stat --format '%s' /sbin/start-stop-daemon) -lt 200 ] && mv /sbin/start-stop-daemon.keep /sbin/start-stop-daemon 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). [View Less]

1 0

pyhoca-gui.git - master (branch) updated: 0.4.0.4-3-g08107b7
by git-admin＠x2go.org 19 Jul '13

19 Jul '13

The branch, master has been updated via 08107b765e23fa977ae198bde67251d31facd7ab (commit) from 911380f1ea0c56577541adc425290bfa04775c99 (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 08107b765e23fa977ae198bde67251d31facd7ab Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de… [View More]

1 0

python-x2go.git - master (branch) updated: 0.4.0.5-2-gc735e6a
by git-admin＠x2go.org 19 Jul '13

19 Jul '13

The branch, master has been updated via c735e6ab02c50b7029b700179a62373f7f406a29 (commit) from a72c2d2bee99d4676e0029b006285f69035ceaf7 (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 c735e6ab02c50b7029b700179a62373f7f406a29 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de… [View More]

1 0

pyhoca-gui.git - master (branch) updated: 0.4.0.4-2-g911380f
by git-admin＠x2go.org 19 Jul '13

19 Jul '13

The branch, master has been updated via 911380f1ea0c56577541adc425290bfa04775c99 (commit) from b3509d2a2695b9b9386a5c4667bedcb2ae662d94 (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 911380f1ea0c56577541adc425290bfa04775c99 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de… [View More]

1 0

pyhoca-gui.git - master (branch) updated: 0.4.0.4-1-gb3509d2
by git-admin＠x2go.org 19 Jul '13

19 Jul '13

The branch, master has been updated via b3509d2a2695b9b9386a5c4667bedcb2ae662d94 (commit) from bff7d333f0e0408726e9f9bda13e9a2c3684561e (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 b3509d2a2695b9b9386a5c4667bedcb2ae662d94 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de… [View More]

1 0

pyhoca-gui.git - build-baikal (branch) updated: 0.4.0.3-1-g065423d
by git-admin＠x2go.org 19 Jul '13

19 Jul '13

The branch, build-baikal has been updated via 065423d954716d531410be66235ac310b1ccba7e (commit) from 093a6dd446728c7411d50411867c2626f1279629 (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/… [View More]

1 0

pyhoca-gui.git - build-baikal (branch) updated: 0.4.0.3-2-g450a9fe
by git-admin＠x2go.org 19 Jul '13

19 Jul '13

The branch, build-baikal has been updated via 450a9feb1b38c30ecb88a462c898521330b18114 (commit) from 065423d954716d531410be66235ac310b1ccba7e (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/… [View More]changelog | 3 ++- pyhoca/wxgui/about.py | 11 ++++++++--- pyhoca/wxgui/frontend.py | 2 +- 3 files changed, 11 insertions(+), 5 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index d7d7f92..30ef643 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ pyhoca-gui (0.4.0.4-0~x2go1) UNRELEASED; urgency=low - * Continue development... + * New upstream version (0.4.0.4): + - Allow custom window titles for About...windows. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Fri, 19 Jul 2013 20:57:10 +0200 diff --git a/pyhoca/wxgui/about.py b/pyhoca/wxgui/about.py index a79c31f..9e3ded0 100644 --- a/pyhoca/wxgui/about.py +++ b/pyhoca/wxgui/about.py @@ -46,7 +46,7 @@ class PyHocaGUI_AboutFrame(wx.Frame): wxWidget displaying an ,,About'' window for this application. """ - def __init__(self, _PyHocaGUI, caller=None, about_image=None, icon_name='pyhoca-winicon.png'): + def __init__(self, _PyHocaGUI, caller=None, about_image=None, icon_name='pyhoca-winicon.png', about_what=None, ): """\ About window (constructor). @@ -58,6 +58,8 @@ class PyHocaGUI_AboutFrame(wx.Frame): @type about_image: C{str} @param icon_name: icon name for window icon @type icon_name: C{str} + @param about_what: about what is this about window? + @type about_what: C{str} """ self._PyHocaGUI = _PyHocaGUI @@ -74,10 +76,13 @@ class PyHocaGUI_AboutFrame(wx.Frame): if not (os.path.isfile(about_image) or os.path.islink(about_image)): about_image = os.path.join(basepath.images_basepath, fallback_about_image) + if about_what is None: + about_what = self._PyHocaGUI.appname + if x2go.X2GOCLIENT_OS == 'Windows': - wx.Frame.__init__(self, None, -1, _(u'About %s ...') % self._PyHocaGUI.appname, size=(403,319)) + wx.Frame.__init__(self, None, -1, _(u'About %s ...') % about_what, size=(403,319)) else: - wx.Frame.__init__(self, None, -1, _(u'About %s ...') % self._PyHocaGUI.appname, size=(400,298)) + wx.Frame.__init__(self, None, -1, _(u'About %s ...') % about_what, size=(400,298)) self.Bind(wx.EVT_CLOSE, self.OnHide) panel = wx.Panel(self, -1, pos=(0,0), size=(0,0), ) diff --git a/pyhoca/wxgui/frontend.py b/pyhoca/wxgui/frontend.py index dba3afc..3bc6574 100644 --- a/pyhoca/wxgui/frontend.py +++ b/pyhoca/wxgui/frontend.py @@ -302,7 +302,7 @@ class PyHocaGUI(wx.App, x2go.X2GoClient): self.about = about.PyHocaGUI_AboutFrame(self, about_image=self.args.about_image) self.about.Show(False) - self.about_pythonx2go = about.PyHocaGUI_AboutFrame(self, about_image='pythonx2go-about-logo.png') + self.about_pythonx2go = about.PyHocaGUI_AboutFrame(self, about_image='pythonx2go-about-logo.png', about_what="Python X2Go") self.about_pythonx2go.Show(False) self.taskbar = taskbar.PyHocaGUI_TaskBarIcon(self.about) hooks/post-receive -- pyhoca-gui.git (Python X2Go Client (wxPython GUI)) 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 "pyhoca-gui.git" (Python X2Go Client (wxPython GUI)). [View Less]

1 0

pyhoca-gui.git - build-baikal (branch) updated: 0.4.0.4
by git-admin＠x2go.org 19 Jul '13

19 Jul '13

The branch, build-baikal has been updated via bff7d333f0e0408726e9f9bda13e9a2c3684561e (commit) from 12a986f87b6bb17f169d35169e62aa112e401d69 (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/… [View More]

1 0

← Newer
1
...
50
51
52
53
54
55
56
...
63
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

x2go-commits July 2013