The branch, master has been updated
via 1beb2c19571c775d3b89a13a7398f433ea175749 (commit)
from e8db74714aef8044b9f6830b9f7c423756398f30 (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 1beb2c19571c775d3b89a13a7398f433ea175749
Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de…
[View More]>
Date: Thu Nov 14 15:37:32 2013 +0100
make sure VERSION files get installed properly (i.e. not as symlinks)
-----------------------------------------------------------------------
Summary of changes:
VERSION | 2 +-
debian/rules | 4 ++++
debian/x2gothinclient.install | 1 -
debian/x2gothinclientmanagement.install | 1 -
x2gothinclient/VERSION.x2gothinclient | 1 -
.../VERSION.x2gothinclientmanagement | 1 -
6 files changed, 5 insertions(+), 5 deletions(-)
delete mode 120000 x2gothinclient/VERSION.x2gothinclient
delete mode 120000 x2gothinclientmanagement/VERSION.x2gothinclientmanagement
The diff of changes is:
diff --git a/VERSION b/VERSION
index a6bbdb5..238afc2 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.1.0.0
+1.1.0.1
diff --git a/debian/rules b/debian/rules
index afa898a..4d3cf77 100755
--- a/debian/rules
+++ b/debian/rules
@@ -43,6 +43,10 @@ binary-arch: build-arch
dh_installexamples
dh_installdirs
dh_install
+ mkdir -p debian/x2gothinclient/usr/share/x2go/versions/
+ cp VERSION debian/x2gothinclient/usr/share/x2go/versions/VERSION.x2gothinclient
+ mkdir -p debian/x2gothinclientmanagement/usr/share/x2go/versions/
+ cp VERSION debian/x2gothinclientmanagement/usr/share/x2go/versions/VERSION.x2gothinclientmanagement
dh_installinit
dh_installman
dh_installdebconf
diff --git a/debian/x2gothinclient.install b/debian/x2gothinclient.install
index f2c48ff..a4fdb03 100644
--- a/debian/x2gothinclient.install
+++ b/debian/x2gothinclient.install
@@ -1,3 +1,2 @@
x2gothinclient/sbin/x2gothinclientd usr/sbin/
x2gothinclientmanagement/share/etc/* etc/x2go/
-x2gothinclient/VERSION.x2gothinclient usr/share/x2go/versions/
diff --git a/debian/x2gothinclientmanagement.install b/debian/x2gothinclientmanagement.install
index a9077fa..ee16044 100644
--- a/debian/x2gothinclientmanagement.install
+++ b/debian/x2gothinclientmanagement.install
@@ -2,4 +2,3 @@ x2gothinclientmanagement/sbin/x2gothinclient_* usr/sbin/
x2gothinclientmanagement/etc/x2gothinclient_* etc/x2go/
x2gothinclientmanagement/share/etc/ usr/share/x2go/tce/
x2gothinclientmanagement/share/tftpboot usr/share/x2go/tce/
-x2gothinclientmanagement/VERSION.x2gothinclientmanagement usr/share/x2go/versions/
\ No newline at end of file
diff --git a/x2gothinclient/VERSION.x2gothinclient b/x2gothinclient/VERSION.x2gothinclient
deleted file mode 120000
index 6ff19de..0000000
--- a/x2gothinclient/VERSION.x2gothinclient
+++ /dev/null
@@ -1 +0,0 @@
-../VERSION
\ No newline at end of file
diff --git a/x2gothinclientmanagement/VERSION.x2gothinclientmanagement b/x2gothinclientmanagement/VERSION.x2gothinclientmanagement
deleted file mode 120000
index 6ff19de..0000000
--- a/x2gothinclientmanagement/VERSION.x2gothinclientmanagement
+++ /dev/null
@@ -1 +0,0 @@
-../VERSION
\ No newline at end of file
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]
The branch, master has been updated
via e8db74714aef8044b9f6830b9f7c423756398f30 (commit)
from 37e9a55ba62ca1078ed00aa4aa2847edc77e9cc6 (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 e8db74714aef8044b9f6830b9f7c423756398f30
Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de…
[View More]>
Date: Thu Nov 14 15:14:13 2013 +0100
show version before TCE creation
-----------------------------------------------------------------------
Summary of changes:
.../etc/x2gothinclient_settings | 1 +
1 file changed, 1 insertion(+)
The diff of changes is:
diff --git a/x2gothinclientmanagement/etc/x2gothinclient_settings b/x2gothinclientmanagement/etc/x2gothinclient_settings
index ba701c9..b067e03 100644
--- a/x2gothinclientmanagement/etc/x2gothinclient_settings
+++ b/x2gothinclientmanagement/etc/x2gothinclient_settings
@@ -69,6 +69,7 @@ echo "The X2Go Thin Client Environment is using the following"
echo "settings:"
echo
echo "TC_PRETTY_NAME=$TC_PRETTY_NAME"
+echo "TC_VERSION=$TC_VERSION"
echo "TC_BASE=$TC_BASE"
echo "TC_CONFIG=$TC_CONFIG"
echo "TC_CHROOT=$TC_CHROOT"
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]
The branch, master has been updated
via 37e9a55ba62ca1078ed00aa4aa2847edc77e9cc6 (commit)
from db502cbfd190e2d0975e407ee16baf062c53e990 (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 37e9a55ba62ca1078ed00aa4aa2847edc77e9cc6
Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de…
[View More]>
Date: Thu Nov 14 15:10:36 2013 +0100
Tweak the /etc/os-release more comprehensively.
-----------------------------------------------------------------------
Summary of changes:
debian/changelog | 1 +
debian/x2gothinclient.install | 3 ++-
debian/x2gothinclientmanagement.install | 1 +
x2gothinclient/VERSION.x2gothinclient | 1 +
.../VERSION.x2gothinclientmanagement | 1 +
.../etc/x2gothinclient_settings | 3 +++
.../sbin/x2gothinclient_create | 2 +-
7 files changed, 10 insertions(+), 2 deletions(-)
create mode 120000 x2gothinclient/VERSION.x2gothinclient
create mode 120000 x2gothinclientmanagement/VERSION.x2gothinclientmanagement
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 7ca3a8b..99e369f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,6 +19,7 @@ x2gothinclient (1.1.0.1-0~x2go1) UNRELEASED; urgency=low
init script and ALSA's utils.sh.
- Refrain from using "~<user>" when launching X2Go Client as it cannot
handle it, yet. Use "~" instead (handable by X2Go Client >= 4.0.1.2).
+ - Tweak the /etc/os-release more comprehensively.
* debian/control:
+ New bin:package x2gothinclient-chroot.
+ Make sure x2gothinclient-chroot pulls in editing tools like
diff --git a/debian/x2gothinclient.install b/debian/x2gothinclient.install
index ee7f973..f2c48ff 100644
--- a/debian/x2gothinclient.install
+++ b/debian/x2gothinclient.install
@@ -1,2 +1,3 @@
x2gothinclient/sbin/x2gothinclientd usr/sbin/
-x2gothinclientmanagement/share/etc/* etc/x2go/
+x2gothinclientmanagement/share/etc/* etc/x2go/
+x2gothinclient/VERSION.x2gothinclient usr/share/x2go/versions/
diff --git a/debian/x2gothinclientmanagement.install b/debian/x2gothinclientmanagement.install
index ee16044..a9077fa 100644
--- a/debian/x2gothinclientmanagement.install
+++ b/debian/x2gothinclientmanagement.install
@@ -2,3 +2,4 @@ x2gothinclientmanagement/sbin/x2gothinclient_* usr/sbin/
x2gothinclientmanagement/etc/x2gothinclient_* etc/x2go/
x2gothinclientmanagement/share/etc/ usr/share/x2go/tce/
x2gothinclientmanagement/share/tftpboot usr/share/x2go/tce/
+x2gothinclientmanagement/VERSION.x2gothinclientmanagement usr/share/x2go/versions/
\ No newline at end of file
diff --git a/x2gothinclient/VERSION.x2gothinclient b/x2gothinclient/VERSION.x2gothinclient
new file mode 120000
index 0000000..6ff19de
--- /dev/null
+++ b/x2gothinclient/VERSION.x2gothinclient
@@ -0,0 +1 @@
+../VERSION
\ No newline at end of file
diff --git a/x2gothinclientmanagement/VERSION.x2gothinclientmanagement b/x2gothinclientmanagement/VERSION.x2gothinclientmanagement
new file mode 120000
index 0000000..6ff19de
--- /dev/null
+++ b/x2gothinclientmanagement/VERSION.x2gothinclientmanagement
@@ -0,0 +1 @@
+../VERSION
\ No newline at end of file
diff --git a/x2gothinclientmanagement/etc/x2gothinclient_settings b/x2gothinclientmanagement/etc/x2gothinclient_settings
index d7f942c..ba701c9 100644
--- a/x2gothinclientmanagement/etc/x2gothinclient_settings
+++ b/x2gothinclientmanagement/etc/x2gothinclient_settings
@@ -21,6 +21,9 @@
# name of this instance of the X2Go TCE (appears during thinclient boot process)
TC_PRETTY_NAME="X2Go TCE"
+# Adapt to your system!!! This path fits for Debian systems. Or provide the version manually.
+TC_VERSION=`cat /usr/share/x2go/versions/VERSION.x2gothinclientmanagement`
+
# base path for X2Go thin client files
TC_BASE="/opt/x2gothinclient"
diff --git a/x2gothinclientmanagement/sbin/x2gothinclient_create b/x2gothinclientmanagement/sbin/x2gothinclient_create
index f210edf..0f88f44 100755
--- a/x2gothinclientmanagement/sbin/x2gothinclient_create
+++ b/x2gothinclientmanagement/sbin/x2gothinclient_create
@@ -204,7 +204,7 @@ fi
[ \$? -eq 0 ] && sed -e 's/#ListenAddress ::/AddressFamily inet\nListenAddress 127.0.0.1/' -i /etc/ssh/sshd_config
# tweak plymouth
-[ \$? -eq 0 ] && test -e /etc/os-release && sed -e 's/PRETTY_NAME=.*/PRETTY_NAME=$TC_PRETTY_NAME/' -i /etc/os-release || echo "PRETTY_NAME=$TC_PRETTY_NAME" >> /etc/os-release
+[ \$? -eq 0 ] && test -e /etc/os-release && sed -e 's/PRETTY_NAME=.*/PRETTY_NAME="$TC_PRETTY_NAME"/' -e 's/NAME=.*/NAME="$TC_PRETTY_NAME"/' -e 's/VERSION=.*/VERSION="$TC_VERSION"/' -e 's/VERSION_ID=.*/VERSION_ID="$TC_VERSION"/' -e 's@HOME_URL=.*@HOME_URL="http://wiki.x2go.org"@' -e 's@SUPPORT_URL=.*@SUPPORT_URL="http://wiki.x2go.org/"@' -e 's@BUG_REPORT_URL=.*@BUG_REPORT_URL="http://bugs.x2go.org"@' -i /etc/os-release || echo -e 'PRETTY_NAME="$TC_PRETTY_NAME"\nNAME="$TC_PRETTY_NAME"\n' > /etc/os-release
[ \$? -eq 0 ] && test -e /etc/modprobe.d/i915-kms.conf && sed -s 's/modeset=1/modeset=0/' -i /etc/modprobe.d/i915-kms.conf || true
[ \$? -eq 0 ] && test -e /etc/modprobe.d/radeon-kms.conf && sed -s 's/modeset=1/modeset=0/' -i /etc/modprobe.d/radeon-kms.conf || true
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]
The branch, master has been updated
via db502cbfd190e2d0975e407ee16baf062c53e990 (commit)
from 277b1f779a3d6b0f3a11fc7c4ad5b32dc16ac169 (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 db502cbfd190e2d0975e407ee16baf062c53e990
Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de…
[View More]>
Date: Thu Nov 14 14:51:20 2013 +0100
fix spelling of X2Go
-----------------------------------------------------------------------
Summary of changes:
.../sbin/x2gothinclient_cleanup | 4 ++--
.../sbin/x2gothinclient_create | 2 +-
x2gothinclientmanagement/sbin/x2gothinclient_shell | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
The diff of changes is:
diff --git a/x2gothinclientmanagement/sbin/x2gothinclient_cleanup b/x2gothinclientmanagement/sbin/x2gothinclient_cleanup
index 5157fb6..d1ebd39 100755
--- a/x2gothinclientmanagement/sbin/x2gothinclient_cleanup
+++ b/x2gothinclientmanagement/sbin/x2gothinclient_cleanup
@@ -43,7 +43,7 @@ TC_TFTP_BOOT="${TC_TFTP_BOOT:-/srv/tftp}"
exit -2
}
-echo "X2go TCE cleanup..."
+echo "X2Go TCE cleanup..."
echo "-------------------"
echo "Hit <RETURN> to purge all X2Go TCE related files (chroot,"
@@ -85,5 +85,5 @@ test -e "$TC_TFTP_BOOT/pxelinux.cfg" && {
}
echo
-echo "X2go TCE cleanup is DONE."
+echo "X2Go TCE cleanup is DONE."
echo
diff --git a/x2gothinclientmanagement/sbin/x2gothinclient_create b/x2gothinclientmanagement/sbin/x2gothinclient_create
index 1bb0bc0..f210edf 100755
--- a/x2gothinclientmanagement/sbin/x2gothinclient_create
+++ b/x2gothinclientmanagement/sbin/x2gothinclient_create
@@ -249,5 +249,5 @@ empty_folder "$TC_CHROOT/var/lib/alsa"
x2gothinclient_update
-echo "X2go Thin Client creation has finished successfully."
+echo "X2Go Thin Client creation has finished successfully."
echo
diff --git a/x2gothinclientmanagement/sbin/x2gothinclient_shell b/x2gothinclientmanagement/sbin/x2gothinclient_shell
index ba4ec21..15dc478 100755
--- a/x2gothinclientmanagement/sbin/x2gothinclient_shell
+++ b/x2gothinclientmanagement/sbin/x2gothinclient_shell
@@ -87,7 +87,7 @@ ${*:-/bin/$TC_SHELL}
umount /root
echo
-echo "X2go Thin Client Shell has exited."
+echo "X2Go Thin Client Shell has exited."
echo
EOF
chmod u+x "$TC_CHROOT/x2go_tce_shell.sh"
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]
The branch, master has been updated
via a965d2bf9d5de13c0e29036078f5b4646a67cd1e (commit)
from 174c6c4c29ab92e49403670a5f426f78c9803216 (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 a965d2bf9d5de13c0e29036078f5b4646a67cd1e
Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de…
[View More]>
Date: Thu Nov 14 11:46:11 2013 +0100
forgot new files...
-----------------------------------------------------------------------
Summary of changes:
x2goclient.cpp => x2goutils.cpp | 11 ++++++++---
version.h => x2goutils.h | 8 +++++++-
2 files changed, 15 insertions(+), 4 deletions(-)
copy x2goclient.cpp => x2goutils.cpp (83%)
copy version.h => x2goutils.h (92%)
The diff of changes is:
diff --git a/x2goclient.cpp b/x2goutils.cpp
similarity index 83%
copy from x2goclient.cpp
copy to x2goutils.cpp
index 4fdd905..8a82dd4 100644
--- a/x2goclient.cpp
+++ b/x2goutils.cpp
@@ -15,9 +15,14 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. *
***************************************************************************/
-#include "ongetpass.h"
+#include <QString>
+#include <QDir>
-int main(int argc, char *argv[])
+QString expandHome( QString path )
{
- return x2goMain(argc,argv);
+ path = path.trimmed();
+ if ( path.startsWith("~/") || path.startsWith("~\\") ) {
+ path = path.replace(QString("~"), QDir::homePath());
+ }
+ return path;
}
diff --git a/version.h b/x2goutils.h
similarity index 92%
copy from version.h
copy to x2goutils.h
index 14773c6..5625625 100644
--- a/version.h
+++ b/x2goutils.h
@@ -15,5 +15,11 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. *
***************************************************************************/
-#define VERSION "4.0.1.2"
+#ifndef X2GOUTILS_H
+#define X2GOUTILS_H
+#include <QString>
+
+QString expandHome( QString path );
+
+#endif
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]
The branch, master has been updated
via 277b1f779a3d6b0f3a11fc7c4ad5b32dc16ac169 (commit)
from d31612857aa5d01ed112f5f3c4cc4c1fee209ddc (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 277b1f779a3d6b0f3a11fc7c4ad5b32dc16ac169
Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de…
[View More]>
Date: Thu Nov 14 11:24:50 2013 +0100
Refrain from using "~<user>" when launching X2Go Client as it cannot handle it, yet. Use "~" instead (handable by X2Go Client >= 4.0.1.2). + Depend on x2goclient (>= 4.0.1.2-0~).
* debian/control:
+ Depend on x2goclient (>= 4.0.1.2-0~).
-----------------------------------------------------------------------
Summary of changes:
debian/changelog | 3 +++
debian/control | 2 +-
.../share/etc/x2gothinclient_start | 5 ++---
3 files changed, 6 insertions(+), 4 deletions(-)
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 395b45c..7ca3a8b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,10 +17,13 @@ x2gothinclient (1.1.0.1-0~x2go1) UNRELEASED; urgency=low
avoid failures when clean tmp files on the read-only NFS root-fs.
- Work around Debian bug #729373 during TCE creation. Patch alsa-utils
init script and ALSA's utils.sh.
+ - Refrain from using "~<user>" when launching X2Go Client as it cannot
+ handle it, yet. Use "~" instead (handable by X2Go Client >= 4.0.1.2).
* debian/control:
+ New bin:package x2gothinclient-chroot.
+ Make sure x2gothinclient-chroot pulls in editing tools like
mc, vim, less via Recommends: field.
+ + Depend on x2goclient (>= 4.0.1.2-0~).
[ Arnold Krille ]
* New upstream version (1.1.0.1):
diff --git a/debian/control b/debian/control
index 4e0f7a7..69f2d15 100644
--- a/debian/control
+++ b/debian/control
@@ -91,7 +91,7 @@ Depends:
${misc:Depends},
adduser,
psmisc,
- x2goclient (>= 3.99.3.0-0~),
+ x2goclient (>= 4.0.1.2-0~),
xauth,
xinit,
locales,
diff --git a/x2gothinclientmanagement/share/etc/x2gothinclient_start b/x2gothinclientmanagement/share/etc/x2gothinclient_start
index 3ff2b4d..8a8ab74 100755
--- a/x2gothinclientmanagement/share/etc/x2gothinclient_start
+++ b/x2gothinclientmanagement/share/etc/x2gothinclient_start
@@ -28,7 +28,7 @@
--geometry=fullscreen \
--thinclient \
--haltbt \
- --read-exports-from=~x2gothinclient/export \
+ --read-exports-from=~/export \
--background=/etc/x2go/x2goclient-background.svg \
--no-session-edit \
--session=X2Go.Example \
@@ -42,9 +42,8 @@
# --geometry=fullscreen \
# --thinclient \
# --haltbt \
-# --read-exports-from=~x2gothinclient/export \
+# --read-exports-from=~/export \
# --background=/etc/x2go/x2goclient-background.svg \
# --broker-url=https://x2gobroker.intern:8080/plain/zeroconf \
# --broker-autologoff
# --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).
[View Less]