This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository x2gothinclient. from dcca22b Install minidesktop's background SVG to DATADIR and symlink to it in ETCDIR. new 23daf2a debian/rules: Convert to pure debhelper rules file. new bb4ab6a Provide empty/dummy FreeRDPv2 known_hosts2 file if not already there. new 97fbabc Remove Qt5 build cruft from cdmanager/powerej/. The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: common/etc/freerdp/known_hosts | 2 +- common/etc/freerdp/known_hosts2 | 1 + debian/changelog | 5 +++ debian/rules | 59 ++++++++--------------------------- management/sbin/x2gothinclient_create | 9 +++++- 5 files changed, 28 insertions(+), 48 deletions(-) create mode 100644 common/etc/freerdp/known_hosts2 -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2gothinclient.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gothinclient. commit 23daf2a2215b70276222a9932d70acfdb8f5490a Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Sun Jul 21 14:33:14 2019 +0200 debian/rules: Convert to pure debhelper rules file. --- debian/changelog | 2 ++ debian/rules | 58 ++++++++++++-------------------------------------------- 2 files changed, 14 insertions(+), 46 deletions(-) diff --git a/debian/changelog b/debian/changelog index b2df2b7..ee0f6f1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -21,6 +21,8 @@ x2gothinclient (1.5.0.1-0x2go1) UNRELEASED; urgency=medium specific theming of the desktop UI. (Closes: #1364). - Install minidesktop's background SVG to DATADIR and symlink to it in ETCDIR. + * debian/rules: + + Convert to pure debhelper rules file. -- X2Go Release Manager <git-admin@x2go.org> Sun, 02 Dec 2018 06:49:42 +0100 diff --git a/debian/rules b/debian/rules index ccd1f02..f4e7f32 100755 --- a/debian/rules +++ b/debian/rules @@ -6,62 +6,28 @@ include /usr/share/dpkg/buildflags.mk export QT_SELECT=qt5 +DHFLAGS=--parallel + %: - dh $@ --parallel + dh $@ $(DHFLAGS) -configure: configure-stamp -configure-stamp: - dh_testdir +override_dh_auto_configure: cd cdmanager/powerej && qmake powerej.pro - touch $@ - -build: build-arch build-indep + dh_auto_configure $(DHFLAGS) -build-arch: build-stamp -build-stamp: configure-stamp - dh_testdir - dh_prep +override_dh_auto_build: $(MAKE) -C cdmanager/powerej - touch $@ - -build-indep: - -clean: - dh_testdir - dh_testroot - [ ! -f cdmanager/powerej/Makefile ] || $(MAKE) -C cdmanager/powerej distclean - dh_clean build-stamp configure-stamp + dh_auto_build $(DHFLAGS) -binary-indep: build-indep -# We have nothing to do by default. - -# Build architecture-dependent files here. -binary-arch: build-arch - dh_testdir - dh_testroot - dh_installchangelogs - dh_installdocs - dh_installexamples - dh_installdirs - dh_install +override_dh_install: mkdir -p debian/x2gothinclient-displaymanager/usr/share/x2go/versions/ cp VERSION debian/x2gothinclient-displaymanager/usr/share/x2go/versions/VERSION.x2gothinclient-dispaymanager mkdir -p debian/x2gothinclient-minidesktop/usr/share/x2go/versions/ cp VERSION debian/x2gothinclient-minidesktop/usr/share/x2go/versions/VERSION.x2gothinclient-minidesktop mkdir -p debian/x2gothinclient-management/usr/share/x2go/versions/ cp VERSION debian/x2gothinclient-management/usr/share/x2go/versions/VERSION.x2gothinclient-management - dh_installinit - dh_installman - dh_installdebconf - dh_link - dh_strip - dh_compress - dh_fixperms - dh_installdeb - dh_shlibdeps - dh_gencontrol - dh_md5sums - dh_builddeb + dh_install -binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary configure +override_dh_clean: + [ ! -f cdmanager/powerej/Makefile ] || $(MAKE) -C cdmanager/powerej distclean + dh_clean -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2gothinclient.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gothinclient. commit bb4ab6a55070e6f44181b3f42d7a2f9d5e4faea0 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Sun Jul 21 14:36:52 2019 +0200 Provide empty/dummy FreeRDPv2 known_hosts2 file if not already there. --- common/etc/freerdp/known_hosts | 2 +- common/etc/freerdp/known_hosts2 | 1 + debian/changelog | 2 ++ management/sbin/x2gothinclient_create | 9 ++++++++- 4 files changed, 12 insertions(+), 2 deletions(-) diff --git a/common/etc/freerdp/known_hosts b/common/etc/freerdp/known_hosts index 3367656..3040fbb 100644 --- a/common/etc/freerdp/known_hosts +++ b/common/etc/freerdp/known_hosts @@ -1 +1 @@ -# put FreeRDP's known host into this file... \ No newline at end of file +# put FreeRDP's known host into this file... (this is for FreeRDP 1.1.x) \ No newline at end of file diff --git a/common/etc/freerdp/known_hosts2 b/common/etc/freerdp/known_hosts2 new file mode 100644 index 0000000..72c16fd --- /dev/null +++ b/common/etc/freerdp/known_hosts2 @@ -0,0 +1 @@ +# put FreeRDP's known host into this file... (this is for FreeRDP 2.x) \ No newline at end of file diff --git a/debian/changelog b/debian/changelog index ee0f6f1..3f0633c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -21,6 +21,8 @@ x2gothinclient (1.5.0.1-0x2go1) UNRELEASED; urgency=medium specific theming of the desktop UI. (Closes: #1364). - Install minidesktop's background SVG to DATADIR and symlink to it in ETCDIR. + - Provide empty/dummy FreeRDPv2 known_hosts2 file if not + already there. * debian/rules: + Convert to pure debhelper rules file. diff --git a/management/sbin/x2gothinclient_create b/management/sbin/x2gothinclient_create index c044a11..2324fbc 100755 --- a/management/sbin/x2gothinclient_create +++ b/management/sbin/x2gothinclient_create @@ -107,7 +107,14 @@ ls "$SHAREDIR/etc/x2gothinclient_init.d" | while read init_part; do done mkdir -p "$TC_CONFIG/freerdp" -test -f "$TC_CONFIG/freerdp/known_hosts" || echo "# X2Go TCE: validate allowed RDP servers with their fingerprints through this file" > "$TC_CONFIG/freerdp/known_hosts" +if [ "x$TC_DISTRO_CODENAME" = "xstretch" ] || [ "x$TC_DISTRO_CODENAME" = "xjessie" ]; then + # this is for FreeRDP v1.1.x (as found in Debian jessie and stretch) + test -f "$TC_CONFIG/freerdp/known_hosts" || echo "# X2Go TCE: validate allowed RDP servers with their fingerprints through this file" > "$TC_CONFIG/freerdp/known_hosts" +else + # this is for FreeRDP v2.x (as found in buster and beyond), let's presume that this + # "else" clause means: all distro versions more recent than stretch or jessie + test -f "$TC_CONFIG/freerdp/known_hosts2" || echo "# X2Go TCE: validate allowed RDP servers with their fingerprints through this file" > "$TC_CONFIG/freerdp/known_hosts2" +fi apt-get install debootstrap mkdir -p "$TC_CHROOT" -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2gothinclient.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gothinclient. commit 97fbabc9b60e7ba9064eead7aa1e7815f23b5085 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Sun Jul 21 14:39:01 2019 +0200 Remove Qt5 build cruft from cdmanager/powerej/. --- debian/changelog | 1 + debian/rules | 1 + 2 files changed, 2 insertions(+) diff --git a/debian/changelog b/debian/changelog index 3f0633c..750c60b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -25,6 +25,7 @@ x2gothinclient (1.5.0.1-0x2go1) UNRELEASED; urgency=medium already there. * debian/rules: + Convert to pure debhelper rules file. + + Remove Qt5 build cruft from cdmanager/powerej/. -- X2Go Release Manager <git-admin@x2go.org> Sun, 02 Dec 2018 06:49:42 +0100 diff --git a/debian/rules b/debian/rules index f4e7f32..1c04129 100755 --- a/debian/rules +++ b/debian/rules @@ -30,4 +30,5 @@ override_dh_install: override_dh_clean: [ ! -f cdmanager/powerej/Makefile ] || $(MAKE) -C cdmanager/powerej distclean + rm -f cdmanager/powerej/qmake_qmake_immediate.qrc dh_clean -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2gothinclient.git
-
git-admin＠x2go.org