[X2Go-Commits] x2gobroker.git - master (branch) updated: 0.0.2.3-139-g36b05f4

[X2Go dev team]

The branch, master has been updated
       via  36b05f410b70135c2e0d709dab8171c3a5dd7c82 (commit)
      from  ed6b149b1a6f37e22ba8b43413684736b30167c2 (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 36b05f410b70135c2e0d709dab8171c3a5dd7c82
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Fri Dec 20 23:08:05 2013 +0100

    debian/rules: copy pam/x2gobroker.Debian to pam/x2gobroker before assembling the package and remove it on clean again

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

Summary of changes:
 Makefile     |    5 ++---
 debian/rules |    5 ++++-
 2 files changed, 6 insertions(+), 4 deletions(-)

The diff of changes is:
diff --git a/Makefile b/Makefile
index 69179f8..58b74f2 100755
--- a/Makefile
+++ b/Makefile
@@ -82,9 +82,8 @@ install:
 	${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 \
-	        "${DESTDIR}${ETCDIR}/broker/"
+	${INSTALL_FILE} etc/broker/x2gobroker-sessionprofiles.conf "${DESTDIR}${ETCDIR}/broker/"
+	${INSTALL_FILE} etc/broker/x2gobroker-loggers.conf "${DESTDIR}${ETCDIR}/broker/"
 	if [ -e /etc/debian_version ]; then ${INSTALL_FILE} pam/x2gobroker.Debian "${DESTDIR}/etc/pam.d/x2gobroker"; fi
 	if [ -e /etc/redhat-release ]; then ${INSTALL_FILE} pam/x2gobroker.RHEL "${DESTDIR}/etc/pam.d/x2gobroker"; fi
 	
diff --git a/debian/rules b/debian/rules
index 4eb9899..3541dc2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -28,8 +28,11 @@ include /usr/share/cdbs/1/rules/debhelper.mk
 DEB_PYTHON_SYSTEM = $(shell test -f /usr/bin/dh_python2 && echo "" || echo "pysupport")
 DEB_PYTHON_INSTALL_ARGS_python-x2gobroker ?= --root=$(DEB_DESTDIR) --prefix=$(DEB_PYTHON_PREFIX_ARG) --no-compile -O0 --install-layout=deb
 include /usr/share/cdbs/1/class/python-distutils.mk
-include /usr/share/cdbs/1/class/makefile.mk
 
 # needed when building with pysupport (e.g. on Ubuntu lucid)
 common-binary-indep::
 	mkdir -p debian/tmp/usr
+	cp pam/x2gobroker.Debian pam/x2gobroker
+
+clean::
+	rm -f pam/x2gobroker


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).