[Pkg-dspam-commits] [pkg-dspam-commits] r224 - branches/experimental/debian

[Julien Valroff]

Author: julien-guest
Date: Wed Dec 30 20:12:02 2009
New Revision: 224

Log:
Fix overrides for splitted conffiles in dspam.d

Added:
   branches/experimental/debian/libdspam7-drv-sqlite3.postinst
   branches/experimental/debian/libdspam7-drv-sqlite3.postrm
Modified:
   branches/experimental/debian/libdspam7-drv-mysql.postinst
   branches/experimental/debian/libdspam7-drv-mysql.postrm
   branches/experimental/debian/libdspam7-drv-pgsql.postinst
   branches/experimental/debian/libdspam7-drv-pgsql.postrm

Modified: branches/experimental/debian/libdspam7-drv-mysql.postinst
==============================================================================
--- branches/experimental/debian/libdspam7-drv-mysql.postinst	Wed Dec 30 15:14:09 2009	(r223)
+++ branches/experimental/debian/libdspam7-drv-mysql.postinst	Wed Dec 30 20:12:02 2009	(r224)
@@ -15,12 +15,18 @@
 dbc_generate_include_owner="dspam"
 dbc_generate_include_perms="640"
 dbc_generate_include_args="-U -o template_infile='/usr/share/doc/libdspam7-drv-mysql/mysql.conf'"
- 
+
 # Run dbconfig
 dbc_go libdspam7-drv-mysql $@
 
 case "$1" in
   configure)
+
+    if ! dpkg-statoverride --list /etc/dspam/dspam.d/mysql.conf >/dev/null
+    then
+      dpkg-statoverride --update --add dspam dspam 0640 /etc/dspam/dspam.d/mysql.conf
+    fi
+
   ;;
   abort-upgrade|abort-remove|abort-deconfigure)
   ;;
@@ -28,7 +34,7 @@
     echo "postinst called with unknown argument \`$1'" >&2
   ;;
 esac
-  
+
 #DEBHELPER#
 
 exit 0

Modified: branches/experimental/debian/libdspam7-drv-mysql.postrm
==============================================================================
--- branches/experimental/debian/libdspam7-drv-mysql.postrm	Wed Dec 30 15:14:09 2009	(r223)
+++ branches/experimental/debian/libdspam7-drv-mysql.postrm	Wed Dec 30 20:12:02 2009	(r224)
@@ -20,14 +20,9 @@
   ;;
 
   purge)
-    # Remove files registered with ucf.
-    for ext in '~' '%' .bak .dpkg-tmp .dpkg-new .dpkg-old .dpkg-dist; do
-      rm -f /etc/dspam/dspam.d/mysql.conf$ext
-    done
-    rm -f /etc/dspam/dspam.d/mysql.conf
-    if [ -x /usr/bin/ucf ]; then
-      ucf --purge /etc/dspam/dspam.d/mysql.conf
-    fi
+
+    dpkg-statoverride --quiet --remove /etc/dspam/dspam.d/mysql.conf || true
+
   ;;
 
   *)

Modified: branches/experimental/debian/libdspam7-drv-pgsql.postinst
==============================================================================
--- branches/experimental/debian/libdspam7-drv-pgsql.postinst	Wed Dec 30 15:14:09 2009	(r223)
+++ branches/experimental/debian/libdspam7-drv-pgsql.postinst	Wed Dec 30 20:12:02 2009	(r224)
@@ -21,6 +21,12 @@
 
 case "$1" in
   configure)
+
+    if ! dpkg-statoverride --list /etc/dspam/dspam.d/pgsql.conf >/dev/null
+    then
+      dpkg-statoverride --update --add dspam dspam 0640 /etc/dspam/dspam.d/pgsql.conf
+    fi
+
   ;;
   abort-upgrade|abort-remove|abort-deconfigure)
   ;;

Modified: branches/experimental/debian/libdspam7-drv-pgsql.postrm
==============================================================================
--- branches/experimental/debian/libdspam7-drv-pgsql.postrm	Wed Dec 30 15:14:09 2009	(r223)
+++ branches/experimental/debian/libdspam7-drv-pgsql.postrm	Wed Dec 30 20:12:02 2009	(r224)
@@ -20,14 +20,9 @@
   ;;
 
   purge)
-    # Remove files registered with ucf.
-    for ext in '~' '%' .bak .dpkg-tmp .dpkg-new .dpkg-old .dpkg-dist; do
-      rm -f /etc/dspam/dspam.d/pgsql.conf$ext
-    done
-    rm -f /etc/dspam/dspam.d/pgsql.conf
-    if [ -x /usr/bin/ucf ]; then
-      ucf --purge /etc/dspam/dspam.d/pgsql.conf
-    fi
+
+    dpkg-statoverride --quiet --remove /etc/dspam/dspam.d/pgsql.conf || true
+
   ;;
 
   *)

Added: branches/experimental/debian/libdspam7-drv-sqlite3.postinst
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/experimental/debian/libdspam7-drv-sqlite3.postinst	Wed Dec 30 20:12:02 2009	(r224)
@@ -0,0 +1,29 @@
+#!/bin/sh
+#
+# Post installation for the sqlite backend.
+
+set -e
+
+# Run dbconfig
+dbc_go libdspam7-drv-mysql $@
+
+case "$1" in
+  configure)
+
+    if ! dpkg-statoverride --list /etc/dspam/dspam.d/sqlite.conf >/dev/null
+    then
+      dpkg-statoverride --update --add dspam dspam 0640 /etc/dspam/dspam.d/sqlite.conf
+    fi
+
+  ;;
+  abort-upgrade|abort-remove|abort-deconfigure)
+  ;;
+  *)
+    echo "postinst called with unknown argument \`$1'" >&2
+  ;;
+esac
+
+#DEBHELPER#
+
+exit 0
+

Added: branches/experimental/debian/libdspam7-drv-sqlite3.postrm
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/experimental/debian/libdspam7-drv-sqlite3.postrm	Wed Dec 30 20:12:02 2009	(r224)
@@ -0,0 +1,26 @@
+#!/bin/sh
+#
+# Post removal
+
+set -e
+
+case "$1" in
+  remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
+  ;;
+
+  purge)
+
+    dpkg-statoverride --quiet --remove /etc/dspam/dspam.d/sqlite.conf || true
+
+  ;;
+
+  *)
+    echo "postrm called with unknown argument \`$1'" >&2
+    exit 1
+  ;;
+esac
+
+#DEBHELPER#
+
+exit 0
+