This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository x2goserver. from aaa5b22 x2goserver-printing/bin/x2goprint: work around atomicity problems with newer FUSE versions, create .ready file as .notready, move/copy to target file system and only then rename it in a hopefully atomic fashion. new 08fe08f debian/*.{pre,post}*: rework scriptlets, use updated templates, add missing templates, more and better quoting, fix other misc. errors within the scripts. new 2a17a35 *.{8,5}: pre-release date update. new 37890c4 debian/x2goserver.postinst: when testing for existence of /etc/x2go/applications, also consider it being a dangling symlink (dangling symlinks are not caught by 'test -e', but need a 'test -L'. Thanks to Andreas Beckmann for helping with this. (Closes: DBTS#904515). new 4b5d2aa x2goserver.spec: backport dangling symlink check for /etc/x2go/applications. new 3172309 debian/: rename x2goserver.dirs to x2goserver-common.dirs, moving /var/lib/x2go to the -common package. new f90454c debian/: new file x2goserver-printing.dirs: own /var/spool/x2goprint. new a7b1e01 debian/x2goserver-printing.postrm: Remove x2goprint's spool dir on purgal. new 6104c91 debian/x2goserver-common.postrm: properly purge /etc/x2go and /var/lib/x2go. new fd3f257 debian/libx2go-server-db-perl.postrm: remove empty directory on purge if possible. new 88e90d6 debian/x2goserver-common.postrm: only remove files that the package actually owns (/etc/x2go/x2gosql/sql). new dad7320 debian/libx2go-server-db-perl.postrm: only remove files that the package actually created. new bdd63a8 debian/control: multiarch hinter script recommends annotating perl dependency with :any. new 5776f04 debian/control: Bump Standards-Version: to 4.1.4. No changes needed. The 13 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: debian/changelog | 26 +++++++++++++ debian/control | 4 +- debian/libx2go-server-db-perl.postinst | 44 +++++++++++----------- debian/libx2go-server-db-perl.postrm | 40 ++++++++++---------- debian/libx2go-server-db-perl.prerm | 17 +++++---- debian/{x2goserver.dirs => x2goserver-common.dirs} | 0 debian/x2goserver-common.postinst | 2 +- debian/x2goserver-common.postrm | 24 ++++++++---- debian/x2goserver-common.preinst | 2 +- debian/x2goserver-fmbindings.postinst | 8 ++-- debian/x2goserver-fmbindings.postrm | 6 +-- debian/x2goserver-printing.dirs | 1 + debian/x2goserver-printing.postinst | 2 +- debian/x2goserver-printing.postrm | 6 ++- debian/x2goserver.postinst | 9 ++++- debian/x2goserver.postrm | 6 +-- debian/x2goserver.preinst | 2 +- debian/x2goserver.prerm | 2 +- x2goserver-common/man/man5/x2goserver.conf.5 | 2 +- .../man/man8/x2goserver-run-extensions.8 | 2 +- x2goserver-fmbindings/man/man8/x2gofm.8 | 2 +- x2goserver-printing/man/man8/x2goprint.8 | 2 +- x2goserver.spec | 8 +++- x2goserver/man/man5/x2goserver.conf.5 | 2 +- x2goserver/man/man8/x2gobasepath.8 | 2 +- x2goserver/man/man8/x2gocmdexitmessage.8 | 2 +- x2goserver/man/man8/x2godbadmin.8 | 2 +- x2goserver/man/man8/x2gofeature.8 | 2 +- x2goserver/man/man8/x2gofeaturelist.8 | 2 +- x2goserver/man/man8/x2gogetapps.8 | 2 +- x2goserver/man/man8/x2gogetservers.8 | 2 +- x2goserver/man/man8/x2golistdesktops.8 | 2 +- x2goserver/man/man8/x2golistmounts.8 | 2 +- x2goserver/man/man8/x2golistsessions.8 | 2 +- x2goserver/man/man8/x2golistsessions_root.8 | 2 +- x2goserver/man/man8/x2golistshadowsessions.8 | 2 +- x2goserver/man/man8/x2gomountdirs.8 | 2 +- x2goserver/man/man8/x2gopath.8 | 2 +- x2goserver/man/man8/x2goresume-session.8 | 2 +- x2goserver/man/man8/x2goruncommand.8 | 2 +- x2goserver/man/man8/x2gosessionlimit.8 | 2 +- x2goserver/man/man8/x2gosetkeyboard.8 | 2 +- x2goserver/man/man8/x2goshowblocks.8 | 2 +- x2goserver/man/man8/x2gostartagent.8 | 2 +- x2goserver/man/man8/x2gosuspend-session.8 | 2 +- x2goserver/man/man8/x2goterminate-session.8 | 2 +- x2goserver/man/man8/x2goumount-session.8 | 2 +- x2goserver/man/man8/x2goversion.8 | 2 +- 48 files changed, 157 insertions(+), 110 deletions(-) rename debian/{x2goserver.dirs => x2goserver-common.dirs} (100%) create mode 100644 debian/x2goserver-printing.dirs -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goserver. commit 08fe08f348b76748efe07e618c32b10559aa1966 Author: Mihai Moldovan <ionic@ionic.de> Date: Thu Jul 26 23:37:21 2018 +0200 debian/*.{pre,post}*: rework scriptlets, use updated templates, add missing templates, more and better quoting, fix other misc. errors within the scripts. --- debian/changelog | 3 +++ debian/libx2go-server-db-perl.postinst | 44 ++++++++++++++++------------------ debian/libx2go-server-db-perl.postrm | 41 ++++++++++++++++--------------- debian/libx2go-server-db-perl.prerm | 17 ++++++------- debian/x2goserver-common.postinst | 2 +- debian/x2goserver-common.postrm | 17 +++++++------ debian/x2goserver-common.preinst | 2 +- debian/x2goserver-fmbindings.postinst | 8 +++---- debian/x2goserver-fmbindings.postrm | 6 ++--- debian/x2goserver-printing.postinst | 2 +- debian/x2goserver-printing.postrm | 4 ++-- debian/x2goserver.postinst | 2 +- debian/x2goserver.postrm | 6 ++--- debian/x2goserver.preinst | 2 +- debian/x2goserver.prerm | 2 +- 15 files changed, 81 insertions(+), 77 deletions(-) diff --git a/debian/changelog b/debian/changelog index cc5df9c..70fb636 100644 --- a/debian/changelog +++ b/debian/changelog @@ -184,6 +184,9 @@ x2goserver (4.1.0.1-0x2go1) UNRELEASED; urgency=medium * debian/{libx2go-server-db-perl,x2goserver{,-common}}.postrm: + Do not try to run rmdir on /etc/x2go if it doesn't exist. Makes the scriptlet (and thus the purge operation) fail... + * debian/*.{pre,post}*: + + Rework scriptlets, use updated templates, add missing templates, more + and better quoting, fix other misc. errors within the scripts. -- X2Go Release Manager <git-admin@x2go.org> Thu, 15 Feb 2018 23:14:28 +0100 diff --git a/debian/libx2go-server-db-perl.postinst b/debian/libx2go-server-db-perl.postinst index dd97f67..5a99ff5 100755 --- a/debian/libx2go-server-db-perl.postinst +++ b/debian/libx2go-server-db-perl.postinst @@ -18,18 +18,18 @@ set -e # the debian-policy package -case "$1" in - configure) - mkdir -p /etc/x2go/x2gosql/passwords - chmod 700 /etc/x2go/x2gosql/passwords - touch /etc/x2go/x2gosql/passwords/pgadmin - chmod 600 /etc/x2go/x2gosql/passwords/pgadmin - touch /etc/x2go/x2gosql/passwords/mysqladmin - chmod 600 /etc/x2go/x2gosql/passwords/mysqladmin +case "${1}" in + 'configure') + mkdir -p '/etc/x2go/x2gosql/passwords' + chmod '700' '/etc/x2go/x2gosql/passwords' + touch '/etc/x2go/x2gosql/passwords/pgadmin' + chmod '600' '/etc/x2go/x2gosql/passwords/pgadmin' + touch '/etc/x2go/x2gosql/passwords/mysqladmin' + chmod '600' '/etc/x2go/x2gosql/passwords/mysqladmin' # the SQLite3 X2Go session db has to be accessed as uid x2gouser - if ! dpkg-statoverride --list /usr/lib/x2go/libx2go-server-db-sqlite3-wrapper >/dev/null; then - dpkg-statoverride --add --update root x2gouser 2755 /usr/lib/x2go/libx2go-server-db-sqlite3-wrapper + if ! dpkg-statoverride --list '/usr/lib/x2go/libx2go-server-db-sqlite3-wrapper' >'/dev/null'; then + dpkg-statoverride --add --update 'root' 'x2gouser' '2755' '/usr/lib/x2go/libx2go-server-db-sqlite3-wrapper' fi # setup up SQLite3 database, do nothing if PostgeSQL is already configured @@ -37,30 +37,30 @@ case "$1" in # Note: The below code exists in x2goserver.postinst and libx2go-server-db.postinst # It will only succeed if both packages are installed. As we cannot influence the # installation order, we handle the session DB creation in both packages. One of - # then should succeed. - if [ -x /usr/sbin/x2godbadmin ] && [ -f /etc/x2go/x2gosql/sql ] && egrep "^backend=sqlite.*" /etc/x2go/x2gosql/sql 1>/dev/null; then - if [ ! -f /var/lib/x2go/x2go_sessions ]; then + # them should succeed. + if [ -x '/usr/sbin/x2godbadmin' ] && [ -f '/etc/x2go/x2gosql/sql' ] && egrep '^backend=sqlite.*' '/etc/x2go/x2gosql/sql' 1>'/dev/null'; then + if [ ! -f '/var/lib/x2go/x2go_sessions' ]; then x2godbadmin --createdb else # make sure db permissions are set correctly - chown -R root:x2gouser /var/lib/x2go + chown -R 'root:x2gouser' '/var/lib/x2go' # egid x2gouser needs write access to the db dir (for temporary db journal file) - chmod 0770 /var/lib/x2go + chmod '0770' '/var/lib/x2go' # ... and to the db file itself, of course - chmod 0660 /var/lib/x2go/x2go_sessions + chmod '0660' '/var/lib/x2go/x2go_sessions' x2godbadmin --updatedb fi else - echo "X2Go is configured to use a non-SQLite DB backend, leaving the database alone." + echo 'X2Go is configured to use a non-SQLite DB backend, leaving the database alone.' fi ;; - abort-upgrade|abort-remove|abort-deconfigure) + 'abort-upgrade'|'abort-remove'|'abort-deconfigure') ;; *) - echo "postinst called with unknown argument \`$1'" >&2 - exit 1 + echo "postinst called with unknown argument '${1}'" >&2 + exit '1' ;; esac @@ -69,6 +69,4 @@ esac #DEBHELPER# -exit 0 - - +exit '0' diff --git a/debian/libx2go-server-db-perl.postrm b/debian/libx2go-server-db-perl.postrm index 2cf62c0..44229a7 100755 --- a/debian/libx2go-server-db-perl.postrm +++ b/debian/libx2go-server-db-perl.postrm @@ -1,7 +1,8 @@ -#! /bin/sh +#!/bin/sh # postrm script for libx2go-server-db-perl -# -# see: dh_installdeb(1) + +set -e + # summary of how this script can be called: # * <postrm> `remove' # * <postrm> `purge' @@ -10,29 +11,27 @@ # * <new-postrm> `abort-install' # * <new-postrm> `abort-install' <old-version> # * <new-postrm> `abort-upgrade' <old-version> -# * <disappearer's-postrm> `disappear' <r>overwrit>r> <new-version> -# for details, see /usr/share/doc/packaging-manual/ - -set -e - - -case "$1" in +# * <disappearer's-postrm> `disappear' <overwriter> +# <overwriter-version> +# for details, see http://www.debian.org/doc/debian-policy/ or +# the debian-policy package - purge) - echo "Removing X2Go session database" >&2 - rm -vf /var/lib/x2go/x2go_sessions - rm -vf /etc/x2go/x2gosql/passwords/pgadmin - rm -vf /etc/x2go/x2gosql/passwords/mysqladmin - rm -Rf /etc/x2go/sql - [ -d '/etc/x2go' ] && rmdir --ignore-fail-on-non-empty /etc/x2go +case "${1}" in + 'purge') + echo 'Removing X2Go session database' >&2 + rm -vf '/var/lib/x2go/x2go_sessions' + rm -vf '/etc/x2go/x2gosql/passwords/pgadmin' + rm -vf '/etc/x2go/x2gosql/passwords/mysqladmin' + rm -Rf '/etc/x2go/sql' + [ -d '/etc/x2go' ] && rmdir --ignore-fail-on-non-empty '/etc/x2go' ;; - remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) + 'remove'|'upgrade'|'failed-upgrade'|'abort-install'|'abort-upgrade'|'disappear') ;; *) - echo "postrm called with unknown argument \`$1'" >&2 - exit 0 + echo "postrm called with unknown argument '${1}'" >&2 + exit '1' ;; esac @@ -41,4 +40,4 @@ esac #DEBHELPER# -exit 0 +exit '0' diff --git a/debian/libx2go-server-db-perl.prerm b/debian/libx2go-server-db-perl.prerm index 67a3d51..d1ce62f 100755 --- a/debian/libx2go-server-db-perl.prerm +++ b/debian/libx2go-server-db-perl.prerm @@ -16,17 +16,18 @@ set -e -case "$1" in - remove) - if dpkg-statoverride --list /usr/lib/x2go/libx2go-server-db-sqlite3-wrapper >/dev/null; then - dpkg-statoverride --remove /usr/lib/x2go/libx2go-server-db-sqlite3-wrapper +case "${1}" in + 'remove') + if dpkg-statoverride --list '/usr/lib/x2go/libx2go-server-db-sqlite3-wrapper' >'/dev/null'; then + dpkg-statoverride --remove '/usr/lib/x2go/libx2go-server-db-sqlite3-wrapper' fi ;; - deconfigure|upgrade|failed-upgrade) + 'deconfigure'|'upgrade'|'failed-upgrade') : ;; - *) echo "$0: didn't understand being called with \`$1'" 1>&2 - exit 1;; + *) echo "${0}: didn't understand being called with '${1}'" 1>&2 + exit '1' + ;; esac # dh_installdeb will replace this with shell code automatically @@ -34,4 +35,4 @@ esac #DEBHELPER# -exit 0 +exit '0' diff --git a/debian/x2goserver-common.postinst b/debian/x2goserver-common.postinst index a49c10e..3fc3216 100755 --- a/debian/x2goserver-common.postinst +++ b/debian/x2goserver-common.postinst @@ -64,7 +64,7 @@ case "${1}" in 'abort-upgrade'|'abort-remove'|'abort-deconfigure') ;; *) - echo "postinst called with unknown argument \`${1}'" >&2 + echo "postinst called with unknown argument '${1}'" >&2 exit '1' ;; esac diff --git a/debian/x2goserver-common.postrm b/debian/x2goserver-common.postrm index 7b020f9..201b27e 100755 --- a/debian/x2goserver-common.postrm +++ b/debian/x2goserver-common.postrm @@ -1,7 +1,8 @@ -#! /bin/sh +#!/bin/sh # postrm script for x2goserver -# -# see: dh_installdeb(1) + +set -e + # summary of how this script can be called: # * <postrm> `remove' # * <postrm> `purge' @@ -10,8 +11,10 @@ # * <new-postrm> `abort-install' # * <new-postrm> `abort-install' <old-version> # * <new-postrm> `abort-upgrade' <old-version> -# * <disappearer's-postrm> `disappear' <r>overwrit>r> <new-version> -# for details, see /usr/share/doc/packaging-manual/ +# * <disappearer's-postrm> `disappear' <overwriter> +# <overwriter-version> +# for details, see http://www.debian.org/doc/debian-policy/ or +# the debian-policy package set -e @@ -29,8 +32,8 @@ case "${1}" in 'remove'|'upgrade'|'failed-upgrade'|'abort-install'|'abort-upgrade'|'disappear') ;; *) - echo "postrm called with unknown argument \`${1}'" >&2 - exit '0' + echo "postrm called with unknown argument '${1}'" >&2 + exit '1' ;; esac diff --git a/debian/x2goserver-common.preinst b/debian/x2goserver-common.preinst index be9af4b..ac334ea 100755 --- a/debian/x2goserver-common.preinst +++ b/debian/x2goserver-common.preinst @@ -30,7 +30,7 @@ case "${1}" in 'abort-upgrade') ;; *) - echo "preinst called with unknown argument \`${1}'" >&2 + echo "preinst called with unknown argument '${1}'" >&2 exit '1' ;; esac diff --git a/debian/x2goserver-fmbindings.postinst b/debian/x2goserver-fmbindings.postinst index 25c9093..647a3a6 100755 --- a/debian/x2goserver-fmbindings.postinst +++ b/debian/x2goserver-fmbindings.postinst @@ -21,13 +21,13 @@ case "${1}" in 'configure') update-desktop-database update-mime-database '/usr/share/mime' - ;; + ;; 'abort-upgrade'|'abort-remove'|'abort-deconfigure') - ;; + ;; *) - echo "postinst called with unknown argument \`${1}'" >&2 + echo "postinst called with unknown argument '${1}'" >&2 exit '1' - ;; + ;; esac # dh_installdeb will replace this with shell code automatically diff --git a/debian/x2goserver-fmbindings.postrm b/debian/x2goserver-fmbindings.postrm index 7d3c3e0..7880810 100755 --- a/debian/x2goserver-fmbindings.postrm +++ b/debian/x2goserver-fmbindings.postrm @@ -22,11 +22,11 @@ case "${1}" in 'purge'|'remove'|'upgrade'|'failed-upgrade'|'abort-install'|'abort-upgrade'|'disappear') update-desktop-database update-mime-database '/usr/share/mime' - ;; + ;; *) - echo "postrm called with unknown argument \`${1}'" >&2 + echo "postrm called with unknown argument '${1}'" >&2 exit '1' - ;; + ;; esac # dh_installdeb will replace this with shell code automatically diff --git a/debian/x2goserver-printing.postinst b/debian/x2goserver-printing.postinst index 2977564..3d7cf9f 100755 --- a/debian/x2goserver-printing.postinst +++ b/debian/x2goserver-printing.postinst @@ -78,7 +78,7 @@ case "${1}" in ;; *) - echo "postinst called with unknown argument \`${1}'" >&2 + echo "postinst called with unknown argument '${1}'" >&2 exit '1' ;; esac diff --git a/debian/x2goserver-printing.postrm b/debian/x2goserver-printing.postrm index 171be49..e575deb 100755 --- a/debian/x2goserver-printing.postrm +++ b/debian/x2goserver-printing.postrm @@ -24,8 +24,8 @@ case "${1}" in 'remove'|'upgrade'|'failed-upgrade'|'abort-install'|'abort-upgrade'|'disappear') ;; *) - echo "postrm called with unknown argument \`${1}'" >&2 - exit '0' + echo "postrm called with unknown argument '${1}'" >&2 + exit '1' ;; esac diff --git a/debian/x2goserver.postinst b/debian/x2goserver.postinst index b7f64e4..7c73421 100755 --- a/debian/x2goserver.postinst +++ b/debian/x2goserver.postinst @@ -79,7 +79,7 @@ case "${1}" in 'abort-upgrade'|'abort-remove'|'abort-deconfigure') ;; *) - echo "postinst called with unknown argument \`${1}'" >&2 + echo "postinst called with unknown argument '${1}'" >&2 exit '1' ;; esac diff --git a/debian/x2goserver.postrm b/debian/x2goserver.postrm index 3bf0d0f..f07a4dd 100755 --- a/debian/x2goserver.postrm +++ b/debian/x2goserver.postrm @@ -12,7 +12,7 @@ set -e # * <new-postrm> `abort-install' # * <new-postrm> `abort-install' <old-version> # * <new-postrm> `abort-upgrade' <old-version> -# * <disappearer's-postrm> `disappear' <overwriter>i +# * <disappearer's-postrm> `disappear' <overwriter> # <overwriter-version> # for details, see /usr/share/doc/packaging-manual/ @@ -29,8 +29,8 @@ case "${1}" in 'remove'|'upgrade'|'failed-upgrade'|'abort-install'|'abort-upgrade'|'disappear') ;; *) - echo "postrm called with unknown argument \`${1}'" >&2 - exit '0' + echo "postrm called with unknown argument '${1}'" >&2 + exit '1' ;; esac diff --git a/debian/x2goserver.preinst b/debian/x2goserver.preinst index 8fd3ef3..ba90aa2 100755 --- a/debian/x2goserver.preinst +++ b/debian/x2goserver.preinst @@ -22,7 +22,7 @@ case "${1}" in 'abort-upgrade') ;; *) - echo "preinst called with unknown argument \`${1}'" >&2 + echo "preinst called with unknown argument '${1}'" >&2 exit '1' ;; esac diff --git a/debian/x2goserver.prerm b/debian/x2goserver.prerm index 99ebc5f..0bb6e91 100755 --- a/debian/x2goserver.prerm +++ b/debian/x2goserver.prerm @@ -26,7 +26,7 @@ case "${1}" in : ;; *) - echo "${0}: didn't understand being called with \`${1}'" 1>&2 + echo "${0}: didn't understand being called with '${1}'" 1>&2 exit '1' ;; esac -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goserver. commit 2a17a353b486721baa3c08676068898b24fece65 Author: Mihai Moldovan <ionic@ionic.de> Date: Fri Jul 27 00:01:27 2018 +0200 *.{8,5}: pre-release date update. --- debian/changelog | 1 + x2goserver-common/man/man5/x2goserver.conf.5 | 2 +- x2goserver-extensions/man/man8/x2goserver-run-extensions.8 | 2 +- x2goserver-fmbindings/man/man8/x2gofm.8 | 2 +- x2goserver-printing/man/man8/x2goprint.8 | 2 +- x2goserver/man/man5/x2goserver.conf.5 | 2 +- x2goserver/man/man8/x2gobasepath.8 | 2 +- x2goserver/man/man8/x2gocmdexitmessage.8 | 2 +- x2goserver/man/man8/x2godbadmin.8 | 2 +- x2goserver/man/man8/x2gofeature.8 | 2 +- x2goserver/man/man8/x2gofeaturelist.8 | 2 +- x2goserver/man/man8/x2gogetapps.8 | 2 +- x2goserver/man/man8/x2gogetservers.8 | 2 +- x2goserver/man/man8/x2golistdesktops.8 | 2 +- x2goserver/man/man8/x2golistmounts.8 | 2 +- x2goserver/man/man8/x2golistsessions.8 | 2 +- x2goserver/man/man8/x2golistsessions_root.8 | 2 +- x2goserver/man/man8/x2golistshadowsessions.8 | 2 +- x2goserver/man/man8/x2gomountdirs.8 | 2 +- x2goserver/man/man8/x2gopath.8 | 2 +- x2goserver/man/man8/x2goresume-session.8 | 2 +- x2goserver/man/man8/x2goruncommand.8 | 2 +- x2goserver/man/man8/x2gosessionlimit.8 | 2 +- x2goserver/man/man8/x2gosetkeyboard.8 | 2 +- x2goserver/man/man8/x2goshowblocks.8 | 2 +- x2goserver/man/man8/x2gostartagent.8 | 2 +- x2goserver/man/man8/x2gosuspend-session.8 | 2 +- x2goserver/man/man8/x2goterminate-session.8 | 2 +- x2goserver/man/man8/x2goumount-session.8 | 2 +- x2goserver/man/man8/x2goversion.8 | 2 +- 30 files changed, 30 insertions(+), 29 deletions(-) diff --git a/debian/changelog b/debian/changelog index 70fb636..4d694ce 100644 --- a/debian/changelog +++ b/debian/changelog @@ -122,6 +122,7 @@ x2goserver (4.1.0.1-0x2go1) UNRELEASED; urgency=medium newer FUSE versions, create .ready file as .notready, move/copy to target file system and only then rename it in a hopefully atomic fashion. + - *.{8,5}: pre-release date update. * debian/{control,compat}: + Bump DH compat level to 9. * debian/: diff --git a/x2goserver-common/man/man5/x2goserver.conf.5 b/x2goserver-common/man/man5/x2goserver.conf.5 index eaf7ed2..806fad4 100644 --- a/x2goserver-common/man/man5/x2goserver.conf.5 +++ b/x2goserver-common/man/man5/x2goserver.conf.5 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2goserver.conf 5 "Feb 2018" "Version 4.1.0.1" "X2Go Server Configuration" +.TH x2goserver.conf 5 "Jul 2018" "Version 4.1.0.1" "X2Go Server Configuration" .SH NAME x2goserver.conf \- X2Go Server Main Configuration File .SH SYNOPSIS diff --git a/x2goserver-extensions/man/man8/x2goserver-run-extensions.8 b/x2goserver-extensions/man/man8/x2goserver-run-extensions.8 index c909e56..4d7864e 100644 --- a/x2goserver-extensions/man/man8/x2goserver-run-extensions.8 +++ b/x2goserver-extensions/man/man8/x2goserver-run-extensions.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2goserver-run-extensions 8 "Feb 2018" "Version 4.1.0.1" "X2Go Server Tool" +.TH x2goserver-run-extensions 8 "Jul 2018" "Version 4.1.0.1" "X2Go Server Tool" .SH NAME x2goserver-run-extensions \- Run X2Go Server Extensions .SH SYNOPSIS diff --git a/x2goserver-fmbindings/man/man8/x2gofm.8 b/x2goserver-fmbindings/man/man8/x2gofm.8 index d28527b..9dddbd4 100644 --- a/x2goserver-fmbindings/man/man8/x2gofm.8 +++ b/x2goserver-fmbindings/man/man8/x2gofm.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2gofm 8 "Feb 2018" "Version 4.1.0.1" "X2Go Server" +.TH x2gofm 8 "Jul 2018" "Version 4.1.0.1" "X2Go Server" .SH NAME x2gofm \- X2Go wrapper for Browsing X2Go Shared Folders .SH SYNOPSIS diff --git a/x2goserver-printing/man/man8/x2goprint.8 b/x2goserver-printing/man/man8/x2goprint.8 index 84ed0e9..00b2541 100644 --- a/x2goserver-printing/man/man8/x2goprint.8 +++ b/x2goserver-printing/man/man8/x2goprint.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2goprint 8 "Feb 2018" "Version 4.1.0.1" "X2Go Server Tool" +.TH x2goprint 8 "Jul 2018" "Version 4.1.0.1" "X2Go Server Tool" .SH NAME x2goprint \- Process X2Go Print Job .SH SYNOPSIS diff --git a/x2goserver/man/man5/x2goserver.conf.5 b/x2goserver/man/man5/x2goserver.conf.5 index eaf7ed2..806fad4 100644 --- a/x2goserver/man/man5/x2goserver.conf.5 +++ b/x2goserver/man/man5/x2goserver.conf.5 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2goserver.conf 5 "Feb 2018" "Version 4.1.0.1" "X2Go Server Configuration" +.TH x2goserver.conf 5 "Jul 2018" "Version 4.1.0.1" "X2Go Server Configuration" .SH NAME x2goserver.conf \- X2Go Server Main Configuration File .SH SYNOPSIS diff --git a/x2goserver/man/man8/x2gobasepath.8 b/x2goserver/man/man8/x2gobasepath.8 index 59f0e90..311570a 100644 --- a/x2goserver/man/man8/x2gobasepath.8 +++ b/x2goserver/man/man8/x2gobasepath.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2gobasepath 8 "Feb 2018" "Version 4.1.0.1" "X2Go Server Tool" +.TH x2gobasepath 8 "Jul 2018" "Version 4.1.0.1" "X2Go Server Tool" .SH NAME x2gobasepath \- Detect Base Path of X2Go Server Installation .SH SYNOPSIS diff --git a/x2goserver/man/man8/x2gocmdexitmessage.8 b/x2goserver/man/man8/x2gocmdexitmessage.8 index 6bccf21..57e6e2e 100644 --- a/x2goserver/man/man8/x2gocmdexitmessage.8 +++ b/x2goserver/man/man8/x2gocmdexitmessage.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2gocmdexitmessage 8 "Feb 2018" "Version 4.1.0.1" "X2Go Server Tool" +.TH x2gocmdexitmessage 8 "Jul 2018" "Version 4.1.0.1" "X2Go Server Tool" .SH NAME x2gocmdexitmessage \- Exit Message of X2Go Command .SH SYNOPSIS diff --git a/x2goserver/man/man8/x2godbadmin.8 b/x2goserver/man/man8/x2godbadmin.8 index 000d019..74b79bf 100644 --- a/x2goserver/man/man8/x2godbadmin.8 +++ b/x2goserver/man/man8/x2godbadmin.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2godbadmin 8 "Feb 2018" "Version 4.1.0.1" "X2Go Server Admin Tool" +.TH x2godbadmin 8 "Jul 2018" "Version 4.1.0.1" "X2Go Server Admin Tool" .SH NAME x2godbadmin \- X2Go Server Database Administrator .SH SYNOPSIS diff --git a/x2goserver/man/man8/x2gofeature.8 b/x2goserver/man/man8/x2gofeature.8 index 75c6446..d30b681 100644 --- a/x2goserver/man/man8/x2gofeature.8 +++ b/x2goserver/man/man8/x2gofeature.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2gofeature 8 "Feb 2018" "Version 4.1.0.1" "X2Go Server Tool" +.TH x2gofeature 8 "Jul 2018" "Version 4.1.0.1" "X2Go Server Tool" .SH NAME x2gofeature \- Query X2Go Feature Availability on X2Go Server .SH SYNOPSIS diff --git a/x2goserver/man/man8/x2gofeaturelist.8 b/x2goserver/man/man8/x2gofeaturelist.8 index 44328ad..169ef50 100644 --- a/x2goserver/man/man8/x2gofeaturelist.8 +++ b/x2goserver/man/man8/x2gofeaturelist.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2gofeaturelist 8 "Feb 2018" "Version 4.1.0.1" "X2Go Server Tool" +.TH x2gofeaturelist 8 "Jul 2018" "Version 4.1.0.1" "X2Go Server Tool" .SH NAME x2gofeaturelist \- Query X2Go Feature List for X2Go Server .SH SYNOPSIS diff --git a/x2goserver/man/man8/x2gogetapps.8 b/x2goserver/man/man8/x2gogetapps.8 index ce3ceb6..3155128 100644 --- a/x2goserver/man/man8/x2gogetapps.8 +++ b/x2goserver/man/man8/x2gogetapps.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2gogetapps 8 "Feb 2018" "Version 4.1.0.1" "X2Go Server Tool" +.TH x2gogetapps 8 "Jul 2018" "Version 4.1.0.1" "X2Go Server Tool" .SH NAME x2gogetapps \- Generate list of Published Applications .SH SYNOPSIS diff --git a/x2goserver/man/man8/x2gogetservers.8 b/x2goserver/man/man8/x2gogetservers.8 index ae219f3..8d1bb59 100644 --- a/x2goserver/man/man8/x2gogetservers.8 +++ b/x2goserver/man/man8/x2gogetservers.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2gogetservers 8 "Feb 2018" "Version 4.1.0.1" "X2Go Server Tool" +.TH x2gogetservers 8 "Jul 2018" "Version 4.1.0.1" "X2Go Server Tool" .SH NAME x2gogetservers \- Retrieve list of available X2Go servers .SH SYNOPSIS diff --git a/x2goserver/man/man8/x2golistdesktops.8 b/x2goserver/man/man8/x2golistdesktops.8 index 636be40..48621f3 100644 --- a/x2goserver/man/man8/x2golistdesktops.8 +++ b/x2goserver/man/man8/x2golistdesktops.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2golistdesktops 8 "Feb 2018" "Version 4.1.0.1" "X2Go Server Tool" +.TH x2golistdesktops 8 "Jul 2018" "Version 4.1.0.1" "X2Go Server Tool" .SH NAME x2golistdesktops \- List Available X Desktops .SH SYNOPSIS diff --git a/x2goserver/man/man8/x2golistmounts.8 b/x2goserver/man/man8/x2golistmounts.8 index cd86b4c..178e66a 100644 --- a/x2goserver/man/man8/x2golistmounts.8 +++ b/x2goserver/man/man8/x2golistmounts.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2golistmounts 8 "Feb 2018" "Version 4.1.0.1" "X2Go Server Tool" +.TH x2golistmounts 8 "Jul 2018" "Version 4.1.0.1" "X2Go Server Tool" .SH NAME x2golistmounts \- List Mounted Shares for an X2Go Session .SH SYNOPSIS diff --git a/x2goserver/man/man8/x2golistsessions.8 b/x2goserver/man/man8/x2golistsessions.8 index f88099d..e86ba49 100644 --- a/x2goserver/man/man8/x2golistsessions.8 +++ b/x2goserver/man/man8/x2golistsessions.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2golistsessions 8 "Feb 2018" "Version 4.1.0.1" "X2Go Server Tool" +.TH x2golistsessions 8 "Jul 2018" "Version 4.1.0.1" "X2Go Server Tool" .SH NAME x2golistsessions \- List Available X2Go Sessions for User .SH SYNOPSIS diff --git a/x2goserver/man/man8/x2golistsessions_root.8 b/x2goserver/man/man8/x2golistsessions_root.8 index c8cfe2c..674702e 100644 --- a/x2goserver/man/man8/x2golistsessions_root.8 +++ b/x2goserver/man/man8/x2golistsessions_root.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2golistsessions_root 8 "Feb 2018" "Version 4.1.0.1" "X2Go Server Admin Tool" +.TH x2golistsessions_root 8 "Jul 2018" "Version 4.1.0.1" "X2Go Server Admin Tool" .SH NAME x2golistsessions_root \- List X2Go Sessions for System .SH SYNOPSIS diff --git a/x2goserver/man/man8/x2golistshadowsessions.8 b/x2goserver/man/man8/x2golistshadowsessions.8 index ac4a71d..4c9ed4f 100644 --- a/x2goserver/man/man8/x2golistshadowsessions.8 +++ b/x2goserver/man/man8/x2golistshadowsessions.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2golistshadowsessions 8 "Feb 2018" "Version 4.1.0.1" "X2Go Server Tool" +.TH x2golistshadowsessions 8 "Jul 2018" "Version 4.1.0.1" "X2Go Server Tool" .SH NAME x2golistshadowsessions \- List Available X2Go Shadow Sessions for User .SH SYNOPSIS diff --git a/x2goserver/man/man8/x2gomountdirs.8 b/x2goserver/man/man8/x2gomountdirs.8 index 6d1e98f..cb96451 100644 --- a/x2goserver/man/man8/x2gomountdirs.8 +++ b/x2goserver/man/man8/x2gomountdirs.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2gomountdirs 8 "Feb 2018" "Version 4.1.0.1" "X2Go Server Tool" +.TH x2gomountdirs 8 "Jul 2018" "Version 4.1.0.1" "X2Go Server Tool" .SH NAME x2gomountdirs \- Share Client-Side Folder with X2Go Session .SH SYNOPSIS diff --git a/x2goserver/man/man8/x2gopath.8 b/x2goserver/man/man8/x2gopath.8 index afdbe47..60520f9 100644 --- a/x2goserver/man/man8/x2gopath.8 +++ b/x2goserver/man/man8/x2gopath.8 @@ -1,4 +1,4 @@ -.TH x2gopath 8 "Feb 2018" "Version 4.1.0.1" "X2Go Server Tool" +.TH x2gopath 8 "Jul 2018" "Version 4.1.0.1" "X2Go Server Tool" .SH Name .PP x2gopath - Show X2Go Server installation paths diff --git a/x2goserver/man/man8/x2goresume-session.8 b/x2goserver/man/man8/x2goresume-session.8 index b30621d..23c674b 100644 --- a/x2goserver/man/man8/x2goresume-session.8 +++ b/x2goserver/man/man8/x2goresume-session.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2goresume-session 8 "Feb 2018" "Version 4.1.0.1" "X2Go Server Tool" +.TH x2goresume-session 8 "Jul 2018" "Version 4.1.0.1" "X2Go Server Tool" .SH NAME x2goresume-session \- Resume X2Go Session .SH SYNOPSIS diff --git a/x2goserver/man/man8/x2goruncommand.8 b/x2goserver/man/man8/x2goruncommand.8 index 27acad4..f034096 100644 --- a/x2goserver/man/man8/x2goruncommand.8 +++ b/x2goserver/man/man8/x2goruncommand.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2goruncommand 8 "Feb 2018" "Version 4.1.0.1" "X2Go Server Tool" +.TH x2goruncommand 8 "Jul 2018" "Version 4.1.0.1" "X2Go Server Tool" .SH NAME x2goruncommand \- Launch Command inside an X2Go Session .SH SYNOPSIS diff --git a/x2goserver/man/man8/x2gosessionlimit.8 b/x2goserver/man/man8/x2gosessionlimit.8 index d478df5..aba8c29 100644 --- a/x2goserver/man/man8/x2gosessionlimit.8 +++ b/x2goserver/man/man8/x2gosessionlimit.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2gosessionlimit 8 "Feb 2018" "Version 4.1.0.1" "X2Go Server Tool" +.TH x2gosessionlimit 8 "Jul 2018" "Version 4.1.0.1" "X2Go Server Tool" .SH NAME x2gosessionlimit \- Detect Session Limit for User or Group .SH SYNOPSIS diff --git a/x2goserver/man/man8/x2gosetkeyboard.8 b/x2goserver/man/man8/x2gosetkeyboard.8 index d120e44..1df0976 100644 --- a/x2goserver/man/man8/x2gosetkeyboard.8 +++ b/x2goserver/man/man8/x2gosetkeyboard.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2gosetkeyboard 8 "Feb 2018" "Version 4.1.0.1" "X2Go Server Tool (PyHoca)" +.TH x2gosetkeyboard 8 "Jul 2018" "Version 4.1.0.1" "X2Go Server Tool (PyHoca)" .SH NAME x2gosetkeyboard \- Allow server-side Keyboard Setting Updates issued by X2Go Client .SH SYNOPSIS diff --git a/x2goserver/man/man8/x2goshowblocks.8 b/x2goserver/man/man8/x2goshowblocks.8 index 9223416..6d0d09c 100644 --- a/x2goserver/man/man8/x2goshowblocks.8 +++ b/x2goserver/man/man8/x2goshowblocks.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2goshowblocks 8 "Feb 2018" "Version 4.1.0.1" "X2Go Server Tool" +.TH x2goshowblocks 8 "Jul 2018" "Version 4.1.0.1" "X2Go Server Tool" .SH NAME x2goshowblocks \- Show X2Go-Mounted Block Devices .SH SYNOPSIS diff --git a/x2goserver/man/man8/x2gostartagent.8 b/x2goserver/man/man8/x2gostartagent.8 index 1a4390c..56613a2 100644 --- a/x2goserver/man/man8/x2gostartagent.8 +++ b/x2goserver/man/man8/x2gostartagent.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2gostartagent 8 "Feb 2018" "Version 4.1.0.1" "X2Go Server Tool" +.TH x2gostartagent 8 "Jul 2018" "Version 4.1.0.1" "X2Go Server Tool" .SH NAME x2gostartagent \- Start a New X2Go Session .SH SYNOPSIS diff --git a/x2goserver/man/man8/x2gosuspend-session.8 b/x2goserver/man/man8/x2gosuspend-session.8 index 6037505..6836ba4 100644 --- a/x2goserver/man/man8/x2gosuspend-session.8 +++ b/x2goserver/man/man8/x2gosuspend-session.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2gosuspend-session 8 "Feb 2018" "Version 4.1.0.1" "X2Go Server Tool" +.TH x2gosuspend-session 8 "Jul 2018" "Version 4.1.0.1" "X2Go Server Tool" .SH NAME x2gosuspend-session \- Suspend an X2Go Session .SH SYNOPSIS diff --git a/x2goserver/man/man8/x2goterminate-session.8 b/x2goserver/man/man8/x2goterminate-session.8 index 9d0262a..54a9407 100644 --- a/x2goserver/man/man8/x2goterminate-session.8 +++ b/x2goserver/man/man8/x2goterminate-session.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2goterminate-session 8 "Feb 2018" "Version 4.1.0.1" "X2Go Server Tool" +.TH x2goterminate-session 8 "Jul 2018" "Version 4.1.0.1" "X2Go Server Tool" .SH NAME x2goterminate-session \- Terminate an X2Go Session .SH SYNOPSIS diff --git a/x2goserver/man/man8/x2goumount-session.8 b/x2goserver/man/man8/x2goumount-session.8 index ba06793..0ccdbea 100644 --- a/x2goserver/man/man8/x2goumount-session.8 +++ b/x2goserver/man/man8/x2goumount-session.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2goumount-session 8 "Feb 2018" "Version 4.1.0.1" "X2Go Server Tool" +.TH x2goumount-session 8 "Jul 2018" "Version 4.1.0.1" "X2Go Server Tool" .SH NAME x2goumount-session \- Unshare mounted Folders from X2Go Session .SH SYNOPSIS diff --git a/x2goserver/man/man8/x2goversion.8 b/x2goserver/man/man8/x2goversion.8 index 5bccf67..8243199 100644 --- a/x2goserver/man/man8/x2goversion.8 +++ b/x2goserver/man/man8/x2goversion.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2goversion 8 "Feb 2018" "Version 4.1.0.1" "X2Go Server Tool" +.TH x2goversion 8 "Jul 2018" "Version 4.1.0.1" "X2Go Server Tool" .SH NAME x2goversion \- Retrieve Code Versions of X2Go Server Components .SH SYNOPSIS -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goserver. commit 37890c4088837d4fc77d5077d4bd85acda768db0 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Thu Jul 26 14:35:25 2018 +0200 debian/x2goserver.postinst: when testing for existence of /etc/x2go/applications, also consider it being a dangling symlink (dangling symlinks are not caught by 'test -e', but need a 'test -L'. Thanks to Andreas Beckmann for helping with this. (Closes: DBTS#904515). Backported from a Debian patch. --- debian/changelog | 6 ++++++ debian/x2goserver.postinst | 7 ++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 4d694ce..d9e9ceb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -36,6 +36,12 @@ x2goserver (4.1.0.1-0x2go1) UNRELEASED; urgency=medium + Drop inert file (due to wrong file suffix): debian/x2goserver.link. + Drop x2goserver-xsession.links. Symlinking provided by main Makefile's install target. + * debian/x2goserver.postinst: + + When testing for existence of /etc/x2go/applications, also consider it + being a dangling symlink (dangling symlinks are not caught by 'test -e', + but need a 'test -L'. Thanks to Andreas Beckmann for helping with this. + (Closes: DBTS#904515). + Backported from a Debian patch. [ Mihai Moldovan ] * New upstream version (4.1.0.1): diff --git a/debian/x2goserver.postinst b/debian/x2goserver.postinst index 7c73421..dbaf195 100755 --- a/debian/x2goserver.postinst +++ b/debian/x2goserver.postinst @@ -51,7 +51,12 @@ case "${1}" in fi # create /etc/x2go/applications symlink if not already there (as link or as dir) - if ! test -e '/etc/x2go/applications'; then + # N.B.: dangling symlinks will lead to test -e FAILING, because the symlink is dereferenced. + # This means that without the explicit symlink check (which doesn't dereference the last + # element), the ln call would be executed and fail, since the file/symlink already exists, + # leading to this scriptlet failing and hence leading to the installation failing. + # v file doesn't exist (dereferenced!) v is not a symlink + if ! test -e '/etc/x2go/applications' && ! test -L '/etc/x2go/applications'; then ln -s '/usr/share/applications' '/etc/x2go/applications' fi -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goserver. commit 4b5d2aab2a7d762835317eb1aec8e92c0a76250d Author: Mihai Moldovan <ionic@ionic.de> Date: Fri Jul 27 00:43:26 2018 +0200 x2goserver.spec: backport dangling symlink check for /etc/x2go/applications. --- debian/changelog | 1 + x2goserver.spec | 8 ++++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index d9e9ceb..f30cba5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -147,6 +147,7 @@ x2goserver (4.1.0.1-0x2go1) UNRELEASED; urgency=medium + Move references from etc/tmpfiles.d to %{_prefix}/lib/tmpfiles.d. + Depend upon perl(DBD::mysql) for MySQL/MariaDB support in perl DBD. + Comment out perl(DBD::mysql) dependency for now. + + Backport dangling symlink check for /etc/x2go/applications. * debian/copyright.in: + Remove reference to rgb file. + Remove reference to x2goagent wrapper script. diff --git a/x2goserver.spec b/x2goserver.spec index 174b594..2fa9117 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -658,8 +658,12 @@ fi # create /etc/x2go/applications symlink if not already there # as a regular file, as a symlink, as a special file or as a directory -if ! [ -e %{_sysconfdir}/x2go/applications ]; then - ln -s %{_datadir}/applications %{_sysconfdir}/x2go/applications +# N.B.: dangling symlinks will lead to test -e FAILING, because the symlink is dereferenced. +# This means that without the explicit symlink check (which doesn't dereference the last +# element), the ln call would be executed and fail, since the file/symlink already exists, +# leading to this scriptlet failing and hence leading to the installation failing. +if ! [ -e "%{_sysconfdir}/x2go/applications" ] && ! [ -L "%{_sysconfdir}/x2go/applications" ]; then + ln -s "%{_datadir}/applications" "%{_sysconfdir}/x2go/applications" fi %if 0%{?fedora} || 0%{?rhel} >= 7 || 0%{?suse_version} >= 1210 -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goserver. commit 3172309b53d0e38c4a179f8c01358264e8838230 Author: Mihai Moldovan <ionic@ionic.de> Date: Fri Jul 27 00:49:29 2018 +0200 debian/: rename x2goserver.dirs to x2goserver-common.dirs, moving /var/lib/x2go to the -common package. --- debian/changelog | 2 ++ debian/{x2goserver.dirs => x2goserver-common.dirs} | 0 2 files changed, 2 insertions(+) diff --git a/debian/changelog b/debian/changelog index f30cba5..54948ba 100644 --- a/debian/changelog +++ b/debian/changelog @@ -137,6 +137,8 @@ x2goserver (4.1.0.1-0x2go1) UNRELEASED; urgency=medium should be correctly handled via the main Makefile and staging by *.install files. + Remove obsolete x2goserver-fmbindings.dirs file. + + Rename x2goserver.dirs to x2goserver-common.dirs, moving /var/lib/x2go + to the -common package. * debian/x2goserver-x2goagent.install: + Do not install rgb file/symlink any longer. * x2goserver.spec: diff --git a/debian/x2goserver.dirs b/debian/x2goserver-common.dirs similarity index 100% rename from debian/x2goserver.dirs rename to debian/x2goserver-common.dirs -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goserver. commit f90454c7da1765df197d18fef7df08b404f6eef2 Author: Mihai Moldovan <ionic@ionic.de> Date: Fri Jul 27 00:55:21 2018 +0200 debian/: new file x2goserver-printing.dirs: own /var/spool/x2goprint. --- debian/changelog | 1 + debian/x2goserver-printing.dirs | 1 + 2 files changed, 2 insertions(+) diff --git a/debian/changelog b/debian/changelog index 54948ba..efa5877 100644 --- a/debian/changelog +++ b/debian/changelog @@ -139,6 +139,7 @@ x2goserver (4.1.0.1-0x2go1) UNRELEASED; urgency=medium + Remove obsolete x2goserver-fmbindings.dirs file. + Rename x2goserver.dirs to x2goserver-common.dirs, moving /var/lib/x2go to the -common package. + + New file x2goserver-printing.dirs: own /var/spool/x2goprint. * debian/x2goserver-x2goagent.install: + Do not install rgb file/symlink any longer. * x2goserver.spec: diff --git a/debian/x2goserver-printing.dirs b/debian/x2goserver-printing.dirs new file mode 100644 index 0000000..2998a6d --- /dev/null +++ b/debian/x2goserver-printing.dirs @@ -0,0 +1 @@ +var/spool/x2goprint -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goserver. commit a7b1e01926cf05e563695ffd56880a72945addef Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Sat Feb 24 03:11:40 2018 +0100 debian/x2goserver-printing.postrm: Remove x2goprint's spool dir on purgal. --- debian/changelog | 2 ++ debian/x2goserver-printing.postrm | 2 ++ 2 files changed, 4 insertions(+) diff --git a/debian/changelog b/debian/changelog index efa5877..f476227 100644 --- a/debian/changelog +++ b/debian/changelog @@ -42,6 +42,8 @@ x2goserver (4.1.0.1-0x2go1) UNRELEASED; urgency=medium but need a 'test -L'. Thanks to Andreas Beckmann for helping with this. (Closes: DBTS#904515). Backported from a Debian patch. + * debian/x2goserver-printing.postrm: + + Remove x2goprint's spool dir on purgal. [ Mihai Moldovan ] * New upstream version (4.1.0.1): diff --git a/debian/x2goserver-printing.postrm b/debian/x2goserver-printing.postrm index e575deb..f881fbd 100755 --- a/debian/x2goserver-printing.postrm +++ b/debian/x2goserver-printing.postrm @@ -20,6 +20,8 @@ case "${1}" in 'purge') getent 'passwd' 'x2goprint' >'/dev/null' && deluser 'x2goprint' getent 'group' 'x2goprint' >'/dev/null' && delgroup 'x2goprint' + + rm -Rf '/var/spool/x2goprint' ;; 'remove'|'upgrade'|'failed-upgrade'|'abort-install'|'abort-upgrade'|'disappear') ;; -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goserver. commit 6104c91e5971ac201fa4da4812c6e6ac6ded9717 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Sat Feb 24 03:25:26 2018 +0100 debian/x2goserver-common.postrm: properly purge /etc/x2go and /var/lib/x2go. --- debian/changelog | 2 ++ debian/x2goserver-common.postrm | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index f476227..4e1f1e4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -44,6 +44,8 @@ x2goserver (4.1.0.1-0x2go1) UNRELEASED; urgency=medium Backported from a Debian patch. * debian/x2goserver-printing.postrm: + Remove x2goprint's spool dir on purgal. + * debian/x2goserver-common.postrm: + + Properly purge /etc/x2go and /var/lib/x2go. [ Mihai Moldovan ] * New upstream version (4.1.0.1): diff --git a/debian/x2goserver-common.postrm b/debian/x2goserver-common.postrm index 201b27e..3d90471 100755 --- a/debian/x2goserver-common.postrm +++ b/debian/x2goserver-common.postrm @@ -27,6 +27,10 @@ case "${1}" in getent 'group' 'x2gouser' >'/dev/null' && delgroup 'x2gouser' getent 'group' 'x2gousers' >'/dev/null' && delgroup 'x2gousers' + rm -vf '/etc/x2go/x2goserver.conf' + rm -Rf '/etc/x2go/x2gosql/' + rm -Rf '/var/lib/x2go/' + [ -d '/etc/x2go' ] && rmdir --ignore-fail-on-non-empty '/etc/x2go' ;; 'remove'|'upgrade'|'failed-upgrade'|'abort-install'|'abort-upgrade'|'disappear') -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goserver. commit fd3f25729102007cd828db6e230b08333a8e1729 Author: Mihai Moldovan <ionic@ionic.de> Date: Fri Jul 27 01:26:54 2018 +0200 debian/libx2go-server-db-perl.postrm: remove empty directory on purge if possible. --- debian/changelog | 2 ++ debian/libx2go-server-db-perl.postrm | 1 + 2 files changed, 3 insertions(+) diff --git a/debian/changelog b/debian/changelog index 4e1f1e4..14eca24 100644 --- a/debian/changelog +++ b/debian/changelog @@ -202,6 +202,8 @@ x2goserver (4.1.0.1-0x2go1) UNRELEASED; urgency=medium * debian/*.{pre,post}*: + Rework scriptlets, use updated templates, add missing templates, more and better quoting, fix other misc. errors within the scripts. + * debian/libx2go-server-db-perl.postrm: + + Remove empty directory on purge if possible. -- X2Go Release Manager <git-admin@x2go.org> Thu, 15 Feb 2018 23:14:28 +0100 diff --git a/debian/libx2go-server-db-perl.postrm b/debian/libx2go-server-db-perl.postrm index 44229a7..be3f563 100755 --- a/debian/libx2go-server-db-perl.postrm +++ b/debian/libx2go-server-db-perl.postrm @@ -23,6 +23,7 @@ case "${1}" in rm -vf '/var/lib/x2go/x2go_sessions' rm -vf '/etc/x2go/x2gosql/passwords/pgadmin' rm -vf '/etc/x2go/x2gosql/passwords/mysqladmin' + rmdir -v --ignore-fail-on-non-empty '/etc/x2go/x2gosql/passwords/mysqladmin' rm -Rf '/etc/x2go/sql' [ -d '/etc/x2go' ] && rmdir --ignore-fail-on-non-empty '/etc/x2go' -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goserver. commit 88e90d640039f2128df7e2cd3accc6389963eea6 Author: Mihai Moldovan <ionic@ionic.de> Date: Fri Jul 27 01:31:06 2018 +0200 debian/x2goserver-common.postrm: only remove files that the package actually owns (/etc/x2go/x2gosql/sql). --- debian/changelog | 3 +++ debian/x2goserver-common.postrm | 5 ++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 14eca24..344ff43 100644 --- a/debian/changelog +++ b/debian/changelog @@ -204,6 +204,9 @@ x2goserver (4.1.0.1-0x2go1) UNRELEASED; urgency=medium and better quoting, fix other misc. errors within the scripts. * debian/libx2go-server-db-perl.postrm: + Remove empty directory on purge if possible. + * debian/x2goserver-common.postrm: + + Only remove files that the package actually owns + (/etc/x2go/x2gosql/sql). -- X2Go Release Manager <git-admin@x2go.org> Thu, 15 Feb 2018 23:14:28 +0100 diff --git a/debian/x2goserver-common.postrm b/debian/x2goserver-common.postrm index 3d90471..23a245c 100755 --- a/debian/x2goserver-common.postrm +++ b/debian/x2goserver-common.postrm @@ -28,9 +28,12 @@ case "${1}" in getent 'group' 'x2gousers' >'/dev/null' && delgroup 'x2gousers' rm -vf '/etc/x2go/x2goserver.conf' - rm -Rf '/etc/x2go/x2gosql/' rm -Rf '/var/lib/x2go/' + rm -f '/etc/x2go/x2gosql/sql' + + [ -d '/etc/x2go/x2gosql' ] && rmdir --ignore-fail-on-non-empty '/etc/x2go/x2gosql' + [ -d '/etc/x2go' ] && rmdir --ignore-fail-on-non-empty '/etc/x2go' ;; 'remove'|'upgrade'|'failed-upgrade'|'abort-install'|'abort-upgrade'|'disappear') -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goserver. commit dad7320cb6a5d377d137898a09a2d97f81bb6d2f Author: Mihai Moldovan <ionic@ionic.de> Date: Fri Jul 27 01:37:04 2018 +0200 debian/libx2go-server-db-perl.postrm: only remove files that the package actually created. --- debian/changelog | 1 + debian/libx2go-server-db-perl.postrm | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 344ff43..682a773 100644 --- a/debian/changelog +++ b/debian/changelog @@ -204,6 +204,7 @@ x2goserver (4.1.0.1-0x2go1) UNRELEASED; urgency=medium and better quoting, fix other misc. errors within the scripts. * debian/libx2go-server-db-perl.postrm: + Remove empty directory on purge if possible. + + Only remove files that the package actually created. * debian/x2goserver-common.postrm: + Only remove files that the package actually owns (/etc/x2go/x2gosql/sql). diff --git a/debian/libx2go-server-db-perl.postrm b/debian/libx2go-server-db-perl.postrm index be3f563..dca978f 100755 --- a/debian/libx2go-server-db-perl.postrm +++ b/debian/libx2go-server-db-perl.postrm @@ -23,9 +23,9 @@ case "${1}" in rm -vf '/var/lib/x2go/x2go_sessions' rm -vf '/etc/x2go/x2gosql/passwords/pgadmin' rm -vf '/etc/x2go/x2gosql/passwords/mysqladmin' - rmdir -v --ignore-fail-on-non-empty '/etc/x2go/x2gosql/passwords/mysqladmin' - rm -Rf '/etc/x2go/sql' + [ -d '/etc/x2go/x2gosql/passwords' ] && rmdir -v --ignore-fail-on-non-empty '/etc/x2go/x2gosql/passwords' + [ -d '/etc/x2go' ] && rmdir --ignore-fail-on-non-empty '/etc/x2go' ;; 'remove'|'upgrade'|'failed-upgrade'|'abort-install'|'abort-upgrade'|'disappear') -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goserver. commit bdd63a8b3f2837b3781b459bfd029dd124668771 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Sun Mar 11 13:42:37 2018 +0100 debian/control: multiarch hinter script recommends annotating perl dependency with :any. --- debian/changelog | 1 + debian/control | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 682a773..a01a087 100644 --- a/debian/changelog +++ b/debian/changelog @@ -22,6 +22,7 @@ x2goserver (4.1.0.1-0x2go1) UNRELEASED; urgency=medium + Change D (x2goserver-xsession) on perl-modules to perl. The existence of the perl-modules package is an implementation detail of the Debian Perl packaging. + + Multiarch hinter script recommends annotating perl dependency with :any. * debian/copyright: + Update copyright.in reference template. * debian/*: Process with wrap-and-sort -a -s -t -k -b. diff --git a/debian/control b/debian/control index 4059236..3b5e0e6 100644 --- a/debian/control +++ b/debian/control @@ -308,7 +308,7 @@ Package: x2goserver-xsession Architecture: all Depends: dbus, - perl, + perl:any, x11-common, x2goserver (<< ${source:Version}.1~), x2goserver (>= ${source:Version}), -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goserver. commit 5776f04116b43862d03a5177bdb9d42d522e9588 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Tue Apr 24 11:06:56 2018 +0200 debian/control: Bump Standards-Version: to 4.1.4. No changes needed. --- debian/changelog | 1 + debian/control | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index a01a087..700c07f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -23,6 +23,7 @@ x2goserver (4.1.0.1-0x2go1) UNRELEASED; urgency=medium the perl-modules package is an implementation detail of the Debian Perl packaging. + Multiarch hinter script recommends annotating perl dependency with :any. + + Bump Standards-Version: to 4.1.4. No changes needed. * debian/copyright: + Update copyright.in reference template. * debian/*: Process with wrap-and-sort -a -s -t -k -b. diff --git a/debian/control b/debian/control index 3b5e0e6..03a29d2 100644 --- a/debian/control +++ b/debian/control @@ -12,7 +12,7 @@ Build-Depends: dpkg-dev (>= 1.16.1.1), dh-systemd | hello, man2html-base, -Standards-Version: 3.9.6 +Standards-Version: 4.1.4 Homepage: https://code.x2go.org/releases/source/x2goserver Vcs-Git: git://code.x2go.org/x2goserver.git Vcs-Browser: https://code.x2go.org/gitweb?p=x2goserver.git;a=summary -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
-
git-admin＠x2go.org