The branch, master has been updated via 6accfe3fe30e8a857ae7dac00db0296ada535432 (commit) from 00936769f86616c52c1ca5016591aa4405709c48 (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 6accfe3fe30e8a857ae7dac00db0296ada535432 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Wed Jan 1 18:02:45 2014 +0100 Remove dpkg-statoverride during remove on prerm, not on purge in postrm. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 ++ debian/libx2go-server-db-perl.postrm | 5 +---- ...goserver.prerm => libx2go-server-db-perl.prerm} | 7 +++---- 3 files changed, 6 insertions(+), 8 deletions(-) copy debian/{x2goserver.prerm => libx2go-server-db-perl.prerm} (79%) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 341039e..fb907e5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -58,6 +58,8 @@ x2goserver (4.1.0.0-0x2go1) UNRELEASED; urgency=low * debian/x2goserver.postinst, debian/libx2go-server-db-perl: + Handle X2Go session DB creation in x2goserver _and_ perl-X2Go-Server-DB on postinst. + * debian/libx2go-server-db-perl installation scripts: + + Remove dpkg-statoverride during remove on prerm, not on purge in postrm. * debian/x2goserver.init: + Rely on $PATH when invoking x2gocleansessions. * Move code in pre/post+inst/rm scripts around (from x2goserver package diff --git a/debian/libx2go-server-db-perl.postrm b/debian/libx2go-server-db-perl.postrm index 2258690..dccb7fe 100755 --- a/debian/libx2go-server-db-perl.postrm +++ b/debian/libx2go-server-db-perl.postrm @@ -17,11 +17,8 @@ set -e case "$1" in - purge) - if dpkg-statoverride --list /usr/lib/x2go/libx2go-server-db-sqlite3-wrapper >/dev/null; then - dpkg-statoverride --remove /usr/lib/x2go/libx2go-server-db-sqlite3-wrapper - fi + purge) echo "Removing X2Go session database" >&2 rm -vf /var/lib/x2go/x2go_sessions rm -vf /etc/x2go/x2gosql/passwords/pgadmin diff --git a/debian/x2goserver.prerm b/debian/libx2go-server-db-perl.prerm similarity index 79% copy from debian/x2goserver.prerm copy to debian/libx2go-server-db-perl.prerm index d37c0ad..67a3d51 100755 --- a/debian/x2goserver.prerm +++ b/debian/libx2go-server-db-perl.prerm @@ -1,5 +1,5 @@ #! /bin/sh -# prerm script for x2goserver +# prerm script for libx2go-server-db-perl # # see: dh_installdeb(1) # summary of how this script can be called: @@ -18,9 +18,8 @@ set -e case "$1" in remove) - # The package is being removed in its own right. - if test -L /etc/x2go/applications; then - rm -f /etc/x2go/applications + if dpkg-statoverride --list /usr/lib/x2go/libx2go-server-db-sqlite3-wrapper >/dev/null; then + dpkg-statoverride --remove /usr/lib/x2go/libx2go-server-db-sqlite3-wrapper fi ;; deconfigure|upgrade|failed-upgrade) 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).