[debian-edu-commits] debian-edu/pkg-team/ 28/32: debian/gosa-plugin-mail.install, debian/gosa-plugin-mail.<scripts>: Install conffiles to location where they are expected by the GOsa² WebGUI. Handle conffile moval in bin:package gracefully. (Closes: #714922).

[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 2f7e6fa3460307b4e11e8eb5cece6731b8052718
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Tue Apr 1 18:27:45 2014 +0200

    debian/gosa-plugin-mail.install, debian/gosa-plugin-mail.<scripts>: Install conffiles to location where they are expected by the GOsa² WebGUI. Handle conffile moval in bin:package gracefully. (Closes: #714922).
---
 debian/changelog                 |  4 ++++
 debian/gosa-plugin-mail.install  |  2 +-
 debian/gosa-plugin-mail.postinst | 13 +++++++++++++
 debian/gosa-plugin-mail.postrm   | 13 +++++++++++++
 debian/gosa-plugin-mail.preinst  | 13 +++++++++++++
 5 files changed, 44 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 8e57d51..797b36d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,10 @@ gosa (2.7.4+reloaded1-1) UNRELEASED; urgency=low
       diffs easier to read).
     + Depend on fonts-liberation (rather than on transitional package
       ttf-liberation). (Closes: #722358).
+  * debian/gosa-plugin-mail.install, debian/gosa-plugin-mail.<scripts>:
+    + Install conffiles to location where they are expected by the
+      GOsa² WebGUI. Handle conffile moval in bin:package gracefully.
+      (Closes: #714922).
 
  -- Mike Gabriel <sunweaver at debian.org>  Tue, 01 Apr 2014 16:36:31 +0200
 
diff --git a/debian/gosa-plugin-mail.install b/debian/gosa-plugin-mail.install
index 5594577..c0c9366 100644
--- a/debian/gosa-plugin-mail.install
+++ b/debian/gosa-plugin-mail.install
@@ -4,4 +4,4 @@ mail/addons			/usr/share/gosa/plugins
 mail/locale			/usr/share/gosa/locale/plugins/mail
 mail/contrib			/usr/share/doc/gosa-plugin-mail
 mail/html/images		/usr/share/gosa/html/plugins/mail
-mail/etc/			/etc/gosa
+mail/etc/*			/etc/gosa
diff --git a/debian/gosa-plugin-mail.postinst b/debian/gosa-plugin-mail.postinst
new file mode 100755
index 0000000..1ccbe5a
--- /dev/null
+++ b/debian/gosa-plugin-mail.postinst
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+set -e
+
+# This conffile moval fixes #714922
+dpkg-maintscript-helper mv_conffile /etc/gosa/etc/sieve-discard.txt /etc/gosa/sieve-discard.txt 2.7.4-4.4  -- "$@"
+dpkg-maintscript-helper mv_conffile /etc/gosa/etc/sieve-header.txt /etc/gosa/sieve-header.txt 2.7.4-4.4  -- "$@"
+dpkg-maintscript-helper mv_conffile /etc/gosa/etc/sieve-vacation.txt /etc/gosa/sieve-vacation.txt 2.7.4-4.4  -- "$@"
+dpkg-maintscript-helper mv_conffile /etc/gosa/etc/vacation/vacation_example.txt /etc/gosa/vacation/vacation_example.txt 2.7.4-4.4  -- "$@"
+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  -- "$@"
+
+#DEBHELPER#
diff --git a/debian/gosa-plugin-mail.postrm b/debian/gosa-plugin-mail.postrm
new file mode 100755
index 0000000..1ccbe5a
--- /dev/null
+++ b/debian/gosa-plugin-mail.postrm
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+set -e
+
+# This conffile moval fixes #714922
+dpkg-maintscript-helper mv_conffile /etc/gosa/etc/sieve-discard.txt /etc/gosa/sieve-discard.txt 2.7.4-4.4  -- "$@"
+dpkg-maintscript-helper mv_conffile /etc/gosa/etc/sieve-header.txt /etc/gosa/sieve-header.txt 2.7.4-4.4  -- "$@"
+dpkg-maintscript-helper mv_conffile /etc/gosa/etc/sieve-vacation.txt /etc/gosa/sieve-vacation.txt 2.7.4-4.4  -- "$@"
+dpkg-maintscript-helper mv_conffile /etc/gosa/etc/vacation/vacation_example.txt /etc/gosa/vacation/vacation_example.txt 2.7.4-4.4  -- "$@"
+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  -- "$@"
+
+#DEBHELPER#
diff --git a/debian/gosa-plugin-mail.preinst b/debian/gosa-plugin-mail.preinst
new file mode 100755
index 0000000..1ccbe5a
--- /dev/null
+++ b/debian/gosa-plugin-mail.preinst
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+set -e
+
+# This conffile moval fixes #714922
+dpkg-maintscript-helper mv_conffile /etc/gosa/etc/sieve-discard.txt /etc/gosa/sieve-discard.txt 2.7.4-4.4  -- "$@"
+dpkg-maintscript-helper mv_conffile /etc/gosa/etc/sieve-header.txt /etc/gosa/sieve-header.txt 2.7.4-4.4  -- "$@"
+dpkg-maintscript-helper mv_conffile /etc/gosa/etc/sieve-vacation.txt /etc/gosa/sieve-vacation.txt 2.7.4-4.4  -- "$@"
+dpkg-maintscript-helper mv_conffile /etc/gosa/etc/vacation/vacation_example.txt /etc/gosa/vacation/vacation_example.txt 2.7.4-4.4  -- "$@"
+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  -- "$@"
+
+#DEBHELPER#

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