[Python-apps-commits] r687 - in packages/pypolicyd-spf/trunk/debian (3 files)

[kitterma-guest at users.alioth.debian.org]

    Date: Saturday, February 23, 2008 @ 05:46:10
  Author: kitterma-guest
Revision: 687

Conf file moves silently if default and prompts if changed now.

Modified:
  packages/pypolicyd-spf/trunk/debian/changelog
  packages/pypolicyd-spf/trunk/debian/postfix-policyd-spf-python.preinst
Deleted:
  packages/pypolicyd-spf/trunk/debian/postfix-policyd-spf-python.postinst

Modified: packages/pypolicyd-spf/trunk/debian/changelog
===================================================================
--- packages/pypolicyd-spf/trunk/debian/changelog	2008-02-22 23:14:54 UTC (rev 686)
+++ packages/pypolicyd-spf/trunk/debian/changelog	2008-02-23 05:46:10 UTC (rev 687)
@@ -10,10 +10,9 @@
   * Update install-conf-fix.patch for new binary package name
   * Rename upstream man pages in debian/rules to match debian binary package
     name
-  * Add preint and postinst to move conffile to correct directory for new
-    package name
+  * Add preint to move conffile to correct directory for new package name
 
- -- Scott Kitterman <scott at kitterman.com>  Wed, 20 Feb 2008 17:35:02 -0500
+ -- Scott Kitterman <scott at kitterman.com>  Sat, 23 Feb 2008 00:38:02 -0500
 
 pypolicyd-spf (0.5.2-3) unstable; urgency=low
 

Deleted: packages/pypolicyd-spf/trunk/debian/postfix-policyd-spf-python.postinst
===================================================================
--- packages/pypolicyd-spf/trunk/debian/postfix-policyd-spf-python.postinst	2008-02-22 23:14:54 UTC (rev 686)
+++ packages/pypolicyd-spf/trunk/debian/postfix-policyd-spf-python.postinst	2008-02-23 05:46:10 UTC (rev 687)
@@ -1,32 +0,0 @@
-#! /bin/sh
-
-# Move a conffile without triggering a dpkg question
-mv_conffile() {
-    OLDCONFFILE="$1"
-    NEWCONFFILE="$2"
-
-    if [ -e "$OLDCONFFILE" ]; then
-        echo "Preserving user changes to $NEWCONFFILE ..."
-        if [ -n "/etc/postfix-policyd-spf-python/" ]; then
-            mkdir "/etc/postfix-policyd-spf-python/"
-        fi
-        mv -f "$NEWCONFFILE" "$NEWCONFFILE".dpkg-new
-        mv -f "$OLDCONFFILE" "$NEWCONFFILE"
-        test -d /etc/python-policyd-spf/ && rmdir /etc/python-policyd-spf/
-    fi
-}
-
-case "$1" in
-configure)
-    if dpkg --compare-versions "$2" le "0.5.2-3"; then
-        mv_conffile "/etc/python-policyd-spf/policyd-spf.conf" \
-          "/etc/postfix-policyd-spf-python/policyd-spf.conf"
-    fi
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-esac
-

Modified: packages/pypolicyd-spf/trunk/debian/postfix-policyd-spf-python.preinst
===================================================================
--- packages/pypolicyd-spf/trunk/debian/postfix-policyd-spf-python.preinst	2008-02-22 23:14:54 UTC (rev 686)
+++ packages/pypolicyd-spf/trunk/debian/postfix-policyd-spf-python.preinst	2008-02-23 05:46:10 UTC (rev 687)
@@ -10,6 +10,14 @@
         if [ "$md5sum" = "$old_md5sum" ]; then
             rm -f "$CONFFILE"
             test -d /etc/python-policyd-spf/ && rmdir /etc/python-policyd-spf/
+        else
+            if [ -e "$CONFFILE" ]; then
+                if [ -n "/etc/postfix-policyd-spf-python/" ]; then
+                    mkdir "/etc/postfix-policyd-spf-python/"
+                fi
+                mv -f "$CONFFILE" "/etc/postfix-policyd-spf-python/policyd-spf.conf"
+                test -d /etc/python-policyd-spf/ && rmdir /etc/python-policyd-spf/
+            fi
         fi
     fi
 }