[x2goserver] branch master updated (37bb9b4 -> c2efe76)

List overview All Threads
Download

newer

older

Build failed in Jenkins:...

[[X2Go Wiki]] page changed:...

git-admin＠x2go.org

23 Jun 2019 23 Jun '19

2:43 a.m.

This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository x2goserver. from 37bb9b4 x2goruncommand: start Xsession on X2Go KDrive desktops. new efa794e x2goserver/bin/x2goruncommand: fix syntax. new b8cacb5 x2goserver/Makefile: allow auto-generation of files, including installation, uninstallation and cleanup. new 77364ed x2goserver/bin: rename x2gopath to x2gopath.in. new 16c8bb5 x2goserver/bin/x2gopath.in: use ${BASH_SOURCE[0]} instead of ${0}... for reasons. new b2a73f9 x2goserver/bin/x2gopath.in: rework quoting, variable usage, drop unnecessary semicolons etc. new 9800771 x2goserver/bin/x2gopath.in: hardcode LIBDIR, PREFIX and SHAREDIR at build time, but also allow re-rooting afterwards - derived from the original values. new 2475a93 x2goserver.spec: pass down LIBDIR via make calls, not by modifying all source files with sed. new e5f19e1 debian/rules: export and pass down LIBDIR. new 902e088 debian/rules: fix standalone make call by specifying PREFIX, NXLIBDIR and LIBDIR explicitly. new 073cdef Makefile: specify SHAREDIR as a default-if-not-specified variable. new eb8b56b Makefile: same change, but for ETCDIR. new 9603457 {libx2go-server-db-perl,x2goserver{,-{common,desktopsharing,extensions,fmbindings,printing,x2goagent,xsession}}}/Makefile: apply default-if-not-specified-logic to all the other Makefiles as well. new 773d640 x2goserver/Makefile: add support for $(NXLIBDIR). new 18c6c92 x2goserver/bin/x2gopath.in: switch to bash. new f5a6874 x2goserver/bin/x2gopath.in: fix warning message to also include SHAREDIR. new 6ffc9ee x2goserver/bin/x2gopath.in: add and use support for NXLIBDIR; drop the lib-subdir detection. new c2efe76 x2goserver/bin/x2gopath.in: use [] instead of test, for consistency. The 17 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: Makefile | 4 +- debian/changelog | 30 ++++++++++++ debian/rules | 11 +++-- libx2go-server-db-perl/Makefile | 12 ++--- x2goserver-common/Makefile | 12 ++--- x2goserver-desktopsharing/Makefile | 10 ++-- x2goserver-extensions/Makefile | 10 ++-- x2goserver-fmbindings/Makefile | 10 ++-- x2goserver-printing/Makefile | 12 ++--- x2goserver-x2goagent/Makefile | 10 ++-- x2goserver-xsession/Makefile | 12 ++--- x2goserver.spec | 7 +-- x2goserver/Makefile | 99 ++++++++++++++++++++++++++++++-------- x2goserver/bin/x2gopath | 44 ----------------- x2goserver/bin/x2gopath.in | 61 +++++++++++++++++++++++ x2goserver/bin/x2goruncommand | 2 +- 16 files changed, 226 insertions(+), 120 deletions(-) delete mode 100755 x2goserver/bin/x2gopath create mode 100755 x2goserver/bin/x2gopath.in -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goserver.git

Show replies by date

git-admin＠x2go.org

23 Jun 23 Jun

2:43 a.m.

New subject: [x2goserver] 01/17: x2goserver/bin/x2goruncommand: fix syntax.

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goserver. commit efa794ee390422dfd77afbc111fa265c649aa5d0 Author: Mihai Moldovan <ionic@ionic.de> Date: Fri Jun 21 23:43:59 2019 +0200 x2goserver/bin/x2goruncommand: fix syntax. --- debian/changelog | 1 + x2goserver/bin/x2goruncommand | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 30c4db5..2818943 100644 --- a/debian/changelog +++ b/debian/changelog @@ -86,6 +86,7 @@ x2goserver (4.1.0.4-0x2go1.1) UNRELEASED; urgency=medium - x2goserver/bin/x2gostartagent: adapt debug message to ${AGENTBIN} usage. - x2goserver/bin/x2gostartagent: also use ${AGENTBIN} in shadow session code. + - x2goserver/bin/x2goruncommand: fix syntax. * debian/control: + Build-depend upon lsb-release for distro version detection. * debian/x2goserver.manpages: diff --git a/x2goserver/bin/x2goruncommand b/x2goserver/bin/x2goruncommand index b6da198..34fcc81 100755 --- a/x2goserver/bin/x2goruncommand +++ b/x2goserver/bin/x2goruncommand @@ -360,7 +360,7 @@ if [ "$EXEC" != "" ] && [ -x "$EXEC" ]; then x2gosetkeyboard >/dev/null 2>/dev/null & - if x2gofeature X2GO_XSESSION &>/dev/null && [ ["x$X2GO_SESS_TYPE" = "xD"] || ["x$X2GO_SESS_TYPE" = "xK"] ] ; then + if x2gofeature X2GO_XSESSION &>/dev/null && ( [ "x$X2GO_SESS_TYPE" = "xD" ] || [ "x$X2GO_SESS_TYPE" = "xK" ] ); then STARTUP="$cmd$args" # Search for dbus-run-session and handle the non-existence (to some extent) gracefully. -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goserver.git

git-admin＠x2go.org

2:43 a.m.

New subject: [x2goserver] 02/17: x2goserver/Makefile: allow auto-generation of files, including installation, uninstallation and cleanup.

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goserver. commit b8cacb5e690882d2cba6dec4d0a1b9a1a875b224 Author: Mihai Moldovan <ionic@ionic.de> Date: Sat Jun 22 02:44:26 2019 +0200 x2goserver/Makefile: allow auto-generation of files, including installation, uninstallation and cleanup. --- debian/changelog | 2 ++ x2goserver/Makefile | 85 +++++++++++++++++++++++++++++++++++++++++++++-------- 2 files changed, 74 insertions(+), 13 deletions(-) diff --git a/debian/changelog b/debian/changelog index 2818943..f316ef1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -87,6 +87,8 @@ x2goserver (4.1.0.4-0x2go1.1) UNRELEASED; urgency=medium - x2goserver/bin/x2gostartagent: also use ${AGENTBIN} in shadow session code. - x2goserver/bin/x2goruncommand: fix syntax. + - x2goserver/Makefile: allow auto-generation of files, including + installation, uninstallation and cleanup. * debian/control: + Build-depend upon lsb-release for distro version detection. * debian/x2goserver.manpages: diff --git a/x2goserver/Makefile b/x2goserver/Makefile index b49e73a..7204c1a 100755 --- a/x2goserver/Makefile +++ b/x2goserver/Makefile @@ -38,6 +38,27 @@ build: build-arch build-indep build-arch: build-indep: build_pod2man build_man2html + for dir in 'bin' 'sbin' 'lib' 'share/x2gofeature.d'; do \ + for gen_file in "$${!dir}/"*; do \ + file="$${gen_file%.in}"; \ + if [ "$${gen_file}" != "$${file}" ]; then \ + $$("# Copy the file first, making sure we keep permissions."); \ + cp -a "$${gen_file}" "$${file}"; \ + \ + $$("# Run actual substitutions."); \ + PREFIX='$(PREFIX)'; \ + ETCDIR='$(ETCDIR)'; \ + BINDIR='$(BINDIR)'; \ + SBINDIR='$(SBINDIR)'; \ + LIBDIR='$(LIBDIR)'; \ + MANDIR='$(MANDIR)'; \ + SHAREDIR='$(SHAREDIR)'; \ + for subst in 'PREFIX' 'ETCDIR' 'BINDIR' 'SBINDIR' 'LIBDIR' 'MANDIR' 'SHAREDIR'; do \ + sed -e "s#@@$${subst}@@#$${!subst}#g" "$${gen_file}" > "$${file}"; \ + done; \ + fi; \ + done; \ + done build_pod2man: for sectioned_script in $(POD_SCRIPTS); do \ @@ -74,21 +95,44 @@ clean: clean-arch clean-indep clean-arch: clean-indep: clean_man2html + for dir in 'bin' 'sbin' 'lib' 'share/x2gofeature.d'; do \ + for gen_file in "$${!dir}/"*; do \ + file="$${gen_file%.in}"; \ + if [ "$${gen_file}" != "$${file}" ]; then \ + $(RM_FILE) "$${file}"; \ + fi; \ + done; \ + done clean_man2html: rm -Rf `dirname $(MAN2HTML_DEST)` -install: install_scripts install_config install_man install_version +install: build install_scripts install_config install_man install_version install_scripts: - $(INSTALL_DIR) $(DESTDIR)$(BINDIR) - $(INSTALL_DIR) $(DESTDIR)$(SBINDIR) - $(INSTALL_DIR) $(DESTDIR)$(LIBDIR) - $(INSTALL_DIR) $(DESTDIR)$(SHAREDIR)/x2gofeature.d - $(INSTALL_PROGRAM) bin/* $(DESTDIR)$(BINDIR)/ - $(INSTALL_PROGRAM) sbin/* $(DESTDIR)$(SBINDIR)/ - $(INSTALL_PROGRAM) lib/* $(DESTDIR)$(LIBDIR)/ - $(INSTALL_PROGRAM) share/x2gofeature.d/*.features $(DESTDIR)$(SHAREDIR)/x2gofeature.d/ + for dir in 'bin' 'sbin' 'lib' 'share/x2gofeature.d'; do \ + $("# Create (and save) destination directory."); \ + 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/";; \ + (*) printf '%s\n' 'Unknown component in install_scripts scriptlet.' >&2; exit '1';; \ + esac; \ + $(INSTALL_DIR) "$${dest}"; \ + \ + $("# Iterate over files and ..."); \ + for gen_file in "$${!dir}/"*; do \ + file="$${gen_file%.in}"; \ + $("# ... filter out generation templates and anything not ending in '.features' for the feature directory."); \ + if [ "$${gen_file}" != "$${file}" ] || ( [ "$${dir}" = 'share/x2gofeature.d' ] && [ "$${file%.features}" = "$${file}" ] ); then \ + continue; \ + fi; \ + \ + $(INSTALL_PROGRAM) "$${file}" "$${dest}/"; \ + done; \ + done install_config: $(INSTALL_DIR) $(DESTDIR)$(ETCDIR) @@ -120,10 +164,25 @@ install_version: uninstall: uninstall_scripts uninstall_config uninstall_man uninstall_version uninstall_scripts: - for file in $(BIN_SCRIPTS); do $(RM_FILE) $(DESTDIR)$(BINDIR)/$$file; done - for file in $(SBIN_SCRIPTS); do $(RM_FILE) $(DESTDIR)$(SBINDIR)/$$file; done - for file in $(LIB_FILES); do $(RM_FILE) $(DESTDIR)$(LIBDIR)/$$file; done - for file in $(FEATURE_SCRIPTS); do $(RM_FILE) $(DESTDIR)$(SHAREDIR)/x2gofeature.d/$$file; done + for dir in 'bin' 'sbin' 'lib' 'share/x2gofeature.d'; do \ + $("# Create (and save) destination directory."); \ + 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/";; \ + (*) printf '%s\n' 'Unknown component in uninstall_scripts scriptlet.'; exit '1';; \ + esac; \ + $(INSTALL_DIR) "$${dest}"; \ + \ + $("# Iterate over files and ..."); \ + for gen_file in "$${!dir}/"*; do \ + $("# ... map generation templates to generated files (so that uninstallation works correctly after cleaning as well)."); \ + file="$${gen_file%.in}"; \ + $(RM_FILE) "$${dest}/$${file}"; \ + done; \ + done $(RM_DIR) $(DESTDIR)$(LIBDIR) || true $(RM_DIR) $(DESTDIR)$(SHAREDIR)/x2gofeature.d || true $(RM_DIR) $(DESTDIR)$(SHAREDIR) || true -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goserver.git

git-admin＠x2go.org

2:43 a.m.

New subject: [x2goserver] 03/17: x2goserver/bin: rename x2gopath to x2gopath.in.

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goserver. commit 77364ed7e46113ede348a235761440818248fbf8 Author: Mihai Moldovan <ionic@ionic.de> Date: Sat Jun 22 02:51:32 2019 +0200 x2goserver/bin: rename x2gopath to x2gopath.in. --- debian/changelog | 1 + x2goserver/bin/{x2gopath => x2gopath.in} | 0 2 files changed, 1 insertion(+) diff --git a/debian/changelog b/debian/changelog index f316ef1..3375d08 100644 --- a/debian/changelog +++ b/debian/changelog @@ -89,6 +89,7 @@ x2goserver (4.1.0.4-0x2go1.1) UNRELEASED; urgency=medium - x2goserver/bin/x2goruncommand: fix syntax. - x2goserver/Makefile: allow auto-generation of files, including installation, uninstallation and cleanup. + - x2goserver/bin: rename x2gopath to x2gopath.in. * debian/control: + Build-depend upon lsb-release for distro version detection. * debian/x2goserver.manpages: diff --git a/x2goserver/bin/x2gopath b/x2goserver/bin/x2gopath.in similarity index 100% rename from x2goserver/bin/x2gopath rename to x2goserver/bin/x2gopath.in -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goserver.git

git-admin＠x2go.org

2:43 a.m.

New subject: [x2goserver] 04/17: x2goserver/bin/x2gopath.in: use ${BASH_SOURCE[0]} instead of ${0}... for reasons.

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goserver. commit 16c8bb52dd60689985fe5f133869f594cef9ad4b Author: Mihai Moldovan <ionic@ionic.de> Date: Sat Jun 22 02:55:26 2019 +0200 x2goserver/bin/x2gopath.in: use ${BASH_SOURCE[0]} instead of ${0}... for reasons. --- debian/changelog | 2 ++ x2goserver/bin/x2gopath.in | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 3375d08..12536fb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -90,6 +90,8 @@ x2goserver (4.1.0.4-0x2go1.1) UNRELEASED; urgency=medium - x2goserver/Makefile: allow auto-generation of files, including installation, uninstallation and cleanup. - x2goserver/bin: rename x2gopath to x2gopath.in. + - x2goserver/bin/x2gopath.in: use ${BASH_SOURCE[0]} instead of ${0}... for + reasons. * debian/control: + Build-depend upon lsb-release for distro version detection. * debian/x2goserver.manpages: diff --git a/x2goserver/bin/x2gopath.in b/x2goserver/bin/x2gopath.in index eda166c..485b6ee 100755 --- a/x2goserver/bin/x2gopath.in +++ b/x2goserver/bin/x2gopath.in @@ -21,8 +21,8 @@ # Free Software Foundation, Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. -base="${0%/*}"; -if test "$base" = "$0"; then +base="${BASH_SOURCE[0]%/*}" +if test "${base}" = "${BASH_SOURCE[0]}"; then base="."; fi; -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goserver.git

git-admin＠x2go.org

2:43 a.m.

New subject: [x2goserver] 05/17: x2goserver/bin/x2gopath.in: rework quoting, variable usage, drop unnecessary semicolons etc.

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goserver. commit b2a73f948a95fa208a482ca5131f38023f74b092 Author: Mihai Moldovan <ionic@ionic.de> Date: Sat Jun 22 02:57:27 2019 +0200 x2goserver/bin/x2gopath.in: rework quoting, variable usage, drop unnecessary semicolons etc. --- debian/changelog | 2 ++ x2goserver/bin/x2gopath.in | 28 ++++++++++++++-------------- 2 files changed, 16 insertions(+), 14 deletions(-) diff --git a/debian/changelog b/debian/changelog index 12536fb..cda9111 100644 --- a/debian/changelog +++ b/debian/changelog @@ -92,6 +92,8 @@ x2goserver (4.1.0.4-0x2go1.1) UNRELEASED; urgency=medium - x2goserver/bin: rename x2gopath to x2gopath.in. - x2goserver/bin/x2gopath.in: use ${BASH_SOURCE[0]} instead of ${0}... for reasons. + - x2goserver/bin/x2gopath.in: rework quoting, variable usage, drop + unnecessary semicolons etc. * debian/control: + Build-depend upon lsb-release for distro version detection. * debian/x2goserver.manpages: diff --git a/x2goserver/bin/x2gopath.in b/x2goserver/bin/x2gopath.in index 485b6ee..c8d3b8d 100755 --- a/x2goserver/bin/x2gopath.in +++ b/x2goserver/bin/x2gopath.in @@ -21,24 +21,24 @@ # Free Software Foundation, Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. -base="${BASH_SOURCE[0]%/*}" +typeset base="${BASH_SOURCE[0]%/*}" if test "${base}" = "${BASH_SOURCE[0]}"; then - base="."; -fi; + base='.' +fi -base=$(readlink -f "$base/.."); +base="$(readlink -f "${base}/..")" # The following section is subject to substitution by distro packaging tools. -case "$1" in - "base") printf '%s' "$base";; - "lib") printf '%s' "$base/lib/x2go";; - "libexec") printf '%s' "$base/lib/x2go";; - "share") printf '%s' "$base/share/x2go";; - "nx-x11") printf '%s' "$base/lib/nx/X11";; - "xinerama") printf '%s' "$base/lib/nx/X11/Xinerama";; - *) exit 1;; +case "${1}" in + ('base') printf '%s' "${base}";; + ('lib') printf '%s' "${base}/lib/x2go";; + ('libexec') printf '%s' "${base}/lib/x2go";; + ('share') printf '%s' "${base}/share/x2go";; + ('nx-x11') printf '%s' "${base}/lib/nx/X11";; + ('xinerama') printf '%s' "${base}/lib/nx/X11/Xinerama";; + (*) exit 1;; esac; if test -t 1; then - echo ""; -fi; + printf '\n' +fi -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goserver.git

git-admin＠x2go.org

2:43 a.m.

New subject: [x2goserver] 06/17: x2goserver/bin/x2gopath.in: hardcode LIBDIR, PREFIX and SHAREDIR at build time, but also allow re-rooting afterwards - derived from the original values.

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goserver. commit 980077116d2a7015bc1d89e4ed83c7758f16aaa6 Author: Mihai Moldovan <ionic@ionic.de> Date: Sat Jun 22 05:40:11 2019 +0200 x2goserver/bin/x2gopath.in: hardcode LIBDIR, PREFIX and SHAREDIR at build time, but also allow re-rooting afterwards - derived from the original values. --- debian/changelog | 3 +++ x2goserver/bin/x2gopath.in | 34 ++++++++++++++++++++++++++++------ 2 files changed, 31 insertions(+), 6 deletions(-) diff --git a/debian/changelog b/debian/changelog index cda9111..890748b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -94,6 +94,9 @@ x2goserver (4.1.0.4-0x2go1.1) UNRELEASED; urgency=medium reasons. - x2goserver/bin/x2gopath.in: rework quoting, variable usage, drop unnecessary semicolons etc. + - x2goserver/bin/x2gopath.in: hardcode LIBDIR, PREFIX and SHAREDIR at + build time, but also allow re-rooting afterwards - derived from the + original values. * debian/control: + Build-depend upon lsb-release for distro version detection. * debian/x2goserver.manpages: diff --git a/x2goserver/bin/x2gopath.in b/x2goserver/bin/x2gopath.in index c8d3b8d..4b07f95 100755 --- a/x2goserver/bin/x2gopath.in +++ b/x2goserver/bin/x2gopath.in @@ -5,6 +5,7 @@ # Copyright (C) 2012-2018 Heinz-Markus Graesing <heinz-m.graesing@obviously-nice.de> # Copyright (C) 2012-2015 Mike Gabriel <mike.gabriel@das-netzwerkteam.de> # Copyright (C) 2012-2015 Jan Engelhard <jengelh@inai.de> +# Copyright (C) 2019 Mihai Moldovan <ionic@ionic.de> # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -21,6 +22,10 @@ # Free Software Foundation, Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. +typeset installed_prefix='@@PREFIX@@' +typeset installed_libdir='@@LIBDIR@@' +typeset installed_sharedir='@@SHAREDIR@@' + typeset base="${BASH_SOURCE[0]%/*}" if test "${base}" = "${BASH_SOURCE[0]}"; then base='.' @@ -28,14 +33,31 @@ fi base="$(readlink -f "${base}/..")" -# The following section is subject to substitution by distro packaging tools. +if [ "${base}" != "${installed_prefix}" ]; then + printf 'WARNING: X2Go Server was originally installed into %s, but seems to have been re-rooted to %s. There is potential for breakage.\n' "${installed_prefix}" "${base}" >&2 +fi + +typeset x2go_share_subdir="${installed_sharedir#${installed_prefix}}" +typeset x2go_lib_subdir="${installed_libdir#${installed_prefix}}" + +if [ "${x2go_lib_subdir}" = "${installed_libdir}" ]; then + printf 'WARNING: X2Go Server was built with a LIBDIR (%s) not starting with PREFIX (%s). Such a setup will likely not work correctly.\n' "${installed_libdir}" "${installed_prefix}" >&2 +fi + +# Try to fetch the system library dir. +# Drop leading slashes. +typeset lib_subdir="$(sed -e 's#^/*##g' <<< "${x2go_lib_subdir}")" +# Extract first element - should be the library directory. +lib_subdir="${lib_subdir%%/*}" + +# Distributions should not modify the following section, but rather build the package with their custom PREFIX, LIBDIR, SHAREDIR etc. values. case "${1}" in ('base') printf '%s' "${base}";; - ('lib') printf '%s' "${base}/lib/x2go";; - ('libexec') printf '%s' "${base}/lib/x2go";; - ('share') printf '%s' "${base}/share/x2go";; - ('nx-x11') printf '%s' "${base}/lib/nx/X11";; - ('xinerama') printf '%s' "${base}/lib/nx/X11/Xinerama";; + ('lib'|'libexec') printf '%s' "${base}/${x2go_lib_subdir}";; + ('share') printf '%s' "${base}/${x2go_share_subdir}";; + # Assume that X2Go Server and nx-libs share the same library subdir. + ('nx-x11') printf '%s' "${base}/${lib_subdir}/nx/X11";; + ('xinerama') printf '%s' "${base}/${lib_subdir}/nx/X11/Xinerama";; (*) exit 1;; esac; -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goserver.git

git-admin＠x2go.org

2:43 a.m.

New subject: [x2goserver] 07/17: x2goserver.spec: pass down LIBDIR via make calls, not by modifying all source files with sed.

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goserver. commit 2475a938269945f8746235c5dd70427f70c9a078 Author: Mihai Moldovan <ionic@ionic.de> Date: Sat Jun 22 05:53:33 2019 +0200 x2goserver.spec: pass down LIBDIR via make calls, not by modifying all source files with sed. --- debian/changelog | 2 ++ x2goserver.spec | 7 ++----- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/debian/changelog b/debian/changelog index 890748b..4877796 100644 --- a/debian/changelog +++ b/debian/changelog @@ -106,6 +106,8 @@ x2goserver (4.1.0.4-0x2go1.1) UNRELEASED; urgency=medium + Install new x2goisint wrapper. + Install section 1 man pages. + Exclude x2goagent man page from x2goserver package. + + Pass down LIBDIR via make calls, not by modifying all source files with + sed. * debian/x2goserver.install: + Install bin/x2goupdateoptionsstring. diff --git a/x2goserver.spec b/x2goserver.spec index ec20ad5..98c0ce6 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -615,18 +615,15 @@ false-positives when running X2Go sessions. %prep %setup -q -# Set path -find -type f | xargs sed -i -r -e '/^LIBDIR=/s,/lib/,/%{_lib}/,' -sed -i -e 's,/lib/,/%{_lib}/,' x2goserver/bin/x2gopath # Don't try to be root sed -i -e 's/-o root -g root//' */Makefile %build -make %{?_smp_mflags} CFLAGS="%{?__global_cppflags} %{?__global_cflags} %{optflags}" LDFLAGS="%{?__global_ldflags}" PERL_INSTALLDIRS=vendor PREFIX=%{_prefix} NXLIBDIR=%{_libdir}/nx +make %{?_smp_mflags} CFLAGS='%{?__global_cppflags} %{?__global_cflags} %{optflags}' LDFLAGS='%{?__global_ldflags}' PERL_INSTALLDIRS='vendor' PREFIX='%{_prefix}' NXLIBDIR='%{_libdir}/nx' LIBDIR='%{_libdir}/x2go' %install -make install DESTDIR=%{buildroot} PREFIX=%{_prefix} NXLIBDIR=%{_libdir}/nx +make install DESTDIR='%{buildroot}' PREFIX='%{_prefix}' NXLIBDIR='%{_libdir}/nx' LIBDIR='%{_libdir}/x2go' # Make sure the .packlist file is removed from %%{perl_vendorarch}... find %{buildroot}%{perl_vendorarch} -name .packlist | while read file; do rm -f "$file"; done -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goserver.git

git-admin＠x2go.org

2:43 a.m.

New subject: [x2goserver] 08/17: debian/rules: export and pass down LIBDIR.

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goserver. commit e5f19e1b3cca55584958962a78b42ca788f4299a Author: Mihai Moldovan <ionic@ionic.de> Date: Sat Jun 22 06:19:43 2019 +0200 debian/rules: export and pass down LIBDIR. --- debian/changelog | 2 ++ debian/rules | 9 +++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index 4877796..90e22e9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -110,6 +110,8 @@ x2goserver (4.1.0.4-0x2go1.1) UNRELEASED; urgency=medium sed. * debian/x2goserver.install: + Install bin/x2goupdateoptionsstring. + * debian/rules: + + Export and pass down LIBDIR. [ Oleksandr Shneyder ] * New upstream version (4.1.0.4): diff --git a/debian/rules b/debian/rules index c9527bf..8b613be 100755 --- a/debian/rules +++ b/debian/rules @@ -29,21 +29,22 @@ endif endif export NXLIBDIR="/usr/lib/$(shell dpkg-architecture -qDEB_HOST_MULTIARCH)/nx" +export LIBDIR="/usr/lib/x2go" export DEB_BUILD_MAINT_OPTIONS = hardening=+all DPKG_EXPORT_BUILDFLAGS = 1 include /usr/share/dpkg/buildflags.mk %: - PREFIX=/usr NXLIBDIR=$(NXLIBDIR) dh ${@} --with=systemd || PREFIX=/usr NXLIBDIR=$(NXLIBDIR) dh ${@} + PREFIX='/usr' NXLIBDIR='$(NXLIBDIR)' LIBDIR='$(LIBDIR)' dh ${@} --with=systemd || PREFIX='/usr' NXLIBDIR='$(NXLIBDIR)' LIBDIR='$(LIBDIR)' dh ${@} override_dh_auto_build: - PREFIX=/usr NXLIBDIR=$(NXLIBDIR) PERL_INSTALLDIRS=vendor dh_auto_build + PREFIX='/usr' NXLIBDIR='$(NXLIBDIR)' LIBDIR='$(LIBDIR)' PERL_INSTALLDIRS=vendor dh_auto_build override_dh_auto_install: if [ -f ChangeLog.gitlog ]; then cp ChangeLog.gitlog ChangeLog; fi $(MAKE) -f Makefile build-arch - PREFIX=/usr NXLIBDIR=$(NXLIBDIR) dh_auto_install + PREFIX='/usr' NXLIBDIR='$(NXLIBDIR)' LIBDIR='$(LIBDIR)' dh_auto_install override_dh_missing: dh_missing --fail-missing @@ -55,7 +56,7 @@ override_dh_auto_clean: rm -f ChangeLog.gitlog rm -f MYMETA.yml rm -f Makefile.perl.old - PREFIX=/usr NXLIBDIR=$(NXLIBDIR) dh_auto_clean + PREFIX='/usr' NXLIBDIR='$(NXLIBDIR)' LIBDIR='$(LIBDIR)' dh_auto_clean rm -f Makefile.perl override_dh_gencontrol: -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goserver.git

git-admin＠x2go.org

2:43 a.m.

New subject: [x2goserver] 09/17: debian/rules: fix standalone make call by specifying PREFIX, NXLIBDIR and LIBDIR explicitly.

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goserver. commit 902e0882e9531af4bde2b2676f2117aed89898ac Author: Mihai Moldovan <ionic@ionic.de> Date: Sat Jun 22 06:20:58 2019 +0200 debian/rules: fix standalone make call by specifying PREFIX, NXLIBDIR and LIBDIR explicitly. --- debian/changelog | 2 ++ debian/rules | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 90e22e9..2933cd5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -112,6 +112,8 @@ x2goserver (4.1.0.4-0x2go1.1) UNRELEASED; urgency=medium + Install bin/x2goupdateoptionsstring. * debian/rules: + Export and pass down LIBDIR. + + Fix standalone make call by specifying PREFIX, NXLIBDIR and LIBDIR + explicitly. [ Oleksandr Shneyder ] * New upstream version (4.1.0.4): diff --git a/debian/rules b/debian/rules index 8b613be..a8e3700 100755 --- a/debian/rules +++ b/debian/rules @@ -43,7 +43,7 @@ override_dh_auto_build: override_dh_auto_install: if [ -f ChangeLog.gitlog ]; then cp ChangeLog.gitlog ChangeLog; fi - $(MAKE) -f Makefile build-arch + $(MAKE) -f Makefile build-arch PREFIX='/usr' NXLIBDIR='$(NXLIBDIR)' LIBDIR='$(LIBDIR)' PREFIX='/usr' NXLIBDIR='$(NXLIBDIR)' LIBDIR='$(LIBDIR)' dh_auto_install override_dh_missing: -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goserver.git

git-admin＠x2go.org

2:43 a.m.

New subject: [x2goserver] 10/17: Makefile: specify SHAREDIR as a default-if-not-specified variable.

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goserver. commit 073cdefb50eb94df82b97159c5f0022c50c7661a Author: Mihai Moldovan <ionic@ionic.de> Date: Sat Jun 22 06:28:51 2019 +0200 Makefile: specify SHAREDIR as a default-if-not-specified variable. --- Makefile | 2 +- debian/changelog | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index f100925..ba24cf1 100755 --- a/Makefile +++ b/Makefile @@ -7,7 +7,7 @@ DESTDIR ?= PREFIX ?= /usr/local ETCDIR=/etc/x2go LIBDIR ?= $(PREFIX)/lib/x2go -SHAREDIR=$(PREFIX)/share/x2go +SHAREDIR ?= $(PREFIX)/share/x2go PERL ?= /usr/bin/perl PERL_INSTALLDIRS ?= vendor diff --git a/debian/changelog b/debian/changelog index 2933cd5..e3769fd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -97,6 +97,7 @@ x2goserver (4.1.0.4-0x2go1.1) UNRELEASED; urgency=medium - x2goserver/bin/x2gopath.in: hardcode LIBDIR, PREFIX and SHAREDIR at build time, but also allow re-rooting afterwards - derived from the original values. + - Makefile: specify SHAREDIR as a default-if-not-specified variable. * 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

git-admin＠x2go.org

2:43 a.m.

New subject: [x2goserver] 11/17: Makefile: same change, but for ETCDIR.

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goserver. commit eb8b56b13bb5934a2b3f5de33f4cf5945d6c2382 Author: Mihai Moldovan <ionic@ionic.de> Date: Sat Jun 22 06:30:31 2019 +0200 Makefile: same change, but for ETCDIR. --- Makefile | 2 +- debian/changelog | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index ba24cf1..009f9c4 100755 --- a/Makefile +++ b/Makefile @@ -5,7 +5,7 @@ RM_DIR=rmdir -p --ignore-fail-on-non-empty DESTDIR ?= PREFIX ?= /usr/local -ETCDIR=/etc/x2go +ETCDIR ?= /etc/x2go LIBDIR ?= $(PREFIX)/lib/x2go SHAREDIR ?= $(PREFIX)/share/x2go diff --git a/debian/changelog b/debian/changelog index e3769fd..6ea1d69 100644 --- a/debian/changelog +++ b/debian/changelog @@ -98,6 +98,7 @@ x2goserver (4.1.0.4-0x2go1.1) UNRELEASED; urgency=medium build time, but also allow re-rooting afterwards - derived from the original values. - Makefile: specify SHAREDIR as a default-if-not-specified variable. + - Makefile: same change, but for ETCDIR. * 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

git-admin＠x2go.org

2:43 a.m.

New subject: [x2goserver] 12/17: {libx2go-server-db-perl, x2goserver{, -{common, desktopsharing, extensions, fmbindings, printing, x2goagent, xsession}}}/Makefile: apply default-if-not-specified-logic to all the other Makefiles as well.

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goserver. commit 9603457a5bb779c0beffbfbe3f1971d0b658cdc1 Author: Mihai Moldovan <ionic@ionic.de> Date: Sat Jun 22 06:37:46 2019 +0200 {libx2go-server-db-perl,x2goserver{,-{common,desktopsharing,extensions,fmbindings,printing,x2goagent,xsession}}}/Makefile: apply default-if-not-specified-logic to all the other Makefiles as well. --- debian/changelog | 4 ++++ libx2go-server-db-perl/Makefile | 12 ++++++------ x2goserver-common/Makefile | 12 ++++++------ x2goserver-desktopsharing/Makefile | 10 +++++----- x2goserver-extensions/Makefile | 10 +++++----- x2goserver-fmbindings/Makefile | 10 +++++----- x2goserver-printing/Makefile | 12 ++++++------ x2goserver-x2goagent/Makefile | 10 +++++----- x2goserver-xsession/Makefile | 12 ++++++------ x2goserver/Makefile | 12 ++++++------ 10 files changed, 54 insertions(+), 50 deletions(-) diff --git a/debian/changelog b/debian/changelog index 6ea1d69..77bff21 100644 --- a/debian/changelog +++ b/debian/changelog @@ -99,6 +99,10 @@ x2goserver (4.1.0.4-0x2go1.1) UNRELEASED; urgency=medium original values. - Makefile: specify SHAREDIR as a default-if-not-specified variable. - Makefile: same change, but for ETCDIR. + - {libx2go-server-db-perl,x2goserver{,-{common,desktopsharing,extensions, + fmbindings,printing,x2goagent, + xsession}}}/Makefile: apply + default-if-not-specified-logic to all the other Makefiles as well. * debian/control: + Build-depend upon lsb-release for distro version detection. * debian/x2goserver.manpages: diff --git a/libx2go-server-db-perl/Makefile b/libx2go-server-db-perl/Makefile index 14e37a3..63f57f8 100755 --- a/libx2go-server-db-perl/Makefile +++ b/libx2go-server-db-perl/Makefile @@ -16,12 +16,12 @@ RM_DIR=rmdir -p --ignore-fail-on-non-empty DESTDIR ?= PREFIX ?= /usr/local -ETCDIR=/etc/x2go -BINDIR=$(PREFIX)/bin -SBINDIR=$(PREFIX)/sbin -LIBDIR=$(PREFIX)/lib/x2go -MANDIR=$(PREFIX)/share/man -SHAREDIR=$(PREFIX)/share/x2go +ETCDIR ?= /etc/x2go +BINDIR ?= $(PREFIX)/bin +SBINDIR ?= $(PREFIX)/sbin +LIBDIR ?= $(PREFIX)/lib/x2go +MANDIR ?= $(PREFIX)/share/man +SHAREDIR ?= $(PREFIX)/share/x2go #BIN_SCRIPTS=$(shell cd bin && echo *) #SBIN_SCRIPTS=$(shell cd sbin && echo *) diff --git a/x2goserver-common/Makefile b/x2goserver-common/Makefile index fe2cb99..f65a373 100755 --- a/x2goserver-common/Makefile +++ b/x2goserver-common/Makefile @@ -12,12 +12,12 @@ RM_DIR=rmdir -p --ignore-fail-on-non-empty DESTDIR ?= PREFIX ?= /usr/local -ETCDIR=/etc/x2go -BINDIR=$(PREFIX)/bin -SBINDIR=$(PREFIX)/sbin -LIBDIR=$(PREFIX)/lib/x2go -MANDIR=$(PREFIX)/share/man -SHAREDIR=$(PREFIX)/share/x2go +ETCDIR ?= /etc/x2go +BINDIR ?= $(PREFIX)/bin +SBINDIR ?= $(PREFIX)/sbin +LIBDIR ?= $(PREFIX)/lib/x2go +MANDIR ?= $(PREFIX)/share/man +SHAREDIR ?= $(PREFIX)/share/x2go BIN_SCRIPTS=$(shell cd bin && echo *) SBIN_SCRIPTS=$(shell cd sbin && echo *) diff --git a/x2goserver-desktopsharing/Makefile b/x2goserver-desktopsharing/Makefile index d896a28..e559508 100755 --- a/x2goserver-desktopsharing/Makefile +++ b/x2goserver-desktopsharing/Makefile @@ -12,11 +12,11 @@ RM_DIR=rmdir -p --ignore-fail-on-non-empty DESTDIR ?= PREFIX ?= /usr/local -ETCDIR=/etc/x2go -BINDIR=$(PREFIX)/bin -LIBDIR=$(PREFIX)/lib/x2go -MANDIR=$(PREFIX)/share/man -SHAREDIR=$(PREFIX)/share/x2go +ETCDIR ?= /etc/x2go +BINDIR ?= $(PREFIX)/bin +LIBDIR ?= $(PREFIX)/lib/x2go +MANDIR ?= $(PREFIX)/share/man +SHAREDIR ?= $(PREFIX)/share/x2go BIN_SCRIPTS=$(shell cd bin && echo *) FEATURE_SCRIPTS=$(shell cd share/x2go/x2gofeature.d && echo *.features) diff --git a/x2goserver-extensions/Makefile b/x2goserver-extensions/Makefile index 3648a92..dd0dec3 100755 --- a/x2goserver-extensions/Makefile +++ b/x2goserver-extensions/Makefile @@ -12,11 +12,11 @@ RM_DIR=rmdir -p --ignore-fail-on-non-empty DESTDIR ?= PREFIX ?= /usr/local -ETCDIR=/etc/x2go -BINDIR=$(PREFIX)/bin -LIBDIR=$(PREFIX)/lib/x2go -MANDIR=$(PREFIX)/share/man -SHAREDIR=$(PREFIX)/share/x2go +ETCDIR ?= /etc/x2go +BINDIR ?= $(PREFIX)/bin +LIBDIR ?= $(PREFIX)/lib/x2go +MANDIR ?= $(PREFIX)/share/man +SHAREDIR ?= $(PREFIX)/share/x2go BIN_SCRIPTS=$(shell cd bin && echo *) FEATURE_SCRIPTS=$(shell cd share/x2gofeature.d && echo *.features .placeholder) diff --git a/x2goserver-fmbindings/Makefile b/x2goserver-fmbindings/Makefile index 4b68d95..f1ed6e7 100755 --- a/x2goserver-fmbindings/Makefile +++ b/x2goserver-fmbindings/Makefile @@ -12,11 +12,11 @@ RM_DIR=rmdir -p --ignore-fail-on-non-empty DESTDIR ?= PREFIX ?= /usr/local -ETCDIR=/etc/x2go -BINDIR=$(PREFIX)/bin -LIBDIR=$(PREFIX)/lib/x2go -MANDIR=$(PREFIX)/share/man -SHAREDIR=$(PREFIX)/share/x2go +ETCDIR ?= /etc/x2go +BINDIR ?= $(PREFIX)/bin +LIBDIR ?= $(PREFIX)/lib/x2go +MANDIR ?= $(PREFIX)/share/man +SHAREDIR ?= $(PREFIX)/share/x2go BIN_SCRIPTS=$(shell cd bin && echo *) FEATURE_SCRIPTS=$(shell cd share/x2go/x2gofeature.d && echo *.features) diff --git a/x2goserver-printing/Makefile b/x2goserver-printing/Makefile index 6b6743e..855f4e9 100755 --- a/x2goserver-printing/Makefile +++ b/x2goserver-printing/Makefile @@ -12,12 +12,12 @@ RM_DIR=rmdir -p --ignore-fail-on-non-empty DESTDIR ?= PREFIX ?= /usr/local -ETCDIR=/etc/x2go -BINDIR=$(PREFIX)/bin -SBINDIR=$(PREFIX)/sbin -LIBDIR=$(PREFIX)/lib/x2go -MANDIR=$(PREFIX)/share/man -SHAREDIR=$(PREFIX)/share/x2go +ETCDIR ?= /etc/x2go +BINDIR ?= $(PREFIX)/bin +SBINDIR ?= $(PREFIX)/sbin +LIBDIR ?= $(PREFIX)/lib/x2go +MANDIR ?= $(PREFIX)/share/man +SHAREDIR ?= $(PREFIX)/share/x2go BIN_SCRIPTS=$(shell cd bin && echo *) FEATURE_SCRIPTS=$(shell cd share/x2gofeature.d && echo *.features) diff --git a/x2goserver-x2goagent/Makefile b/x2goserver-x2goagent/Makefile index c9bc7b5..9656c90 100755 --- a/x2goserver-x2goagent/Makefile +++ b/x2goserver-x2goagent/Makefile @@ -13,12 +13,12 @@ RM_DIR=rmdir -p --ignore-fail-on-non-empty DESTDIR ?= PREFIX ?= /usr/local -ETCDIR=/etc/x2go -BINDIR=$(PREFIX)/bin -LIBDIR=$(PREFIX)/lib/x2go +ETCDIR ?= /etc/x2go +BINDIR ?= $(PREFIX)/bin +LIBDIR ?= $(PREFIX)/lib/x2go NXLIBDIR ?= $(LIBDIR)/../nx -MANDIR=$(PREFIX)/share/man -SHAREDIR=$(PREFIX)/share/x2go +MANDIR ?= $(PREFIX)/share/man +SHAREDIR ?= $(PREFIX)/share/x2go BIN_SCRIPTS=x2goagent $(shell cd bin && echo *) FEATURE_SCRIPTS=$(shell cd share/x2go/x2gofeature.d && echo *.features) diff --git a/x2goserver-xsession/Makefile b/x2goserver-xsession/Makefile index 80e6ccf..fc36f1f 100755 --- a/x2goserver-xsession/Makefile +++ b/x2goserver-xsession/Makefile @@ -13,12 +13,12 @@ RM_DIR=rmdir -p --ignore-fail-on-non-empty DESTDIR ?= PREFIX ?= /usr/local -ETCDIR=/etc/x2go -BINDIR=$(PREFIX)/bin -SBINDIR=$(PREFIX)/sbin -LIBDIR=$(PREFIX)/lib/x2go -MANDIR=$(PREFIX)/share/man -SHAREDIR=$(PREFIX)/share/x2go +ETCDIR ?= /etc/x2go +BINDIR ?= $(PREFIX)/bin +SBINDIR ?= $(PREFIX)/sbin +LIBDIR ?= $(PREFIX)/lib/x2go +MANDIR ?= $(PREFIX)/share/man +SHAREDIR ?= $(PREFIX)/share/x2go XSESSIONDIR ?= /etc/X11/Xsession.d XSESSIONOPTIONFILE ?= /etc/X11/Xsession.options diff --git a/x2goserver/Makefile b/x2goserver/Makefile index 7204c1a..3fea7dd 100755 --- a/x2goserver/Makefile +++ b/x2goserver/Makefile @@ -12,12 +12,12 @@ RM_DIR=rmdir -p --ignore-fail-on-non-empty DESTDIR ?= PREFIX ?= /usr/local -ETCDIR=/etc/x2go -BINDIR=$(PREFIX)/bin -SBINDIR=$(PREFIX)/sbin -LIBDIR=$(PREFIX)/lib/x2go -MANDIR=$(PREFIX)/share/man -SHAREDIR=$(PREFIX)/share/x2go +ETCDIR ?= /etc/x2go +BINDIR ?= $(PREFIX)/bin +SBINDIR ?= $(PREFIX)/sbin +LIBDIR ?= $(PREFIX)/lib/x2go +MANDIR ?= $(PREFIX)/share/man +SHAREDIR ?= $(PREFIX)/share/x2go BIN_SCRIPTS=$(shell cd bin && echo *) SBIN_SCRIPTS=$(shell cd sbin && echo *) -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goserver.git

git-admin＠x2go.org

2:43 a.m.

New subject: [x2goserver] 13/17: x2goserver/Makefile: add support for $(NXLIBDIR).

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goserver. commit 773d6409e17e2137f3ec2d2f38abc6c48e17f2ca Author: Mihai Moldovan <ionic@ionic.de> Date: Sun Jun 23 04:16:26 2019 +0200 x2goserver/Makefile: add support for $(NXLIBDIR). --- debian/changelog | 1 + x2goserver/Makefile | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 77bff21..e7f396d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -103,6 +103,7 @@ x2goserver (4.1.0.4-0x2go1.1) UNRELEASED; urgency=medium fmbindings,printing,x2goagent, xsession}}}/Makefile: apply default-if-not-specified-logic to all the other Makefiles as well. + - x2goserver/Makefile: add support for $(NXLIBDIR). * debian/control: + Build-depend upon lsb-release for distro version detection. * debian/x2goserver.manpages: diff --git a/x2goserver/Makefile b/x2goserver/Makefile index 3fea7dd..d3dc59d 100755 --- a/x2goserver/Makefile +++ b/x2goserver/Makefile @@ -16,6 +16,7 @@ ETCDIR ?= /etc/x2go BINDIR ?= $(PREFIX)/bin SBINDIR ?= $(PREFIX)/sbin LIBDIR ?= $(PREFIX)/lib/x2go +NXLIBDIR ?= $(LIBDIR)/../nx MANDIR ?= $(PREFIX)/share/man SHAREDIR ?= $(PREFIX)/share/x2go @@ -51,9 +52,10 @@ build-indep: build_pod2man build_man2html BINDIR='$(BINDIR)'; \ SBINDIR='$(SBINDIR)'; \ LIBDIR='$(LIBDIR)'; \ + NXLIBDIR='$(NXLIBDIR)'; \ MANDIR='$(MANDIR)'; \ SHAREDIR='$(SHAREDIR)'; \ - for subst in 'PREFIX' 'ETCDIR' 'BINDIR' 'SBINDIR' 'LIBDIR' 'MANDIR' 'SHAREDIR'; do \ + for subst in 'PREFIX' 'ETCDIR' 'BINDIR' 'SBINDIR' 'LIBDIR' 'NXLIBDIR' 'MANDIR' 'SHAREDIR'; do \ sed -e "s#@@$${subst}@@#$${!subst}#g" "$${gen_file}" > "$${file}"; \ done; \ fi; \ -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goserver.git

git-admin＠x2go.org

2:43 a.m.

New subject: [x2goserver] 14/17: x2goserver/bin/x2gopath.in: switch to bash.

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goserver. commit 18c6c9259b4509772c449bb872ba92c715b744d6 Author: Mihai Moldovan <ionic@ionic.de> Date: Sun Jun 23 04:27:19 2019 +0200 x2goserver/bin/x2gopath.in: switch to bash. --- debian/changelog | 1 + x2goserver/bin/x2gopath.in | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index e7f396d..050a239 100644 --- a/debian/changelog +++ b/debian/changelog @@ -104,6 +104,7 @@ x2goserver (4.1.0.4-0x2go1.1) UNRELEASED; urgency=medium xsession}}}/Makefile: apply default-if-not-specified-logic to all the other Makefiles as well. - x2goserver/Makefile: add support for $(NXLIBDIR). + - x2goserver/bin/x2gopath.in: switch to bash. * debian/control: + Build-depend upon lsb-release for distro version detection. * debian/x2goserver.manpages: diff --git a/x2goserver/bin/x2gopath.in b/x2goserver/bin/x2gopath.in index 4b07f95..f8b2e47 100755 --- a/x2goserver/bin/x2gopath.in +++ b/x2goserver/bin/x2gopath.in @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # Copyright (C) 2007-2018 X2Go Project - https://wiki.x2go.org # Copyright (C) 2012-2018 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de> -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goserver.git

git-admin＠x2go.org

2:43 a.m.

New subject: [x2goserver] 15/17: x2goserver/bin/x2gopath.in: fix warning message to also include SHAREDIR.

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goserver. commit f5a687416e83e6d2ca064b734fa7e890e2d02093 Author: Mihai Moldovan <ionic@ionic.de> Date: Sun Jun 23 04:28:35 2019 +0200 x2goserver/bin/x2gopath.in: fix warning message to also include SHAREDIR. --- debian/changelog | 2 ++ x2goserver/bin/x2gopath.in | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 050a239..96f3b82 100644 --- a/debian/changelog +++ b/debian/changelog @@ -105,6 +105,8 @@ x2goserver (4.1.0.4-0x2go1.1) UNRELEASED; urgency=medium default-if-not-specified-logic to all the other Makefiles as well. - x2goserver/Makefile: add support for $(NXLIBDIR). - x2goserver/bin/x2gopath.in: switch to bash. + - x2goserver/bin/x2gopath.in: fix warning message to also include + SHAREDIR. * debian/control: + Build-depend upon lsb-release for distro version detection. * debian/x2goserver.manpages: diff --git a/x2goserver/bin/x2gopath.in b/x2goserver/bin/x2gopath.in index f8b2e47..29a9b4f 100755 --- a/x2goserver/bin/x2gopath.in +++ b/x2goserver/bin/x2gopath.in @@ -40,8 +40,8 @@ fi typeset x2go_share_subdir="${installed_sharedir#${installed_prefix}}" typeset x2go_lib_subdir="${installed_libdir#${installed_prefix}}" -if [ "${x2go_lib_subdir}" = "${installed_libdir}" ]; then - printf 'WARNING: X2Go Server was built with a LIBDIR (%s) not starting with PREFIX (%s). Such a setup will likely not work correctly.\n' "${installed_libdir}" "${installed_prefix}" >&2 +if [ "${x2go_share_subdir}" = "${installed_sharedir}" ] || [ "${x2go_lib_subdir}" = "${installed_libdir}" ]; then + printf 'WARNING: X2Go Server was built with a SHAREDIR (%s) or LIBDIR (%s) not starting with PREFIX (%s). Such a setup will likely not work correctly.\n' "${installed_sharedir}" "${installed_libdir}" "${installed_prefix}" >&2 fi # Try to fetch the system library dir. -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goserver.git

git-admin＠x2go.org

2:43 a.m.

New subject: [x2goserver] 16/17: x2goserver/bin/x2gopath.in: add and use support for NXLIBDIR; drop the lib-subdir detection.

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goserver. commit 6ffc9ee3fcda5807fd56f0d9160700bb8f5aaaa5 Author: Mihai Moldovan <ionic@ionic.de> Date: Sun Jun 23 04:29:49 2019 +0200 x2goserver/bin/x2gopath.in: add and use support for NXLIBDIR; drop the lib-subdir detection. --- debian/changelog | 2 ++ x2goserver/bin/x2gopath.in | 17 ++++++----------- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/debian/changelog b/debian/changelog index 96f3b82..a268a0e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -107,6 +107,8 @@ x2goserver (4.1.0.4-0x2go1.1) UNRELEASED; urgency=medium - x2goserver/bin/x2gopath.in: switch to bash. - x2goserver/bin/x2gopath.in: fix warning message to also include SHAREDIR. + - x2goserver/bin/x2gopath.in: add and use support for NXLIBDIR; drop the + lib-subdir detection. * debian/control: + Build-depend upon lsb-release for distro version detection. * debian/x2goserver.manpages: diff --git a/x2goserver/bin/x2gopath.in b/x2goserver/bin/x2gopath.in index 29a9b4f..1c5b51a 100755 --- a/x2goserver/bin/x2gopath.in +++ b/x2goserver/bin/x2gopath.in @@ -24,6 +24,7 @@ typeset installed_prefix='@@PREFIX@@' typeset installed_libdir='@@LIBDIR@@' +typeset installed_nxlibdir='@@NXLIBDIR@@' typeset installed_sharedir='@@SHAREDIR@@' typeset base="${BASH_SOURCE[0]%/*}" @@ -39,25 +40,19 @@ fi typeset x2go_share_subdir="${installed_sharedir#${installed_prefix}}" typeset x2go_lib_subdir="${installed_libdir#${installed_prefix}}" +typeset x2go_nxlib_subdir="${installed_nxlibdir#${installed_prefix}}" -if [ "${x2go_share_subdir}" = "${installed_sharedir}" ] || [ "${x2go_lib_subdir}" = "${installed_libdir}" ]; then - printf 'WARNING: X2Go Server was built with a SHAREDIR (%s) or LIBDIR (%s) not starting with PREFIX (%s). Such a setup will likely not work correctly.\n' "${installed_sharedir}" "${installed_libdir}" "${installed_prefix}" >&2 +if [ "${x2go_share_subdir}" = "${installed_sharedir}" ] || [ "${x2go_lib_subdir}" = "${installed_libdir}" ] || [ "${x2go_nxlib_subdir}" = "${installed_nxlibdir}" ]; then + printf 'WARNING: X2Go Server was built with a SHAREDIR (%s), LIBDIR (%s) or NXLIBDIR (%s) not starting with PREFIX (%s). Such a setup will likely not work correctly.\n' "${installed_sharedir}" "${installed_libdir}" "${installed_nxlibdir}" "${installed_prefix}" >&2 fi -# Try to fetch the system library dir. -# Drop leading slashes. -typeset lib_subdir="$(sed -e 's#^/*##g' <<< "${x2go_lib_subdir}")" -# Extract first element - should be the library directory. -lib_subdir="${lib_subdir%%/*}" - # Distributions should not modify the following section, but rather build the package with their custom PREFIX, LIBDIR, SHAREDIR etc. values. case "${1}" in ('base') printf '%s' "${base}";; ('lib'|'libexec') printf '%s' "${base}/${x2go_lib_subdir}";; ('share') printf '%s' "${base}/${x2go_share_subdir}";; - # Assume that X2Go Server and nx-libs share the same library subdir. - ('nx-x11') printf '%s' "${base}/${lib_subdir}/nx/X11";; - ('xinerama') printf '%s' "${base}/${lib_subdir}/nx/X11/Xinerama";; + ('nx-x11') printf '%s' "${base}/${x2go_nxlib_subdir}/X11";; + ('xinerama') printf '%s' "${base}/${x2go_nxlib_subdir}/X11/Xinerama";; (*) exit 1;; esac; -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goserver.git

git-admin＠x2go.org

2:43 a.m.

New subject: [x2goserver] 17/17: x2goserver/bin/x2gopath.in: use [] instead of test, for consistency.

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goserver. commit c2efe7634f46c1b9ae28e93026ae105220a63c6b Author: Mihai Moldovan <ionic@ionic.de> Date: Sun Jun 23 04:42:37 2019 +0200 x2goserver/bin/x2gopath.in: use [] instead of test, for consistency. --- debian/changelog | 1 + x2goserver/bin/x2gopath.in | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index a268a0e..8d8eb4b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -109,6 +109,7 @@ x2goserver (4.1.0.4-0x2go1.1) UNRELEASED; urgency=medium SHAREDIR. - x2goserver/bin/x2gopath.in: add and use support for NXLIBDIR; drop the lib-subdir detection. + - x2goserver/bin/x2gopath.in: use [] instead of test, for consistency. * debian/control: + Build-depend upon lsb-release for distro version detection. * debian/x2goserver.manpages: diff --git a/x2goserver/bin/x2gopath.in b/x2goserver/bin/x2gopath.in index 1c5b51a..7db9378 100755 --- a/x2goserver/bin/x2gopath.in +++ b/x2goserver/bin/x2gopath.in @@ -28,7 +28,7 @@ typeset installed_nxlibdir='@@NXLIBDIR@@' typeset installed_sharedir='@@SHAREDIR@@' typeset base="${BASH_SOURCE[0]%/*}" -if test "${base}" = "${BASH_SOURCE[0]}"; then +if [ "${base}" = "${BASH_SOURCE[0]}" ]; then base='.' fi -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goserver.git

2177

Age (days ago)

2177

Last active (days ago)

x2go-commits@lists.x2go.org

17 comments

1 participants

tags (0)

participants (1)

git-admin＠x2go.org