[Pkg-php-commits] [php/debian-sid] Purge .start files in postrm (Closes: #607520)

[Ondřej Surý]

---
 debian/libapache2-mod-php5.prerm       |    7 -------
 debian/libapache2-mod-php5filter.prerm |    7 -------
 debian/php5-sapi.postrm                |   11 +++++++++--
 3 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/debian/libapache2-mod-php5.prerm b/debian/libapache2-mod-php5.prerm
index ff42610..4cff3f3 100644
--- a/debian/libapache2-mod-php5.prerm
+++ b/debian/libapache2-mod-php5.prerm
@@ -5,13 +5,6 @@ set -e
 #DEBHELPER#
 
 case "$1" in
-    purge)
-        # remove the flag file rather than just not creating it
-	if [ -e /etc/php5/apache2/.start ]; then
-	    rm -f /etc/php5/apache2/.start
-	fi
-	a2dismod php5 || true
-	;;
     remove)
 	if [ -e /etc/apache2/apache2.conf -a -e /etc/apache2/mods-enabled/php5.load ]; then
 	    # set a flag to remember the original state
diff --git a/debian/libapache2-mod-php5filter.prerm b/debian/libapache2-mod-php5filter.prerm
index 1af2d93..7e0e29b 100644
--- a/debian/libapache2-mod-php5filter.prerm
+++ b/debian/libapache2-mod-php5filter.prerm
@@ -5,13 +5,6 @@ set -e
 #DEBHELPER#
 
 case "$1" in
-    purge)
-        # remove the flag file rather than just not creating it
-	if [ -e /etc/php5/apache2filter/.start ]; then
-	    rm -f /etc/php5/apache2filter/.start
-	fi
-	a2dismod php5filter || true
-	;;
     remove)
 	if [ -e /etc/apache2/apache2.conf -a -e /etc/apache2/mods-enabled/php5.load ]; then
 	    # set a flag to remember the original state
diff --git a/debian/php5-sapi.postrm b/debian/php5-sapi.postrm
index ea609e7..5fd7449 100644
--- a/debian/php5-sapi.postrm
+++ b/debian/php5-sapi.postrm
@@ -6,10 +6,17 @@ phpini=/etc/php5/@sapi@/php.ini
 
 case "$1" in
 purge)
-	if which ucf >/dev/null 2>&1; then
-		ucf --purge $phpini
+	# remove the flag to remember the original state
+	if [ -e /etc/php5/@sapi@/.start ]; then
+	    rm -f /etc/php5/apache2/.start
 	fi
+	for ext in '~' '%' .bak .ucf-new .ucf-old .ucf-dist;  do
+	    rm -f $phpini$ext
+	done
 	rm -f $phpini
+	if which ucf >/dev/null; then
+	    ucf --purge $phpini
+	fi
 	;;
 esac
 
-- 
1.7.1