The branch, build-main has been updated via adf8284a0ff84d95b427708df1b5c7f0e8e3caf7 (commit) from 13ec71f7df3efae239c2dbe96a5abe9370fa7b2f (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: debian/changelog | 1 + x2goserver-extensions/Makefile | 17 ----------------- x2goserver-fmbindings/Makefile | 3 --- x2goserver-printing/Makefile | 2 -- x2goserver-xsession/Makefile | 9 --------- 5 files changed, 1 insertion(+), 31 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 9c562e3..376fe97 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,7 @@ x2goserver (4.0.1.10-0x2go1) UNRELEASED; urgency=low - x2goserver-printing/Makefile: create feature.d directory before installing files into it. - Handle TCP listening of x2goagent in x2goagent.options. (Fixes: #354). + - Clean up Makefiles, remove commented out line. * Grab systemd service file from Fedora and ship it upstream. * Add init script for RPM based distro. Taken from the Fedora package. diff --git a/x2goserver-extensions/Makefile b/x2goserver-extensions/Makefile index cc15e52..f357856 100755 --- a/x2goserver-extensions/Makefile +++ b/x2goserver-extensions/Makefile @@ -14,14 +14,11 @@ 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 BIN_SCRIPTS=$(shell cd bin && echo *) -#SBIN_SCRIPTS=$(shell cd sbin && echo *) -#LIB_FILES=$(shell cd lib && echo *) FEATURE_SCRIPTS=$(shell cd share/x2gofeature.d && echo *.features .placeholder) man_pages = `cd man && find * -type f` @@ -52,7 +49,6 @@ install: 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)$(LIBDIR)/extensions $(INSTALL_DIR) $(DESTDIR)$(LIBDIR)/extensions/pre-start.d @@ -70,7 +66,6 @@ install_scripts: $(INSTALL_DIR) $(DESTDIR)$(SHAREDIR) $(INSTALL_DIR) $(DESTDIR)$(SHAREDIR)/x2gofeature.d $(INSTALL_PROGRAM) bin/* $(DESTDIR)$(BINDIR)/ -# $(INSTALL_PROGRAM) sbin/* $(DESTDIR)$(SBINDIR)/ $(INSTALL_FILE) lib/extensions/pre-start.d/.placeholder $(DESTDIR)$(LIBDIR)/extensions/pre-start.d/ $(INSTALL_FILE) lib/extensions/post-start.d/.placeholder $(DESTDIR)$(LIBDIR)/extensions/post-start.d/ $(INSTALL_FILE) lib/extensions/fail-start.d/.placeholder $(DESTDIR)$(LIBDIR)/extensions/fail-start.d/ @@ -86,11 +81,6 @@ install_scripts: $(INSTALL_PROGRAM) share/x2gofeature.d/*.features $(DESTDIR)$(SHAREDIR)/x2gofeature.d/ install_config: -# $(INSTALL_DIR) $(DESTDIR)$(ETCDIR) -# $(INSTALL_DIR) $(DESTDIR)$(ETCDIR)/x2gosql -# $(INSTALL_DIR) $(DESTDIR)$(ETCDIR)/x2gosql/passwords -# $(INSTALL_FILE) etc/x2goserver.conf $(DESTDIR)$(ETCDIR)/ -# $(INSTALL_FILE) etc/x2gosql/sql $(DESTDIR)$(ETCDIR)/x2gosql install_man: $(INSTALL_DIR) $(DESTDIR)$(MANDIR) @@ -107,8 +97,6 @@ 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 $(RM_DIR) $(DESTDIR)$(LIBDIR)/extensions/ || true $(RM_FILE) $(DESTDIR)$(LIBDIR)/extensions/pre-start.d/.placeholder $(RM_FILE) $(DESTDIR)$(LIBDIR)/extensions/post-start.d/.placeholder @@ -137,11 +125,6 @@ uninstall_scripts: for file in $(FEATURE_SCRIPTS); do $(RM_FILE) $(DESTDIR)$(SHAREDIR)/x2gofeature.d/$$file; done uninstall_config: -# $(RM_FILE) $(DESTDIR)$(ETCDIR)/x2goserver.conf -# $(RM_FILE) $(DESTDIR)$(ETCDIR)/x2gosql/sql -# $(RM_DIR) $(DESTDIR)$(ETCDIR) || true -# $(RM_DIR) $(DESTDIR)$(ETCDIR)/x2gosql/passwords || true -# $(RM_DIR) $(DESTDIR)$(ETCDIR)/x2gosql || true uninstall_man: for file in $(BIN_SCRIPTS); do $(RM_FILE) $(DESTDIR)$(MANDIR)/man8/$$file.8.gz; done diff --git a/x2goserver-fmbindings/Makefile b/x2goserver-fmbindings/Makefile index 7ba98af..248bd7a 100755 --- a/x2goserver-fmbindings/Makefile +++ b/x2goserver-fmbindings/Makefile @@ -14,14 +14,11 @@ 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 BIN_SCRIPTS=$(shell cd bin && echo *) -#SBIN_SCRIPTS=$(shell cd sbin && echo *) -#LIB_FILES=$(shell cd lib && echo *) FEATURE_SCRIPTS=$(shell cd share/x2go/x2gofeature.d && echo *.features) man_pages = `cd man && find * -type f` diff --git a/x2goserver-printing/Makefile b/x2goserver-printing/Makefile index 325934c..0f14d37 100755 --- a/x2goserver-printing/Makefile +++ b/x2goserver-printing/Makefile @@ -20,8 +20,6 @@ MANDIR=$(PREFIX)/share/man SHAREDIR=$(PREFIX)/share/x2go BIN_SCRIPTS=$(shell cd bin && echo *) -#SBIN_SCRIPTS=$(shell cd sbin && echo *) -#LIB_FILES=$(shell cd lib && echo *) FEATURE_SCRIPTS=$(shell cd share/x2gofeature.d && echo *.features) man_pages = `cd man && find * -type f` diff --git a/x2goserver-xsession/Makefile b/x2goserver-xsession/Makefile index 7118d85..07921e0 100755 --- a/x2goserver-xsession/Makefile +++ b/x2goserver-xsession/Makefile @@ -23,18 +23,9 @@ SHAREDIR=$(PREFIX)/share/x2go XSESSIONDIR ?= /etc/X11/Xsession.d XSESSIONOPTIONFILE ?= /etc/X11/Xsession.options -#BIN_SCRIPTS=$(shell cd bin && echo *) -#SBIN_SCRIPTS=$(shell cd sbin && echo *) -#LIB_FILES=$(shell cd lib && echo *) ETC_FILES=$(shell cd etc && echo *) FEATURE_SCRIPTS=$(shell cd share/x2gofeature.d && echo *.features) -#man_pages = `cd man && find * -type f` - -#MAN2HTML_BIN = man2html -#MAN2HTML_SRC = man -#MAN2HTML_DEST = .build_man2html/html - all: clean build build: build-indep 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).