The branch, build-baikal has been updated via 1679d531856d352536f7474dcd00c2f84d8e380d (commit) from 215194bdd30b432c8e86cc2e2837eb099db7b765 (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: Makefile | 6 ++++++ Makefile.docupload | 17 +++++++++-------- debian/control | 19 +++++++++++++++++++ 3 files changed, 34 insertions(+), 8 deletions(-) The diff of changes is: diff --git a/Makefile b/Makefile index a9208da..bee6125 100755 --- a/Makefile +++ b/Makefile @@ -7,26 +7,32 @@ build: build-indep # make man2html build available from project's base folder... build_man2html: cd x2goserver && make $@ + cd x2goserver-compat && make $@ cd x2goserver-extensions && make $@ clean: cd x2goserver && make $@ + cd x2goserver-compat && make $@ cd x2goserver-extensions && make $@ build-arch: cd x2goserver && make $@ + cd x2goserver-compat && make $@ cd x2goserver-extensions && make $@ build-indep: cd x2goserver && make $@ + cd x2goserver-compat && make $@ cd x2goserver-extensions && make $@ install: cd x2goserver && make $@ + cd x2goserver-compat && make $@ cd x2goserver-extensions && make $@ uninstall: cd x2goserver && make $@ + cd x2goserver-compat && make $@ cd x2goserver-extensions && make $@ diff --git a/Makefile.docupload b/Makefile.docupload index 69cd63a..fece265 100644 --- a/Makefile.docupload +++ b/Makefile.docupload @@ -4,8 +4,9 @@ VERSION=`head -n1 debian/changelog | sed 's,.*(\(.*\)).*,\1,' | cut -d"-" -f1` DOC_HOST=code.x2go.org -DOC_PATH_1=/srv/sites/x2go.org/packages/doc/x2goserver/man/ -DOC_PATH_2=/srv/sites/x2go.org/packages/doc/x2goserver-extensions/man/ +DOC_PATCH_x2goserver=/srv/sites/x2go.org/packages/doc/x2goserver/man/ +DOC_PATCH_compat=/srv/sites/x2go.org/packages/doc/x2goserver-compat/man/ +DOC_PATCH_extensions=/srv/sites/x2go.org/packages/doc/x2goserver-extensions/man/ DOC_USER=x2go-admin doc: docbuild docupload @@ -14,9 +15,9 @@ docbuild: make -f Makefile build_man2html docupload: - ssh -l${DOC_USER} ${DOC_HOST} "{ mkdir -p ${DOC_PATH_1}; rm -Rfv ${DOC_PATH_1}/*; }" - ssh -l${DOC_USER} ${DOC_HOST} "{ mkdir -p ${DOC_PATH_2}; rm -Rfv ${DOC_PATH_2}/*; }" - scp -r x2goserver/.build_man2html/html/* ${DOC_USER}@${DOC_HOST}:${DOC_PATH_1}/ - scp -r x2goserver-extensions/.build_man2html/html/* ${DOC_USER}@${DOC_HOST}:${DOC_PATH_2}/ - - + ssh -l${DOC_USER} ${DOC_HOST} "{ mkdir -p ${DOC_PATCH_x2goserver}; rm -Rfv ${DOC_PATCH_x2goserver}/*; }" + ssh -l${DOC_USER} ${DOC_HOST} "{ mkdir -p ${DOC_PATCH_compat}; rm -Rfv ${DOC_PATCH_compat}/*; }" + ssh -l${DOC_USER} ${DOC_HOST} "{ mkdir -p ${DOC_PATCH_extensions}; rm -Rfv ${DOC_PATCH_extensions}/*; }" + scp -r x2goserver/.build_man2html/html/* ${DOC_USER}@${DOC_HOST}:${DOC_PATCH_x2goserver}/ + scp -r x2goserver-compat/.build_man2html/html/* ${DOC_USER}@${DOC_HOST}:${DOC_PATCH_compat}/ + scp -r x2goserver-extensions/.build_man2html/html/* ${DOC_USER}@${DOC_HOST}:${DOC_PATCH_extensions}/ diff --git a/debian/control b/debian/control index d8eabca..038d3d3 100644 --- a/debian/control +++ b/debian/control @@ -37,6 +37,8 @@ Recommends: x11-xserver-utils, xinit, x2goserver-extensions (= ${source:Version}) +Suggests: + x2goserver-compat (= ${source:Version}) Breaks: x2goserver-one, x2goserver-home, @@ -65,6 +67,23 @@ Description: X2go server daemon scripts of X2go make sure that you also have X2go server extensions package (x2goserver-extensions) installed. +Package: x2goserver-compat +Architecture: all +Depends: + ${misc:Depends}, + x2goserver (>= ${source:Version}), x2goserver (<< ${source:Version}.1~) +Description: X2go server daemon scripts (backwards compatitbity to old client versions) + X2go is a serverbased computing environment with + - session resuming + - low bandwith support + - LDAP support + - client side mass storage mounting support + - audio support + - authentication by smartcard and USB stick + . + This package contains compatitbility scripts to allow + old x2goclient versions to connect to your X2go server. + Package: x2goserver-extensions Architecture: all Depends: hooks/post-receive -- x2goserver.git (X2Go Server) 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 "x2goserver.git" (X2Go Server).