[X2Go-Commits] x2goserver.git - build-baikal (branch) updated: 3.0.99-2-301-g79768a5
X2Go dev team
git-admin at x2go.org
Fri Jan 3 20:52:39 CET 2014
The branch, build-baikal has been updated
via 79768a516c661c7c8c4607bd4fda1290b19ddd28 (commit)
from 55e547b1526b674a7d60ff42c5b3e49b6a7861f5 (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 | 2 ++
x2goserver-compat/Makefile | 4 ++++
x2goserver-extensions/Makefile | 4 ++++
x2goserver-printing/Makefile | 5 ++++-
x2goserver/Makefile | 8 ++++++--
5 files changed, 20 insertions(+), 3 deletions(-)
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 9793cd4..ab03327 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -84,6 +84,8 @@ x2goserver (3.0.99.5-0~x2go3) UNRELEASED; urgency=low
x2goserver-printing.
* Add x2gofeature man page.
* Move x2goversion into x2goserver core package.
+ * Makefile update for including x2gofeature scripts into installation, minor fixes
+ to x2goserver core package Makefile.
[ Ivan Kabaivanov ]
* Makefile fix around man page installation in x2goserver-compat package.
diff --git a/x2goserver-compat/Makefile b/x2goserver-compat/Makefile
index e1bc30f..576f9ce 100755
--- a/x2goserver-compat/Makefile
+++ b/x2goserver-compat/Makefile
@@ -22,6 +22,7 @@ SHAREDIR=$(PREFIX)/share/x2go
BIN_SCRIPTS=$(shell cd bin && ls)
#SBIN_SCRIPTS=$(shell cd sbin && ls)
#LIB_FILES=$(shell cd lib && ls)
+FEATURE_SCRIPTS=$(shell cd share/x2gofeature.d && ls *.features)
man_pages = `cd man && find * -type f`
@@ -53,9 +54,11 @@ install_scripts:
$(INSTALL_DIR) $(DESTDIR)$(BINDIR)
# $(INSTALL_DIR) $(DESTDIR)$(SBINDIR)
# $(INSTALL_DIR) $(DESTDIR)$(LIBDIR)
+ $(INSTALL_DIR) $(DESTDIR)$(SHAREDIR)
$(INSTALL_PROGRAM) bin/* $(DESTDIR)$(BINDIR)/
# $(INSTALL_PROGRAM) sbin/* $(DESTDIR)$(SBINDIR)/
# $(INSTALL_FILE) lib/* $(DESTDIR)$(LIBDIR)/
+ $(INSTALL_PROGRAM) share/x2gofeature.d/*.features $(DESTDIR)$(SHAREDIR)/x2gofeature.d/
install_config:
# $(INSTALL_DIR) $(DESTDIR)$(ETCDIR)
@@ -79,6 +82,7 @@ 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 $(FEATURE_SCRIPTS); do $(RM_FILE) $(DESTDIR)$(SHAREDIR)/x2gofeature.d/$$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) || true
diff --git a/x2goserver-extensions/Makefile b/x2goserver-extensions/Makefile
index b234c16..591a598 100755
--- a/x2goserver-extensions/Makefile
+++ b/x2goserver-extensions/Makefile
@@ -22,6 +22,7 @@ SHAREDIR=$(PREFIX)/share/x2go
BIN_SCRIPTS=$(shell cd bin && ls)
#SBIN_SCRIPTS=$(shell cd sbin && ls)
#LIB_FILES=$(shell cd lib && ls)
+FEATURE_SCRIPTS=$(shell cd share/x2gofeature.d && ls *.features)
man_pages = `cd man && find * -type f`
@@ -53,9 +54,11 @@ install_scripts:
$(INSTALL_DIR) $(DESTDIR)$(BINDIR)
# $(INSTALL_DIR) $(DESTDIR)$(SBINDIR)
# $(INSTALL_DIR) $(DESTDIR)$(LIBDIR)
+ $(INSTALL_DIR) $(DESTDIR)$(SHAREDIR)
$(INSTALL_PROGRAM) bin/* $(DESTDIR)$(BINDIR)/
# $(INSTALL_PROGRAM) sbin/* $(DESTDIR)$(SBINDIR)/
# $(INSTALL_FILE) lib/* $(DESTDIR)$(LIBDIR)/
+ $(INSTALL_PROGRAM) share/x2gofeature.d/*.features $(DESTDIR)$(SHAREDIR)/x2gofeature.d/
install_config:
# $(INSTALL_DIR) $(DESTDIR)$(ETCDIR)
@@ -82,6 +85,7 @@ uninstall_scripts:
# 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) || true
+ for file in $(FEATURE_SCRIPTS); do $(RM_FILE) $(DESTDIR)$(SHAREDIR)/x2gofeature.d/$$file; done
uninstall_config:
# $(RM_FILE) $(DESTDIR)$(ETCDIR)/x2goserver.conf
diff --git a/x2goserver-printing/Makefile b/x2goserver-printing/Makefile
index e41ff98..04f93bf 100755
--- a/x2goserver-printing/Makefile
+++ b/x2goserver-printing/Makefile
@@ -22,6 +22,7 @@ SHAREDIR=$(PREFIX)/share/x2go
BIN_SCRIPTS=$(shell cd bin && ls)
#SBIN_SCRIPTS=$(shell cd sbin && ls)
#LIB_FILES=$(shell cd lib && ls)
+FEATURE_SCRIPTS=$(shell cd share/x2gofeature.d && ls *.features)
man_pages = `cd man && find * -type f`
@@ -53,9 +54,11 @@ install_scripts:
$(INSTALL_DIR) $(DESTDIR)$(BINDIR)
# $(INSTALL_DIR) $(DESTDIR)$(SBINDIR)
# $(INSTALL_DIR) $(DESTDIR)$(LIBDIR)
+ $(INSTALL_DIR) $(DESTDIR)$(SHAREDIR)
$(INSTALL_PROGRAM) bin/* $(DESTDIR)$(BINDIR)/
# $(INSTALL_PROGRAM) sbin/* $(DESTDIR)$(SBINDIR)/
# $(INSTALL_FILE) lib/* $(DESTDIR)$(LIBDIR)/
+ $(INSTALL_PROGRAM) share/x2gofeature.d/*.features $(DESTDIR)$(SHAREDIR)/x2gofeature.d/
install_config:
# $(INSTALL_DIR) $(DESTDIR)$(ETCDIR)
@@ -81,7 +84,7 @@ 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) || true
+ for file in $(FEATURE_SCRIPTS); do $(RM_FILE) $(DESTDIR)$(SHAREDIR)/x2gofeature.d/$$file; done
uninstall_config:
# $(RM_FILE) $(DESTDIR)$(ETCDIR)/x2goserver.conf
diff --git a/x2goserver/Makefile b/x2goserver/Makefile
index 0bf496c..2cc1bbd 100755
--- a/x2goserver/Makefile
+++ b/x2goserver/Makefile
@@ -22,6 +22,7 @@ SHAREDIR=$(PREFIX)/share/x2go
BIN_SCRIPTS=$(shell cd bin && ls)
SBIN_SCRIPTS=$(shell cd sbin && ls)
LIB_FILES=$(shell cd lib && ls)
+FEATURE_SCRIPTS=$(shell cd share/x2gofeature.d && ls *.features)
man_pages = `cd man && find * -type f`
@@ -59,15 +60,15 @@ 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) x2gosqlitewrapper $(DESTDIR)$(LIBDIR)/
$(INSTALL_PROGRAM) lib/* $(DESTDIR)$(LIBDIR)/
+ $(INSTALL_PROGRAM) share/x2gofeature.d/*.features $(DESTDIR)$(SHAREDIR)/x2gofeature.d/
chmod a-x $(DESTDIR)$(LIBDIR)/*.pm
chown root:x2gouser $(DESTDIR)$(LIBDIR)/x2gosqlitewrapper
chmod 2755 $(DESTDIR)$(LIBDIR)/x2gosqlitewrapper
- chown root:x2goprint $(DESTDIR)$(BINDIR)/x2goprint
- chmod 2755 $(DESTDIR)$(BINDIR)/x2goprint
install_config:
$(INSTALL_DIR) $(DESTDIR)$(ETCDIR)
@@ -93,8 +94,11 @@ 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
$(RM_FILE) $(DESTDIR)$(LIBDIR)/x2gosqlitewrapper
$(RM_DIR) $(DESTDIR)$(LIBDIR) || true
+ $(RM_DIR) $(DESTDIR)$(SHAREDIR)/x2gofeature.d || true
+ $(RM_DIR) $(DESTDIR)$(SHAREDIR) || true
uninstall_config:
$(RM_FILE) $(DESTDIR)$(ETCDIR)/x2goserver.conf
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).
More information about the x2go-commits
mailing list