[Pkg-php-commits] [php/debian-sid] remove no longer needed "legacy" support for conffile migration

[Sean Finney]

---
 debian/libapache2-mod-php5.postinst |   19 -------------------
 debian/php5-cgi.postinst            |   18 ------------------
 debian/php5-cli.postinst            |   18 ------------------
 3 files changed, 0 insertions(+), 55 deletions(-)

diff --git a/debian/libapache2-mod-php5.postinst b/debian/libapache2-mod-php5.postinst
index bd11b08..e9e0b58 100644
--- a/debian/libapache2-mod-php5.postinst
+++ b/debian/libapache2-mod-php5.postinst
@@ -10,25 +10,6 @@ fi
 
 phpini="/etc/php5/apache2/php.ini"
 
-# LEGACY SUPPORT
-# previous versions of php did not ship $phpini as a conffile nor did
-# they use anything like ucf.  as a result, we need to help transition
-# those files into ucf a little more easily by updating unmodified
-# ini files before registering them
-#
-# if we're upgrading from a pre-ucf version of php:
-if dpkg --compare-versions "$2" le-nl "5.1.6-4"; then
-	# if the SAPI config file already exists and is unmodified
-	if [ -f "$phpini" ]; then
-		oldmd5=`md5sum $phpini | cut -d' ' -f1`
-		if [ "$oldmd5" = "c85605baab79fbcd3c289e442eb3caa2" ]; then
-			# then silently update it before registering via ucf
-			cp /usr/share/php5/php.ini-production $phpini
-		fi
-	fi
-fi
-# END LEGACY SUPPORT
-
 ucf /usr/share/php5/php.ini-production $phpini
 
 reload_apache()
diff --git a/debian/php5-cgi.postinst b/debian/php5-cgi.postinst
index 8f4624f..f0d5fb6 100644
--- a/debian/php5-cgi.postinst
+++ b/debian/php5-cgi.postinst
@@ -9,24 +9,6 @@ if [ "$1" != "configure" ]; then
 fi
 
 phpini="/etc/php5/cgi/php.ini"
-# LEGACY SUPPORT
-# previous versions of php did not ship $phpini as a conffile nor did
-# they use anything like ucf.  as a result, we need to help transition
-# those files into ucf a little more easily by updating unmodified
-# ini files before registering them
-#
-# if we're upgrading from a pre-ucf version of php:
-if dpkg --compare-versions "$2" le-nl "5.1.6-4"; then
-	# if the SAPI config file already exists and is unmodified
-	if [ -f "$phpini" ]; then
-		oldmd5=`md5sum $phpini | cut -d' ' -f1`
-		if [ "$oldmd5" = "c85605baab79fbcd3c289e442eb3caa2" ]; then
-			# then silently update it before registering via ucf
-			cp /usr/share/php5/php.ini-production $phpini
-		fi
-	fi
-fi
-# END LEGACY SUPPORT
 
 ucf /usr/share/php5/php.ini-production $phpini
 
diff --git a/debian/php5-cli.postinst b/debian/php5-cli.postinst
index 046da5d..82ef956 100644
--- a/debian/php5-cli.postinst
+++ b/debian/php5-cli.postinst
@@ -9,24 +9,6 @@ if [ "$1" != "configure" ]; then
 fi
 
 phpini="/etc/php5/cli/php.ini"
-# LEGACY SUPPORT
-# previous versions of php did not ship $phpini as a conffile nor did
-# they use anything like ucf.  as a result, we need to help transition
-# those files into ucf a little more easily by updating unmodified
-# ini files before registering them
-#
-# if we're upgrading from a pre-ucf version of php:
-if dpkg --compare-versions "$2" le-nl "5.1.6-4"; then
-	# if the SAPI config file already exists and is unmodified
-	if [ -f "$phpini" ]; then
-		oldmd5=`md5sum $phpini | cut -d' ' -f1`
-		if [ "$oldmd5" = "c85605baab79fbcd3c289e442eb3caa2" ]; then
-			# then silently update it before registering via ucf
-			cp /usr/share/php5/php.ini-production.cli $phpini
-		fi
-	fi
-fi
-# END LEGACY SUPPORT
 
 ucf /usr/share/php5/php.ini-production.cli $phpini
 
-- 
1.6.3.3