[X2Go-Commits] x2gobroker.git - master (branch) updated: 0.0.2.0-15-g6a86e5a

X2Go dev team git-admin at x2go.org
Sun May 19 11:41:30 CEST 2013


The branch, master has been updated
       via  6a86e5a9784fdb3f5bfdb6e812a8895c29ef6c5d (commit)
      from  c485372401718f61f7bf6d3b1d66617ad12d49ff (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 -----------------------------------------------------------------
commit 6a86e5a9784fdb3f5bfdb6e812a8895c29ef6c5d
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sun May 19 11:41:11 2013 +0200

    Install man pages and default files through Makefile, as well. (Fixes: #211).

-----------------------------------------------------------------------

Summary of changes:
 Makefile         |   27 +++++++++++++++++++++------
 debian/changelog |    2 ++
 2 files changed, 23 insertions(+), 6 deletions(-)

The diff of changes is:
diff --git a/Makefile b/Makefile
index 8b10c5e..7a4f317 100755
--- a/Makefile
+++ b/Makefile
@@ -59,7 +59,6 @@ build_setuidwrappers:
 	$(CC) $(CFLAGS) $(LDFLAGS) -DTRUSTED_BINARY=\"$(DESTDIR)$(LIBDIR)/x2gobroker-agent.pl\" -o lib/x2gobroker-agent src/x2gobroker-agent.c
 
 build-indep:
-#	run setup.py build+install somewhere here...
 
 distclean: clean
 
@@ -78,7 +77,10 @@ install:
 
 	# python-x2gobroker
 	python setup.py install --prefix="${PREFIX}" $${DESTDIR+--root="${DESTDIR}"}
-	mkdir -p "${DESTDIR}${ETCDIR}/broker" "${DESTDIR}/etc/pam.d"
+	mkdir -p "${DESTDIR}${ETCDIR}/broker" "${DESTDIR}/etc/pam.d" \
+		"${DESTDIR}/etc/default"
+	${INSTALL_FILE} defaults/python-x2gobroker.default \
+		"${DESTDIR}/etc/default/python-x2gobroker"
 	${INSTALL_FILE} etc/x2gobroker.conf "${DESTDIR}${ETCDIR}/"
 	${INSTALL_FILE} etc/broker/x2gobroker-sessionprofiles.conf \
 		etc/broker/x2gobroker-loggers.conf \
@@ -87,13 +89,21 @@ install:
 	${INSTALL_FILE} pam/x2gobroker "${DESTDIR}/etc/pam.d/"
 	
 	# x2gobroker-agent
-	mkdir -p "${DESTDIR}${LIBDIR}" "${DESTDIR}${SBINDIR}"
+	mkdir -p "${DESTDIR}${LIBDIR}" "${DESTDIR}${SBINDIR}" \
+		"${DESTDIR}${MANDIR}/man8"
+	${INSTALL_FILE} man/man8/x2gobroker-pubkeyauthorizer.8* \
+		"${DESTDIR}${MANDIR}/man8"
 	${INSTALL_PROGRAM} lib/x2gobroker-agent* "${DESTDIR}${LIBDIR}/"
 	${INSTALL_PROGRAM} sbin/x2gobroker-pubkeyauthorizer "${DESTDIR}${SBINDIR}/"
 	
 	# x2gobroker-authservice
 	mkdir -p "${DESTDIR}${SBINDIR}" "${DESTDIR}/etc/logrotate.d" \
-		"${DESTDIR}${ETCDIR}/broker"
+		"${DESTDIR}${ETCDIR}/broker" "${DESTDIR}/etc/default" \
+		"${DESTDIR}${MANDIR}/man8"
+	${INSTALL_FILE} defaults/x2gobroker-authservice.default \
+		"${DESTDIR}/etc/default/x2gobroker-authservice"
+	${INSTALL_FILE} man/man8/x2gobroker-authservice.8* \
+		"${DESTDIR}${MANDIR}/man8"
 	${INSTALL_PROGRAM} sbin/x2gobroker-authservice "${DESTDIR}${SBINDIR}/"
 	${INSTALL_FILE} logrotate/x2gobroker-authservice \
 		"${DESTDIR}/etc/logrotate.d/"
@@ -101,7 +111,9 @@ install:
 		"${DESTDIR}${ETCDIR}/broker/"
 	
 	# x2gobroker-daemon
-	mkdir -p "${DESTDIR}/etc/logrotate.d/"
+	mkdir -p "${DESTDIR}/etc/logrotate.d/" "${DESTDIR}/etc/default"
+	${INSTALL_FILE} defaults/x2gobroker-daemon.default \
+		"${DESTDIR}/etc/default/x2gobroker-daemon"
 	${INSTALL_FILE} logrotate/x2gobroker-daemon \
 		"${DESTDIR}/etc/logrotate.d/"
 	
@@ -112,7 +124,10 @@ install:
 	${INSTALL_FILE} logrotate/x2gobroker-wsgi "${DESTDIR}/etc/logrotate.d/"
 	
 	# x2gobroker
-	mkdir -p "${DESTDIR}${BINDIR}" "${DESTDIR}${SBINDIR}"
+	mkdir -p "${DESTDIR}${BINDIR}" "${DESTDIR}${SBINDIR}" \
+		"${DESTDIR}${MANDIR}/man8"
+	${INSTALL_FILE} man/man8/x2gobroker{,-keygen,-testauth}.8* \
+		"${DESTDIR}${MANDIR}/man8"
 	${INSTALL_PROGRAM} bin/x2gobroker-testauth "${DESTDIR}${BINDIR}/"
 	${INSTALL_PROGRAM} sbin/x2gobroker sbin/x2gobroker-keygen \
 		"${DESTDIR}${SBINDIR}/"
diff --git a/debian/changelog b/debian/changelog
index fb9787e..448093d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,8 @@ x2gobroker (0.0.2.1-0~x2go1) UNRELEASED; urgency=low
   [ Jan Engelhardt ]
   * New upstream version (0.0.2.1):
     - Populate install target of Makefile. (Fixes: #201).
+    - Install man pages and default files through Makefile, as well. (Fixes:
+      #211).
 
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Wed, 01 May 2013 21:07:41 +0200
 


hooks/post-receive
-- 
x2gobroker.git (HTTP(S) Session broker for X2Go)

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 "x2gobroker.git" (HTTP(S) Session broker for X2Go).




More information about the x2go-commits mailing list