[X2Go-Commits] [x2goserver] 06/06: debian/x2goserver-x2goagent.{{pre, post}inst, postrm}: handle /etc/tmpfiles.d/x2goserver.conf conffile (re-)move to /usr/lib/tmpfiles.d/ gracefully.

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository x2goserver.

commit 1ee9a4d152d349445d6b6883e40ef6cc238f7ff6
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Wed Feb 21 22:15:13 2018 +0100

    debian/x2goserver-x2goagent.{{pre,post}inst,postrm}: handle /etc/tmpfiles.d/x2goserver.conf conffile (re-)move to /usr/lib/tmpfiles.d/ gracefully.
---
 debian/changelog                  | 3 +++
 debian/x2goserver-common.postinst | 3 +++
 debian/x2goserver-common.postrm   | 3 +++
 debian/x2goserver-common.preinst  | 3 +++
 4 files changed, 12 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 3f3c505..99c85fb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -109,6 +109,9 @@ x2goserver (4.1.0.1-0x2go1) UNRELEASED; urgency=medium
     + Also install x2goumount_* symlinks.
   * debian/x2goserver-common.install:
     + Move etc/tmpfiles.d entry to usr/lib/tmpfiles.d.
+  * debian/x2goserver-x2goagent.{{pre,post}inst,postrm}:
+    + Handle /etc/tmpfiles.d/x2goserver.conf conffile (re-)move to
+      /usr/lib/tmpfiles.d/ gracefully.
 
  -- X2Go Release Manager <git-admin at x2go.org>  Thu, 15 Feb 2018 23:14:28 +0100
 
diff --git a/debian/x2goserver-common.postinst b/debian/x2goserver-common.postinst
index 6f77ddf..a49c10e 100755
--- a/debian/x2goserver-common.postinst
+++ b/debian/x2goserver-common.postinst
@@ -17,6 +17,9 @@ set -e
 # for details, see http://www.debian.org/doc/debian-policy/ or
 # the debian-policy package
 
+dpkg-maintscript-helper 'rm_conffile' \
+  '/etc/tmpfiles.d/x2goserver.conf' '4.1.0.0-999' 'x2goserver-common' -- "${@}"
+
 case "${1}" in
 	'configure')
 		###
diff --git a/debian/x2goserver-common.postrm b/debian/x2goserver-common.postrm
index f57e911..c51a05d 100755
--- a/debian/x2goserver-common.postrm
+++ b/debian/x2goserver-common.postrm
@@ -15,6 +15,9 @@
 
 set -e
 
+dpkg-maintscript-helper 'rm_conffile' \
+  '/etc/tmpfiles.d/x2goserver.conf' '4.1.0.0-999' 'x2goserver-common' -- "${@}"
+
 case "${1}" in
 	'purge')
 		getent 'passwd' 'x2gouser' >'/dev/null' && deluser 'x2gouser'
diff --git a/debian/x2goserver-common.preinst b/debian/x2goserver-common.preinst
index 166f891..be9af4b 100755
--- a/debian/x2goserver-common.preinst
+++ b/debian/x2goserver-common.preinst
@@ -17,6 +17,9 @@ set -e
 # for details, see http://www.debian.org/doc/debian-policy/ or
 # the debian-policy package
 
+dpkg-maintscript-helper 'rm_conffile' \
+  '/etc/tmpfiles.d/x2goserver.conf' '4.1.0.0-999' 'x2goserver-common' -- "${@}"
+
 case "${1}" in
 	'install'|'upgrade')
 		if getent 'group' 'x2gousers' >'/dev/null'; then

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goserver.git