This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository x2goserver. from 9da7a4d debian/rules: fix quoting. new 4e0f946 debian/changelog: fixup. new 1bb091c x2goserver/Makefile: export common variables for direct use in shell script sections. new ebeec21 x2goserver/Makefile: build up sed argument line as an array and use one substitution run. 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: debian/changelog | 12 ++++++++++-- x2goserver/Makefile | 35 ++++++++++++++++------------------- 2 files changed, 26 insertions(+), 21 deletions(-) -- 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 4e0f9461ea12f20bf384773d93808bc9dd951e48 Author: Mihai Moldovan <ionic@ionic.de> Date: Mon Jun 24 08:48:21 2019 +0200 debian/changelog: fixup. --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 27c8e34..3b30735 100644 --- a/debian/changelog +++ b/debian/changelog @@ -120,8 +120,8 @@ x2goserver (4.1.0.4-0x2go1.1) UNRELEASED; urgency=medium parenthesis. Escaping the hash char only leads to the initial situation with it being parsed as a comment. Backticks would work, but are ugly. Hence, just use the colon pseudo-command. - - x2goserver/bin/x2gopath.in: fix syntax error due to non-duplicated - dollar signs in comment lines. + - x2goserver/Makefile: fix syntax error due to non-duplicated dollar signs + in comment lines. * debian/control: + Build-depend upon lsb-release for distro version detection. * debian/x2goserver.manpages: -- 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 1bb091ca7bba5ec54053202f12f0ce6e9f61013d Author: Mihai Moldovan <ionic@ionic.de> Date: Mon Jun 24 08:50:09 2019 +0200 x2goserver/Makefile: export common variables for direct use in shell script sections. --- debian/changelog | 2 ++ x2goserver/Makefile | 30 ++++++++++++------------------ 2 files changed, 14 insertions(+), 18 deletions(-) diff --git a/debian/changelog b/debian/changelog index 3b30735..4ab2668 100644 --- a/debian/changelog +++ b/debian/changelog @@ -122,6 +122,8 @@ x2goserver (4.1.0.4-0x2go1.1) UNRELEASED; urgency=medium Hence, just use the colon pseudo-command. - x2goserver/Makefile: fix syntax error due to non-duplicated dollar signs in comment lines. + - x2goserver/Makefile: export common variables for direct use in shell + script sections. * debian/control: + Build-depend upon lsb-release for distro version detection. * debian/x2goserver.manpages: diff --git a/x2goserver/Makefile b/x2goserver/Makefile index 4f3ad9f..064a7e7 100755 --- a/x2goserver/Makefile +++ b/x2goserver/Makefile @@ -20,6 +20,8 @@ NXLIBDIR ?= $(LIBDIR)/../nx MANDIR ?= $(PREFIX)/share/man SHAREDIR ?= $(PREFIX)/share/x2go +export DESTDIR PREFIX ETCDIR BINDIR SBINDIR LIBDIR NXLIBDIR MANDIR SHAREDIR + BIN_SCRIPTS=$(shell cd bin && echo *) SBIN_SCRIPTS=$(shell cd sbin && echo *) LIB_FILES=$(shell cd lib && echo *) @@ -47,14 +49,6 @@ build-indep: build_pod2man build_man2html cp -a "$${gen_file}" "$${file}"; \ \ $$(: "Run actual substitutions."); \ - PREFIX='$(PREFIX)'; \ - ETCDIR='$(ETCDIR)'; \ - BINDIR='$(BINDIR)'; \ - SBINDIR='$(SBINDIR)'; \ - LIBDIR='$(LIBDIR)'; \ - NXLIBDIR='$(NXLIBDIR)'; \ - MANDIR='$(MANDIR)'; \ - SHAREDIR='$(SHAREDIR)'; \ for subst in 'PREFIX' 'ETCDIR' 'BINDIR' 'SBINDIR' 'LIBDIR' 'NXLIBDIR' 'MANDIR' 'SHAREDIR'; do \ sed -e "s#@@$${subst}@@#$${!subst}#g" "$${gen_file}" > "$${file}"; \ done; \ @@ -114,12 +108,12 @@ install: build install_scripts install_config install_man install_version install_scripts: for dir in 'bin' 'sbin' 'lib' 'share/x2gofeature.d'; do \ $$(: "Create (and save) destination directory."); \ - dest='$(DESTDIR)'; \ + dest='$${DESTDIR}'; \ case "$${dir}" in \ - ('bin') dest="$${dest}$(BINDIR)/";; \ - ('sbin') dest="$${dest}$(SBINDIR)/";; \ - ('lib') dest="$${dest}$(LIBDIR)/";; \ - ('share/x2gofeature.d') dest="$${dest}$(SHAREDIR)/x2gofeature.d/";; \ + ('bin') dest="$${dest}$${BINDIR}/";; \ + ('sbin') dest="$${dest}$${SBINDIR}/";; \ + ('lib') dest="$${dest}$${LIBDIR}/";; \ + ('share/x2gofeature.d') dest="$${dest}$${SHAREDIR}/x2gofeature.d/";; \ (*) printf '%s\n' 'Unknown component in install_scripts scriptlet.' >&2; exit '1';; \ esac; \ $(INSTALL_DIR) "$${dest}"; \ @@ -168,12 +162,12 @@ uninstall: uninstall_scripts uninstall_config uninstall_man uninstall_version uninstall_scripts: for dir in 'bin' 'sbin' 'lib' 'share/x2gofeature.d'; do \ $$(: "Create (and save) destination directory."); \ - dest='$(DESTDIR)'; \ + dest='$${DESTDIR}'; \ case "$${dir}" in \ - ('bin') dest="$${dest}$(BINDIR)/";; \ - ('sbin') dest="$${dest}$(SBINDIR)/";; \ - ('lib') dest="$${dest}$(LIBDIR)/";; \ - ('share/x2gofeature.d') dest="$${dest}$(SHAREDIR)/x2gofeature.d/";; \ + ('bin') dest="$${dest}$${BINDIR}/";; \ + ('sbin') dest="$${dest}$${SBINDIR}/";; \ + ('lib') dest="$${dest}$${LIBDIR}/";; \ + ('share/x2gofeature.d') dest="$${dest}$${SHAREDIR}/x2gofeature.d/";; \ (*) printf '%s\n' 'Unknown component in uninstall_scripts scriptlet.'; exit '1';; \ esac; \ $(INSTALL_DIR) "$${dest}"; \ -- 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 ebeec2182dd0b7199cdd5104a77ac9e8a004fcb2 Author: Mihai Moldovan <ionic@ionic.de> Date: Mon Jun 24 08:56:17 2019 +0200 x2goserver/Makefile: build up sed argument line as an array and use one substitution run. Multiple runs with the template file as input will lead to only the last replacement to stick in the resulting generated script, which is not what we want to have. Correctly doing that with multiple runs would require the usage of temporary files, which is needlessly complicated in this context. --- debian/changelog | 6 ++++++ x2goserver/Makefile | 5 ++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 4ab2668..e38b80f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -124,6 +124,12 @@ x2goserver (4.1.0.4-0x2go1.1) UNRELEASED; urgency=medium in comment lines. - x2goserver/Makefile: export common variables for direct use in shell script sections. + - x2goserver/Makefile: build up sed argument line as an array and use one + substitution run. Multiple runs with the template file as input will + lead to only the last replacement to stick in the resulting generated + script, which is not what we want to have. Correctly doing that with + multiple runs would require the usage of temporary files, which is + needlessly complicated in this context. * debian/control: + Build-depend upon lsb-release for distro version detection. * debian/x2goserver.manpages: diff --git a/x2goserver/Makefile b/x2goserver/Makefile index 064a7e7..26781dd 100755 --- a/x2goserver/Makefile +++ b/x2goserver/Makefile @@ -49,9 +49,12 @@ build-indep: build_pod2man build_man2html cp -a "$${gen_file}" "$${file}"; \ \ $$(: "Run actual substitutions."); \ + typeset -a sed_args; \ + sed_args=(); \ for subst in 'PREFIX' 'ETCDIR' 'BINDIR' 'SBINDIR' 'LIBDIR' 'NXLIBDIR' 'MANDIR' 'SHAREDIR'; do \ - sed -e "s#@@$${subst}@@#$${!subst}#g" "$${gen_file}" > "$${file}"; \ + sed_args+=( '-e' "s#@@$${subst}@@#$${!subst}#g" ); \ done; \ + sed "$${sed_args[@]}" "$${gen_file}" > "$${file}"; \ fi; \ done; \ done -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
-
git-admin＠x2go.org