This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gobroker. commit b4b694e31087801cb815c6616968822ed6f8f217 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Fri Nov 28 14:48:28 2014 +0100 debian/x2gobroker-wsgi.*inst: Pass $@ to our apacheconf_configure, apacheconf_remove functions to not break apache2-maintscript-helper. --- debian/changelog | 2 ++ debian/x2gobroker-wsgi.postinst | 2 +- debian/x2gobroker-wsgi.postrm | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 81890ad..4659fe8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -217,6 +217,8 @@ x2gobroker (0.0.3.0-0x2go1) UNRELEASED; urgency=low Apache2.4 / Apache2.2. + On package purgal: Disable Apache2 config first and then attempt the removal of the x2gobroker user/group. + + Pass $@ to our apacheconf_configure, apacheconf_remove functions to not + break apache2-maintscript-helper. * debian/*.postinst: + Assure that the log directory always exists (no matter what combination of packages got installed). diff --git a/debian/x2gobroker-wsgi.postinst b/debian/x2gobroker-wsgi.postinst index c0b0c8a..e7f49f3 100755 --- a/debian/x2gobroker-wsgi.postinst +++ b/debian/x2gobroker-wsgi.postinst @@ -77,7 +77,7 @@ case "$1" in touch /var/log/x2gobroker/error.log && chown x2gobroker:adm /var/log/x2gobroker/error.log touch /var/log/x2gobroker/wsgi.log && chown x2gobroker:adm /var/log/x2gobroker/wsgi.log - apacheconf_configure + apacheconf_configure $@ ;; diff --git a/debian/x2gobroker-wsgi.postrm b/debian/x2gobroker-wsgi.postrm index 7269db7..4c7c120 100755 --- a/debian/x2gobroker-wsgi.postrm +++ b/debian/x2gobroker-wsgi.postrm @@ -53,7 +53,7 @@ case "$1" in ;; remove) - apacheconf_remove + apacheconf_remove $@ ;; upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2gobroker.git