[X2Go-Commits] [x2goserver] 02/03: extensions: add data directory in hooks directory used for shared data/programs/scripts.

git-admin at x2go.org git-admin at x2go.org
Mon Nov 24 20:32:38 CET 2014


This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch x2goserver-xsettings
in repository x2goserver.

commit 2f134cc459e18c44417fda8d378bd881c54ab048
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Mon Nov 24 19:30:13 2014 +0100

    extensions: add data directory in hooks directory used for shared data/programs/scripts.
---
 debian/changelog               |    2 ++
 x2goserver-extensions/Makefile |    6 +++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index c3d5acc..8b7d80a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -149,6 +149,8 @@ x2goserver (4.1.0.0-0x2go1.1) UNRELEASED; urgency=low
     - x2gopath now knows the 'etc' component -- generated at build time out of
       the ETCDIR Makefile directive.
     - Various typo and whitespace fixes across components.
+    - Add data directory in x2goserver-extensions. Shared data (e.g., shell
+      scripts) can be put there.
   * x2goserver.spec:
     - Add x2goserver-settings package.
   * debian/control:
diff --git a/x2goserver-extensions/Makefile b/x2goserver-extensions/Makefile
index e84f0ea..2516381 100755
--- a/x2goserver-extensions/Makefile
+++ b/x2goserver-extensions/Makefile
@@ -53,6 +53,7 @@ install_scripts:
 	$(INSTALL_DIR) $(DESTDIR)$(BINDIR)
 	$(INSTALL_DIR) $(DESTDIR)$(LIBDIR)
 	$(INSTALL_DIR) $(DESTDIR)$(LIBDIR)/extensions
+	$(INSTALL_DIR) $(DESTDIR)$(LIBDIR)/extensions/data
 	$(INSTALL_DIR) $(DESTDIR)$(LIBDIR)/extensions/pre-start.d
 	$(INSTALL_DIR) $(DESTDIR)$(LIBDIR)/extensions/post-start.d
 	$(INSTALL_DIR) $(DESTDIR)$(LIBDIR)/extensions/fail-start.d
@@ -68,6 +69,7 @@ install_scripts:
 	$(INSTALL_DIR) $(DESTDIR)$(SHAREDIR)
 	$(INSTALL_DIR) $(DESTDIR)$(SHAREDIR)/x2gofeature.d
 	$(INSTALL_PROGRAM) bin/*                $(DESTDIR)$(BINDIR)/
+	$(INSTALL_FILE) lib/extensions/data/.placeholder $(DESTDIR)$(LIBDIR)/extensions/data/
 	$(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/
@@ -99,7 +101,7 @@ uninstall: uninstall_scripts uninstall_config uninstall_man uninstall_version
 
 uninstall_scripts:
 	for file in $(BIN_SCRIPTS); do $(RM_FILE) $(DESTDIR)$(BINDIR)/$$file; done
-	$(RM_DIR) $(DESTDIR)$(LIBDIR)/extensions/ || true
+	$(RM_FILE) $(DESTDIR)$(LIBDIR)/extensions/data/.placeholder
 	$(RM_FILE) $(DESTDIR)$(LIBDIR)/extensions/pre-start.d/.placeholder
 	$(RM_FILE) $(DESTDIR)$(LIBDIR)/extensions/post-start.d/.placeholder
 	$(RM_FILE) $(DESTDIR)$(LIBDIR)/extensions/fail-start.d/.placeholder
@@ -112,6 +114,7 @@ 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_DIR) $(DESTDIR)$(LIBDIR)/extensions/data/
 	$(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 +127,7 @@ 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/ || true
 	for file in $(FEATURE_SCRIPTS); do $(RM_FILE) $(DESTDIR)$(SHAREDIR)/x2gofeature.d/$$file; done
 
 uninstall_config:
diff --git a/x2goserver-extensions/lib/extensions/data/.placeholder b/x2goserver-extensions/lib/extensions/data/.placeholder
new file mode 100644
index 0000000..e69de29

--
Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git


More information about the x2go-commits mailing list