[Pkg-php-commits] [php/debian-sid] update configuration file names to new upstream naming convention

[Sean Finney]

upstream changed from using php.ini-{dist,recommended,paranoid} to
php.ini-{production,development}, so we need to update our build
rules and maintainer scripts accordingly.
---
 debian/libapache2-mod-php5.postinst       |    4 ++--
 debian/libapache2-mod-php5filter.postinst |    2 +-
 debian/php5-cgi.postinst                  |    4 ++--
 debian/php5-cli.postinst                  |    4 ++--
 debian/rules                              |    9 ++++-----
 5 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/debian/libapache2-mod-php5.postinst b/debian/libapache2-mod-php5.postinst
index 0bf740e..37921c7 100644
--- a/debian/libapache2-mod-php5.postinst
+++ b/debian/libapache2-mod-php5.postinst
@@ -23,13 +23,13 @@ if dpkg --compare-versions "$2" le-nl "5.1.6-4"; 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-dist $phpini
+			cp /usr/share/php5/php.ini-production $phpini
 		fi
 	fi
 fi
 # END LEGACY SUPPORT
 
-ucf /usr/share/php5/php.ini-dist $phpini
+ucf /usr/share/php5/php.ini-production $phpini
 
 reload_apache()
 {
diff --git a/debian/libapache2-mod-php5filter.postinst b/debian/libapache2-mod-php5filter.postinst
index ac73129..457a16a 100644
--- a/debian/libapache2-mod-php5filter.postinst
+++ b/debian/libapache2-mod-php5filter.postinst
@@ -10,7 +10,7 @@ fi
 
 phpini="/etc/php5/apache2filter/php.ini"
 
-ucf /usr/share/php5/php.ini-dist $phpini
+ucf /usr/share/php5/php.ini-production $phpini
 
 reload_apache()
 {
diff --git a/debian/php5-cgi.postinst b/debian/php5-cgi.postinst
index fed6225..8f4624f 100644
--- a/debian/php5-cgi.postinst
+++ b/debian/php5-cgi.postinst
@@ -22,13 +22,13 @@ if dpkg --compare-versions "$2" le-nl "5.1.6-4"; 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-dist $phpini
+			cp /usr/share/php5/php.ini-production $phpini
 		fi
 	fi
 fi
 # END LEGACY SUPPORT
 
-ucf /usr/share/php5/php.ini-dist $phpini
+ucf /usr/share/php5/php.ini-production $phpini
 
 update-alternatives \
         --install /usr/bin/php-cgi php-cgi /usr/bin/php5-cgi 50 \
diff --git a/debian/php5-cli.postinst b/debian/php5-cli.postinst
index c0b9a76..046da5d 100644
--- a/debian/php5-cli.postinst
+++ b/debian/php5-cli.postinst
@@ -22,13 +22,13 @@ if dpkg --compare-versions "$2" le-nl "5.1.6-4"; 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-dist.cli $phpini
+			cp /usr/share/php5/php.ini-production.cli $phpini
 		fi
 	fi
 fi
 # END LEGACY SUPPORT
 
-ucf /usr/share/php5/php.ini-dist.cli $phpini
+ucf /usr/share/php5/php.ini-production.cli $phpini
 
 update-alternatives \
 	--install /usr/bin/php php /usr/bin/php5 50 \
diff --git a/debian/rules b/debian/rules
index 85587e1..947505d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -378,11 +378,10 @@ install: build
 		debian/libapache2-mod-php5filter/etc/apache2/mods-available/php5filter.conf
 
 	# sanitize php.ini file
-	cat php.ini-dist | tr "\t" " " > debian/php5-common/usr/share/php5/php.ini-dist
-	cat php.ini-dist | tr "\t" " " | sed -e'/memory_limit =/ s/128M/32M/g' > debian/php5-common/usr/share/php5/php.ini-dist.cli
-	cat php.ini-dist | tr "\t" " " > debian/php5-common/usr/share/doc/php5-common/examples/php.ini-dist
-	cat php.ini-recommended | tr "\t" " " > debian/php5-common/usr/share/doc/php5-common/examples/php.ini-recommended
-	cat php.ini-paranoid | tr "\t" " " > debian/php5-common/usr/share/doc/php5-common/examples/php.ini-paranoid
+	cat php.ini-production | tr "\t" " " > debian/php5-common/usr/share/php5/php.ini-production
+	cat php.ini-production | tr "\t" " " | sed -e'/memory_limit =/ s/128M/32M/g' > debian/php5-common/usr/share/php5/php.ini-production.cli
+	cat php.ini-production | tr "\t" " " > debian/php5-common/usr/share/doc/php5-common/examples/php.ini-production
+	cat php.ini-development | tr "\t" " " > debian/php5-common/usr/share/doc/php5-common/examples/php.ini-development
 	cp test-results.txt debian/php5-common/usr/share/doc/php5-common/
 
 	# install the apache modules' files
-- 
1.6.3.3