Home
Reading
Searching
Subscribe
Sponsors
Statistics
Posting
Contact
Spam
Lists
Links
About
Hosting
Filtering
Features Download
Marketing
Archives
FAQ
Blog
 
Gmane
From: X2Go dev team <git-admin-P0WSJaAXTow <at> public.gmane.org>
Subject: x2gobroker.git - master (branch) updated: 0.0.1.0-16-ge4f4a3b
Newsgroups: gmane.linux.terminal-server.x2go.scm
Date: Thursday 18th April 2013 10:33:49 UTC (over 3 years ago)
The branch, master has been updated
       via  e4f4a3be711ee2246032b555da42151dfb232af8 (commit)
       via  0318f27362e56d6587c82d63926cfe677eaccffd (commit)
      from  bf9ca01cd94266ee47c6ce056a702a942803124c (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 e4f4a3be711ee2246032b555da42151dfb232af8
Author: Mike Gabriel

Date:   Wed Apr 17 21:07:57 2013 +0200

    /debian/control: Let bin:package x2gobroker-authservice depend on
python-x2gobroker (of the same version). (Fixes: #170).

commit 0318f27362e56d6587c82d63926cfe677eaccffd
Author: Mike Gabriel

Date:   Wed Apr 17 21:05:03 2013 +0200

    Let bin:package x2gobroker-authservice create x2gouser:x2gouser, as
well. (Fixes: #171).

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

Summary of changes:
 debian/changelog                                   |    4 ++++
 debian/control                                     |    1 +
 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 +-
 8 files changed, 17 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 dffaa03..4bf0feb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,7 +11,11 @@ x2gobroker (0.0.1.1-0~x2go1) UNRELEASED; urgency=low
     - Fix hard-coded path to x2gobroker's authservice socket.
   * /debian/control:
     + Fix --root parameter in DEB_PYTHON_INSTALL_ARGS.
+    + Let bin:package x2gobroker-authservice depend on python-x2gobroker
(of the
+      same version). (Fixes: #170).
   * 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
  Sun, 10
Mar 2013 13:00:32 +0100
 
diff --git a/debian/control b/debian/control
index 45e0eae..a493d8a 100644
--- a/debian/control
+++ b/debian/control
@@ -90,6 +90,7 @@ Depends:
  python,
  python-argparse,
  python-setproctitle,
+ python-x2gobroker (>= ${source:Version}), python-x2gobroker (<<
${source:Version}.1~),
 Suggests:
  x2gobroker-daemon,
 Description: X2Go http(s) based session broker (PAM authentication
service)
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:
 #        *  `configure' 
 #        *  `abort-upgrade' 
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:
 #        *  `configure' 
 #        *  `abort-upgrade' 
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
 
CD: 13ms