[X2go-Commits] x2goserver.git - master (branch) updated: 3.1.0.1-7-g733794a

X2Go dev team git-admin at x2go.org
Thu Mar 8 14:55:04 CET 2012


The branch, master has been updated
       via  733794a943e2e47c5a2e557ea5a48759c8a4c95c (commit)
      from  e3dab38f75692668c0a276eab3c09a94655ee320 (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 733794a943e2e47c5a2e557ea5a48759c8a4c95c
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Thu Mar 8 14:54:56 2012 +0100

    Remove /etc/x2go/applications on package removal if it is a symlink, keep it, if it is a directory. Remove /etc/x2go (if empty after purge) on package purge.

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

Summary of changes:
 debian/changelog                                   |    3 ++
 debian/x2goserver.postinst                         |    5 ++++
 debian/x2goserver.postrm                           |    6 +++++
 ...x2goserver-printing.postrm => x2goserver.prerm} |   21 ++++++++++---------
 4 files changed, 25 insertions(+), 10 deletions(-)
 copy debian/{x2goserver-printing.postrm => x2goserver.prerm} (68%)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index f4050ec..02d3181 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,9 @@ x2goserver (3.1.0.2-0~x2go1.1) UNRELEASED; urgency=low
     - Add usage output to x2goserver-run-extensions.
     - Fix syslog output of x2goserver-run-exentions.
     - Fix x2goserver extension calls in x2goruncommand.
+  * Remove /etc/x2go/applications on package removal if it is a
+    symlink, keep it, if it is a directory. Remove /etc/x2go
+    (if empty after purge) on package purge.
 
   [ Oleksandr Shneyder ]
   * New upstream version (3.1.0.2):
diff --git a/debian/x2goserver.postinst b/debian/x2goserver.postinst
index f1582a8..07c8540 100755
--- a/debian/x2goserver.postinst
+++ b/debian/x2goserver.postinst
@@ -98,6 +98,11 @@ case "$1" in
 		    dpkg-statoverride --add --update root x2gouser 2755 /usr/lib/x2go/x2gosqlitewrapper
 		fi
 
+		# create /etc/x2go/applications symlink if not already there (as link or as dir)
+		if ! test -e /etc/x2go/applications; then
+			ln -s /etc/x2go/applications /usr/share/applications
+		fi
+
 		;;
 
 	abort-upgrade|abort-remove|abort-deconfigure)
diff --git a/debian/x2goserver.postrm b/debian/x2goserver.postrm
index ec6b579..2d965cc 100755
--- a/debian/x2goserver.postrm
+++ b/debian/x2goserver.postrm
@@ -27,6 +27,12 @@ case "$1" in
 		getent passwd x2gouser >/dev/null && deluser x2gouser
 		getent group x2gouser >/dev/null && delgroup x2gouser
 		getent group x2gousers >/dev/null && delgroup x2gousers
+
+		rm -Rf /etc/x2go/applications
+		rm -Rf /etc/x2go/sql
+		rm -Rf /etc/x2go/x2go_logout.d
+		rmdir --ignore-fail-on-non-empty /etc/x2go
+
 		;;
 	remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
 		;;
diff --git a/debian/x2goserver-printing.postrm b/debian/x2goserver.prerm
similarity index 68%
copy from debian/x2goserver-printing.postrm
copy to debian/x2goserver.prerm
index 16b0f1e..52ed206 100755
--- a/debian/x2goserver-printing.postrm
+++ b/debian/x2goserver.prerm
@@ -1,5 +1,5 @@
 #! /bin/sh
-# postrm script for x2goserver-printing
+# prerm script for x2goserver
 #
 # see: dh_installdeb(1)
 # summary of how this script can be called:
@@ -17,16 +17,17 @@ set -e
 
 
 case "$1" in
-	purge)
-		getent passwd x2goprint >/dev/null && deluser x2goprint
-		getent group x2goprint >/dev/null && delgroup x2goprint
+	remove)
+		# The package is being removed in its own right.
+		if test -s /etc/x2go/applications; then
+			rm -f /etc/x2go/applications
+		fi
 		;;
-	remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
-		;;
-	*)
-		echo "postrm called with unknown argument \`$1'" >&2
-		exit 0
+	deconfigure|upgrade|failed-upgrade)
+		:
 		;;
+	*) echo "$0: didn't understand being called with \`$1'" 1>&2
+		exit 1;;
 esac
 
 # dh_installdeb will replace this with shell code automatically
@@ -34,4 +35,4 @@ esac
 
 #DEBHELPER#
 
-exit 0
\ No newline at end of file
+exit 0


hooks/post-receive
-- 
x2goserver.git (X2Go Server)

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 "x2goserver.git" (X2Go Server).




More information about the x2go-commits mailing list