[debian-edu-commits] debian-edu/pkg-team/ 05/07: debian/gosa{, -plugin-mail, -plugin-gofon, -desktop}.postrm: Remove /etc/gosa/ directory, if empty when purging the corresponding packages. (To make piuparts happy).

[Mike Gabriel]

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

sunweaver pushed a commit to branch master
in repository gosa.

commit ea8e308b2c62eb7514431c30ff695d6c8364fb64
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Fri Feb 12 09:41:01 2016 +0100

    debian/gosa{,-plugin-mail,-plugin-gofon,-desktop}.postrm: Remove /etc/gosa/ directory, if empty when purging the corresponding packages. (To make piuparts happy).
---
 debian/gosa-desktop.postrm                               | 1 +
 debian/{gosa-desktop.postrm => gosa-plugin-gofon.postrm} | 6 +++---
 debian/gosa-plugin-mail.postrm                           | 4 ++++
 debian/gosa.postrm                                       | 1 +
 4 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/debian/gosa-desktop.postrm b/debian/gosa-desktop.postrm
index 8c3d081..f8f292d 100755
--- a/debian/gosa-desktop.postrm
+++ b/debian/gosa-desktop.postrm
@@ -6,4 +6,5 @@ set -e
 
 if [ "$1" = "purge" ]; then
 	rm -f /etc/gosa/desktoprc
+	rmdir --ignore-fail-on-non-empty /etc/gosa/
 fi
diff --git a/debian/gosa-desktop.postrm b/debian/gosa-plugin-gofon.postrm
similarity index 56%
copy from debian/gosa-desktop.postrm
copy to debian/gosa-plugin-gofon.postrm
index 8c3d081..40dba8b 100755
--- a/debian/gosa-desktop.postrm
+++ b/debian/gosa-plugin-gofon.postrm
@@ -2,8 +2,8 @@
 
 set -e
 
-#DEBHELPER#
-
 if [ "$1" = "purge" ]; then
-	rm -f /etc/gosa/desktoprc
+    rmdir --ignore-fail-on-non-empty /etc/gosa/
 fi
+
+#DEBHELPER#
diff --git a/debian/gosa-plugin-mail.postrm b/debian/gosa-plugin-mail.postrm
index 1ccbe5a..a8caff6 100755
--- a/debian/gosa-plugin-mail.postrm
+++ b/debian/gosa-plugin-mail.postrm
@@ -10,4 +10,8 @@ dpkg-maintscript-helper mv_conffile /etc/gosa/etc/vacation/vacation_example.txt
 dpkg-maintscript-helper mv_conffile /etc/gosa/etc/sieve-mailsize.txt /etc/gosa/sieve-mailsize.txt  2.7.4-4.4  -- "$@"
 dpkg-maintscript-helper mv_conffile /etc/gosa/etc/sieve-spam.txt /etc/gosa/sieve-spam.txt 2.7.4-4.4  -- "$@"
 
+if [ "$1" = "purge" ]; then
+    rmdir --ignore-fail-on-non-empty /etc/gosa/
+fi
+
 #DEBHELPER#
diff --git a/debian/gosa.postrm b/debian/gosa.postrm
index 8b14745..07d1677 100755
--- a/debian/gosa.postrm
+++ b/debian/gosa.postrm
@@ -19,6 +19,7 @@ case "$1" in
 		if [ -e /usr/share/gosa/html/themes/default/images/img.png ]; then rm /usr/share/gosa/html/themes/default/images/img.png; fi
 		if [ -e /usr/share/gosa/ihtml/themes/default/img.styles ]; then rm /usr/share/gosa/ihtml/themes/default/img.styles; fi
 		if [ -d /usr/share/gosa ]; then find /usr/share/gosa -depth -type d -empty -exec rmdir "{}" \;; fi
+		rmdir --ignore-fail-on-non-empty /etc/gosa/
 	;;
 
 	remove|purge)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/pkg-team/gosa.git