[X2Go-Commits] [x2goserver] 01/01: x2goserver-extensions: add runcommand.d hooks to x2goserver-extensions Makefile. Fix changelog.
git-admin at x2go.org
git-admin at x2go.org
Fri Mar 27 08:43:24 CET 2015
This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch release/4.0.1.x
in repository x2goserver.
commit b39dc01694f24d67ef878c1119f4448c8dbd062b
Author: Mihai Moldovan <ionic at ionic.de>
Date: Fri Mar 27 08:42:24 2015 +0100
x2goserver-extensions: add runcommand.d hooks to x2goserver-extensions Makefile. Fix changelog.
---
debian/changelog | 2 ++
x2goserver-extensions/Makefile | 12 ++++++++++++
2 files changed, 14 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index 86d34e8..71be34f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,8 @@ x2goserver (4.0.1.20-0x2go1) UNRELEASED; urgency=low
Based on a patch submitted by Jason Alavaliant. Fixes: #812.
- x2goserver/bin/x2gogetapps: do not print spurious newlines.
- Change string "X2go" to "X2Go" where appropriate.
+ - Add runcommand.d hooks to x2goserver-extensions Makefile.
+ * x2goserver.spec:
- Add sudo and logcheck as BuildRequires and Requires. Don't own
directories that are owned by sudo and logcheck. Logcheck is not
available on *SUSE, FC < 20 and RHEL, so for those distros still own the
diff --git a/x2goserver-extensions/Makefile b/x2goserver-extensions/Makefile
index e84f0ea..3648a92 100755
--- a/x2goserver-extensions/Makefile
+++ b/x2goserver-extensions/Makefile
@@ -65,6 +65,9 @@ install_scripts:
$(INSTALL_DIR) $(DESTDIR)$(LIBDIR)/extensions/pre-terminate.d
$(INSTALL_DIR) $(DESTDIR)$(LIBDIR)/extensions/post-terminate.d
$(INSTALL_DIR) $(DESTDIR)$(LIBDIR)/extensions/fail-terminate.d
+ $(INSTALL_DIR) $(DESTDIR)$(LIBDIR)/extensions/pre-runcommand.d
+ $(INSTALL_DIR) $(DESTDIR)$(LIBDIR)/extensions/post-runcommand.d
+ $(INSTALL_DIR) $(DESTDIR)$(LIBDIR)/extensions/fail-runcommand.d
$(INSTALL_DIR) $(DESTDIR)$(SHAREDIR)
$(INSTALL_DIR) $(DESTDIR)$(SHAREDIR)/x2gofeature.d
$(INSTALL_PROGRAM) bin/* $(DESTDIR)$(BINDIR)/
@@ -80,6 +83,9 @@ install_scripts:
$(INSTALL_FILE) lib/extensions/pre-terminate.d/.placeholder $(DESTDIR)$(LIBDIR)/extensions/pre-terminate.d/
$(INSTALL_FILE) lib/extensions/post-terminate.d/.placeholder $(DESTDIR)$(LIBDIR)/extensions/post-terminate.d/
$(INSTALL_FILE) lib/extensions/fail-terminate.d/.placeholder $(DESTDIR)$(LIBDIR)/extensions/fail-terminate.d/
+ $(INSTALL_FILE) lib/extensions/pre-runcommand.d/.placeholder $(DESTDIR)$(LIBDIR)/extensions/pre-runcommand.d/
+ $(INSTALL_FILE) lib/extensions/post-runcommand.d/.placeholder $(DESTDIR)$(LIBDIR)/extensions/post-runcommand.d/
+ $(INSTALL_FILE) lib/extensions/fail-runcommand.d/.placeholder $(DESTDIR)$(LIBDIR)/extensions/fail-runcommand.d/
$(INSTALL_PROGRAM) share/x2gofeature.d/*.features $(DESTDIR)$(SHAREDIR)/x2gofeature.d/
install_config:
@@ -112,6 +118,9 @@ uninstall_scripts:
$(RM_FILE) $(DESTDIR)$(LIBDIR)/extensions/pre-terminate.d/.placeholder
$(RM_FILE) $(DESTDIR)$(LIBDIR)/extensions/post-terminate.d/.placeholder
$(RM_FILE) $(DESTDIR)$(LIBDIR)/extensions/fail-terminate.d/.placeholder
+ $(RM_FILE) $(DESTDIR)$(LIBDIR)/extensions/pre-runcommand.d/.placeholder
+ $(RM_FILE) $(DESTDIR)$(LIBDIR)/extensions/post-runcommand.d/.placeholder
+ $(RM_FILE) $(DESTDIR)$(LIBDIR)/extensions/fail-runcommand.d/.placeholder
$(RM_DIR) $(DESTDIR)$(LIBDIR)/extensions/pre-start.d/
$(RM_DIR) $(DESTDIR)$(LIBDIR)/extensions/post-start.d/
$(RM_DIR) $(DESTDIR)$(LIBDIR)/extensions/fail-start.d/
@@ -124,6 +133,9 @@ uninstall_scripts:
$(RM_DIR) $(DESTDIR)$(LIBDIR)/extensions/pre-terminate.d/
$(RM_DIR) $(DESTDIR)$(LIBDIR)/extensions/post-terminate.d/
$(RM_DIR) $(DESTDIR)$(LIBDIR)/extensions/fail-terminate.d/
+ $(RM_DIR) $(DESTDIR)$(LIBDIR)/extensions/pre-runcommand.d/
+ $(RM_DIR) $(DESTDIR)$(LIBDIR)/extensions/post-runcommand.d/
+ $(RM_DIR) $(DESTDIR)$(LIBDIR)/extensions/fail-runcommand.d/
for file in $(FEATURE_SCRIPTS); do $(RM_FILE) $(DESTDIR)$(SHAREDIR)/x2gofeature.d/$$file; done
uninstall_config:
--
Alioth's /srv/git/code.x2go.org/x2goserver.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
More information about the x2go-commits
mailing list