Imported Debian patch 0.1~rc2-5

diff --git a/debian/changelog b/debian/changelog
index 18bbd909f5bea81e96cd62be96ecb82ac2680c8d..d02232662142daa81784bbfacf1084c456b51d44 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+roundcube (0.1~rc2-5) unstable; urgency=low
+
+  * Deal with old /etc/logrotate.d/roundcube by removing it if left
+    untouched (Closes: #456546). Also deal with /etc/default/roundcube and
+    /etc/cron.daily/roundcube.
+
+ -- Vincent Bernat <bernat@luffy.cx>  Tue, 18 Dec 2007 23:02:46 +0100
+
 roundcube (0.1~rc2-4) unstable; urgency=low
 
   * Thightened dependencies for a safe upgrade

diff --git a/debian/roundcube.cron.daily b/debian/roundcube.cron.daily
new file mode 100644 (file)
index 0000000..8efe0fb
--- /dev/null
+++ b/debian/roundcube.cron.daily
@@ -0,0 +1,9 @@
+#!/bin/sh
+# This file conflicts with /etc/cron.daily/roundcube-core. If you have
+# modified it, report your modifications to
+# /etc/cron.daily/roundcube-core. If this file is left empty or
+# untouched, it will be deleted.
+
+# If you leave the following marker, this file will be deleted during
+# the next upgrade:
+# 75321 DELETE 75321

diff --git a/debian/roundcube.default b/debian/roundcube.default
new file mode 100644 (file)
index 0000000..3506610
--- /dev/null
+++ b/debian/roundcube.default
@@ -0,0 +1,8 @@
+# This file conflicts with /etc/default/roundcube-core. If you have
+# modified it, report your modifications to
+# /etc/default/roundcube-core. If this file is left empty or
+# untouched, it will be deleted.
+
+# If you leave the following marker, this file will be deleted during
+# the next upgrade:
+# 75321 DELETE 75321

diff --git a/debian/roundcube.logrotate b/debian/roundcube.logrotate
new file mode 100644 (file)
index 0000000..bdb3ea5
--- /dev/null
+++ b/debian/roundcube.logrotate
@@ -0,0 +1,8 @@
+# This file conflicts with /etc/logrotate.d/roundcube-core. If you
+# have modified it, report your modifications to
+# /etc/logrotate.d/roundcube-core. If this file is left empty or
+# untouched, it will be deleted.
+
+# If you leave the following marker, this file will be deleted during
+# the next upgrade:
+# 75321 DELETE 75321

diff --git a/debian/roundcube.postinst b/debian/roundcube.postinst
new file mode 100644 (file)
index 0000000..99e67a5
--- /dev/null
+++ b/debian/roundcube.postinst
@@ -0,0 +1,18 @@
+#!/bin/sh
+
+set -e
+
+# Handle old files that are not needed any more
+for OLD in /etc/logrotate.d/roundcube /etc/default/roundcube /etc/cron.daily/roundcube; do
+    [ -f $OLD ] && {
+       if [ ! -s $OLD ]; then
+           rm $OLD
+       else
+           grep -q '^# 75321 DELETE 75321$' $OLD && rm $OLD
+       fi
+    }
+done
+
+#DEBHELPER#
+
+exit 0