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

[Sean Finney]

---
 debian/libapache2-mod-php5.postinst |   20 ++++++++++++--------
 debian/libapache2-mod-php5.triggers |    1 +
 2 files changed, 13 insertions(+), 8 deletions(-)
 create mode 100644 debian/libapache2-mod-php5.triggers

diff --git a/debian/libapache2-mod-php5.postinst b/debian/libapache2-mod-php5.postinst
index e9e0b58..cc07c51 100644
--- a/debian/libapache2-mod-php5.postinst
+++ b/debian/libapache2-mod-php5.postinst
@@ -4,14 +4,6 @@ set -e
 
 #DEBHELPER#
 
-if [ "$1" != "configure" ]; then
-    exit 0
-fi
-
-phpini="/etc/php5/apache2/php.ini"
-
-ucf /usr/share/php5/php.ini-production $phpini
-
 reload_apache()
 {
 	if apache2ctl configtest 2>/dev/null; then
@@ -21,6 +13,18 @@ reload_apache()
 	fi
 }
 
+# we've registered a trigger to handle extension updates.
+if [ "$1" = "triggered" ] && [ "$2" = "/etc/php5/conf.d" ]; then
+  reload_apache
+  exit 0
+elif [ "$1" != "configure" ]; then
+  exit 0
+fi
+
+phpini="/etc/php5/apache2/php.ini"
+
+ucf /usr/share/php5/php.ini-dist $phpini
+
 if [ -n "$2" ]; then
 	# recover the previous state
 	if [ -e /etc/php5/apache2/.start ]; then
diff --git a/debian/libapache2-mod-php5.triggers b/debian/libapache2-mod-php5.triggers
new file mode 100644
index 0000000..5bff30a
--- /dev/null
+++ b/debian/libapache2-mod-php5.triggers
@@ -0,0 +1 @@
+interested /etc/php5/conf.d
-- 
1.6.3.3