[X2Go-Commits] [x2gobroker] 01/01: On package purgal: Disable Apache2 config first and then attempt the removal of the x2gobroker user/group.
git-admin at x2go.org
git-admin at x2go.org
Tue Apr 1 09:12:42 CEST 2014
This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch master
in repository x2gobroker.
commit 515cbef52b6df855706a1180fe2ad84315529775
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Tue Apr 1 09:12:58 2014 +0200
On package purgal: Disable Apache2 config first and then attempt the removal of the x2gobroker user/group.
---
debian/changelog | 2 ++
debian/x2gobroker-wsgi.postrm | 4 ++--
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index fe523f7..15988f0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -128,6 +128,8 @@ x2gobroker (0.0.3.0-0x2go1) UNRELEASED; urgency=low
* x2gobroker-wsgi postinst/postrm:
+ Make bin:package x2gobroker-wsgi compliant Debian's packaging style of
Apache2.4 / Apache2.2.
+ + On package purgal: Disable Apache2 config first and then attempt the
+ removal of the x2gobroker user/group.
* debian/source/format:
+ Switch to format 1.0.
* rpm/*.init:
diff --git a/debian/x2gobroker-wsgi.postrm b/debian/x2gobroker-wsgi.postrm
index 2898f4d..7269db7 100755
--- a/debian/x2gobroker-wsgi.postrm
+++ b/debian/x2gobroker-wsgi.postrm
@@ -33,6 +33,8 @@ apacheconf_remove() {
case "$1" in
purge)
+ apacheconf_remove
+
if [ ! -d /usr/share/doc/x2gobroker-agent ] && [ ! -d /usr/share/doc/x2gobroker-authservice ] && [ ! -d /usr/share/doc/x2gobroker-daemon ]; then
if dpkg-statoverride --list /var/log/x2gobroker 1>/dev/null; then
dpkg-statoverride --remove /var/log/x2gobroker
@@ -48,8 +50,6 @@ case "$1" in
rm -Rf /var/lib/x2gobroker
fi
- apacheconf_remove
-
;;
remove)
--
Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2gobroker.git
More information about the x2go-commits
mailing list