[X2Go-Commits] x2gobroker.git - build-main (branch) updated: 0.0.1.0-47-gdc9eb93
X2Go dev team
git-admin at x2go.org
Sun May 19 13:03:33 CEST 2013
The branch, build-main has been updated
via dc9eb932798d2679780d1343e1ab3ea4fa7386cc (commit)
from b487008f79052cc4da52e7e6093ff99a3d1a80af (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 ++
debian/x2gobroker-agent.postrm | 2 +-
...gi.postinst => x2gobroker-authservice.postinst} | 5 +----
debian/x2gobroker-authservice.postrm | 8 ++++++++
debian/x2gobroker-daemon.postinst | 3 ---
debian/x2gobroker-daemon.postrm | 2 +-
debian/x2gobroker-wsgi.postrm | 2 +-
7 files changed, 14 insertions(+), 10 deletions(-)
copy debian/{x2gobroker-wsgi.postinst => x2gobroker-authservice.postinst} (95%)
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index adbbcd8..021f5c5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,8 @@ x2gobroker (0.0.1.1-0~x2go1) UNRELEASED; urgency=low
* /debian/control:
+ Fix --root parameter in DEB_PYTHON_INSTALL_ARGS.
* Properly remove the X2Go Session broker log files on package purgal.
+ * Let bin:package x2gobroker-authservice create x2gouser:x2gouser, as well.
+ (Fixes: #171).
-- Mike Gabriel <mike.gabriel at das-netzwerkteam.de> Sun, 10 Mar 2013 13:00:32 +0100
diff --git a/debian/x2gobroker-agent.postrm b/debian/x2gobroker-agent.postrm
index 8835e64..f5c6be0 100755
--- a/debian/x2gobroker-agent.postrm
+++ b/debian/x2gobroker-agent.postrm
@@ -30,7 +30,7 @@ case "$1" in
rm -Rf /var/log/x2gobroker
fi
- if [ ! -d /usr/share/doc/x2gobroker-daemon ] && [ ! -d /usr/share/doc/x2gobroker-wsgi ]; then
+ if [ ! -d /usr/share/doc/x2gobroker-daemon ] && [ ! -d /usr/share/doc/x2gobroker-authservice ] && [ ! -d /usr/share/doc/x2gobroker-wsgi ]; then
# remove user/group x2gobroker from system (if not in use by x2gobroker-daemon
getent passwd x2gobroker 1>/dev/null && deluser x2gobroker
getent group x2gobroker 1>/dev/null && delgroup x2gobroker
diff --git a/debian/x2gobroker-wsgi.postinst b/debian/x2gobroker-authservice.postinst
similarity index 95%
copy from debian/x2gobroker-wsgi.postinst
copy to debian/x2gobroker-authservice.postinst
index 873b123..52be4f9 100755
--- a/debian/x2gobroker-wsgi.postinst
+++ b/debian/x2gobroker-authservice.postinst
@@ -1,13 +1,10 @@
#!/bin/sh
-# postinst script for x2gobroker-daemon
+# postinst script for x2gobroker-authservice
#
# see: dh_installdeb(1)
set -e
-# Source debconf library.
-. /usr/share/debconf/confmodule
-
# summary of how this script can be called:
# * <postinst> `configure' <most-recently-configured-version>
# * <old-postinst> `abort-upgrade' <new version>
diff --git a/debian/x2gobroker-authservice.postrm b/debian/x2gobroker-authservice.postrm
index 284e881..bf336f5 100755
--- a/debian/x2gobroker-authservice.postrm
+++ b/debian/x2gobroker-authservice.postrm
@@ -26,6 +26,14 @@ case "$1" in
rm -Rf /var/log/x2gobroker
fi
+ if [ ! -d /usr/share/doc/x2gobroker-daemon ] && [ ! -d /usr/share/doc/x2gobroker-agent ] && [ ! -d /usr/share/doc/x2gobroker-wsgi ]; then
+ # remove user/group x2gobroker from system (only if not in use by x2gobroker-agent
+ getent passwd x2gobroker 1>/dev/null && deluser x2gobroker
+ getent group x2gobroker 1>/dev/null && delgroup x2gobroker
+ getent group x2gobroker 1>/dev/null && delgroup x2gobroker
+ rm -Rf /var/lib/x2gobroker
+ fi
+
;;
remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
;;
diff --git a/debian/x2gobroker-daemon.postinst b/debian/x2gobroker-daemon.postinst
index 873b123..9bc1d52 100755
--- a/debian/x2gobroker-daemon.postinst
+++ b/debian/x2gobroker-daemon.postinst
@@ -5,9 +5,6 @@
set -e
-# Source debconf library.
-. /usr/share/debconf/confmodule
-
# summary of how this script can be called:
# * <postinst> `configure' <most-recently-configured-version>
# * <old-postinst> `abort-upgrade' <new version>
diff --git a/debian/x2gobroker-daemon.postrm b/debian/x2gobroker-daemon.postrm
index 3eba400..f4d0af9 100755
--- a/debian/x2gobroker-daemon.postrm
+++ b/debian/x2gobroker-daemon.postrm
@@ -26,7 +26,7 @@ case "$1" in
rm -Rf /var/log/x2gobroker
fi
- if [ ! -d /usr/share/doc/x2gobroker-agent ] && [ ! -d /usr/share/doc/x2gobroker-wsgi ]; then
+ if [ ! -d /usr/share/doc/x2gobroker-agent ] && [ ! -d /usr/share/doc/x2gobroker-authservice ] && [ ! -d /usr/share/doc/x2gobroker-wsgi ]; then
# remove user/group x2gobroker from system (only if not in use by x2gobroker-agent
getent passwd x2gobroker 1>/dev/null && deluser x2gobroker
getent group x2gobroker 1>/dev/null && delgroup x2gobroker
diff --git a/debian/x2gobroker-wsgi.postrm b/debian/x2gobroker-wsgi.postrm
index 9b2b170..9db9cfe 100755
--- a/debian/x2gobroker-wsgi.postrm
+++ b/debian/x2gobroker-wsgi.postrm
@@ -26,7 +26,7 @@ case "$1" in
rm -Rf /var/log/x2gobroker
fi
- if [ ! -d /usr/share/doc/x2gobroker-agent ] && [ ! -d /usr/share/doc/x2gobroker-daemon ]; then
+ if [ ! -d /usr/share/doc/x2gobroker-agent ] && [ ! -d /usr/share/doc/x2gobroker-authservice ] && [ ! -d /usr/share/doc/x2gobroker-daemon ]; then
# remove user/group x2gobroker from system (only if not in use by x2gobroker-agent
getent passwd x2gobroker 1>/dev/null && deluser x2gobroker
getent group x2gobroker 1>/dev/null && delgroup 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).
More information about the x2go-commits
mailing list