[Pkg-sql-ledger-commit] r443 - ledger-smb/trunk/debian

[pkg-sql-ledger-commit-owner at lists.alioth.debian.org]

Author: jame-guest
Date: 2012-03-10 19:29:39 +0000 (Sat, 10 Mar 2012)
New Revision: 443

Removed:
   ledger-smb/trunk/debian/ledgersmb.postrm
Modified:
   ledger-smb/trunk/debian/ledgersmb.postinst
Log:
Move removal of no longer used statoverride to ledgersmb.postinst.

Modified: ledger-smb/trunk/debian/ledgersmb.postinst
===================================================================
--- ledger-smb/trunk/debian/ledgersmb.postinst	2012-03-09 20:44:20 UTC (rev 442)
+++ ledger-smb/trunk/debian/ledgersmb.postinst	2012-03-10 19:29:39 UTC (rev 443)
@@ -17,30 +17,47 @@
 # for details, see http://www.debian.org/doc/debian-policy/ or
 # the debian-policy package
 
+#   Remove these settings for /etc/ledgersmb/*, as dpkg-statoverride
+# is no longer being used in debian/postinst to set it
+drop_statoverride() {
+    for file in /etc/ledgersmb /etc/ledgersmb/images \
+        /etc/ledgersmb/images/demo /etc/ledgersmb/templates \
+        /etc/ledgersmb/templates/*;
+    do
+    if dpkg-statoverride --list $file >/dev/null; then
+        dpkg-statoverride --remove $file
+    fi
+    done
+}
 
 case "$1" in
     configure)
-    # Do Apache related processing if it is present.
-    if [ -d "/etc/apache2" ]; then
+        # Do Apache related processing if it is present.
+        if [ -d "/etc/apache2" ]; then
+            # Only do these if this is the initial install.
+            if [ "$2" = "" ]; then
+                # Enable Apache mod_rewrite
+                if [ -x "`which a2enmod 2>/dev/null`" ]; then
+                    a2enmod rewrite
+                fi
+                # Restart apache
+                if [ -x "/etc/init.d/apache2" ]; then
+                    invoke-rc.d apache2 restart || true
+                fi
+            fi
+        fi
         # Only do these if this is the initial install.
         if [ "$2" = "" ]; then
-            # Enable Apache mod_rewrite
-            if [ -x "`which a2enmod 2>/dev/null`" ]; then
-                a2enmod rewrite
+            # Install a default copy of pos.conf.pl using the example template file.
+            if [ ! -e "/usr/share/ledgersmb/pos.conf.pl" ]; then
+                cp /usr/share/doc/ledgersmb/examples/pos.conf.pl.template /usr/share/ledgersmb/pos.conf.pl
             fi
-            # Restart apache
-            if [ -x "/etc/init.d/apache2" ]; then
-                invoke-rc.d apache2 restart || true
-            fi
         fi
-    fi
-    # Only do these if this is the initial install.
-    if [ "$2" = "" ]; then
-        # Install a default copy of pos.conf.pl using the example template file.
-        if [ ! -e "/usr/share/ledgersmb/pos.conf.pl" ]; then
-            cp /usr/share/doc/ledgersmb/examples/pos.conf.pl.template /usr/share/ledgersmb/pos.conf.pl
+        #   Remove these settings for /etc/ledgersmb/*, as dpkg-statoverride
+        # is no longer being used in debian/postinst to set it.
+        if dpkg --compare-versions $2 lt 1.3.9-2; then
+            drop_statoverride;
         fi
-    fi
     ;;
 
     abort-upgrade|abort-remove|abort-deconfigure)

Deleted: ledger-smb/trunk/debian/ledgersmb.postrm
===================================================================
--- ledger-smb/trunk/debian/ledgersmb.postrm	2012-03-09 20:44:20 UTC (rev 442)
+++ ledger-smb/trunk/debian/ledgersmb.postrm	2012-03-10 19:29:39 UTC (rev 443)
@@ -1,57 +0,0 @@
-#!/bin/sh
-# postrm script for ledgersmb
-#
-# see: dh_installdeb(1)
-
-set -e
-
-# summary of how this script can be called:
-#        * <postrm> `remove'
-#        * <postrm> `purge'
-#        * <old-postrm> `upgrade' <new-version>
-#        * <new-postrm> `failed-upgrade' <old-version>
-#        * <new-postrm> `abort-install'
-#        * <new-postrm> `abort-install' <old-version>
-#        * <new-postrm> `abort-upgrade' <old-version>
-#        * <disappearer's-postrm> `disappear' <overwriter>
-#          <overwriter-version>
-# for details, see http://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
-
-#   Remove these settings for /etc/ledgersmb/*, as dpkg-statoverride
-# is no longer being used in debian/postinst to set it
-drop_statoverride() {
-    for file in /etc/ledgersmb /etc/ledgersmb/images \
-        /etc/ledgersmb/images/demo /etc/ledgersmb/templates \
-        /etc/ledgersmb/templates/*;
-    do
-    if dpkg-statoverride --list $file >/dev/null; then
-        dpkg-statoverride --remove $file
-    fi
-    done
-}
-
-case "$1" in
-    upgrade)
-        #   Remove these settings for /etc/ledgersmb/*, as dpkg-statoverride
-        # is no longer being used in debian/postinst to set it.
-        if dpkg --compare-versions $2 lt 1.3.9-2; then
-            drop_statoverride;
-        fi
-    ;;
-
-    purge|remove|failed-upgrade|abort-install|abort-upgrade|disappear)
-    ;;
-
-    *)
-        echo "postrm called with unknown argument \`$1'" >&2
-        exit 1
-    ;;
-esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0