jenkins-bot has submitted this change and it was merged.

Change subject: Make the ini file be installed/linked via the php5enmod/dismod 
mechanism.
......................................................................


Make the ini file be installed/linked via the php5enmod/dismod
mechanism.

This is part of the fix for T89157

Change-Id: Icfd5113f7cbb64e29b4f6f1d824c1edd26fe3f66
---
M debian/changelog
M debian/php5-fss.install
A debian/php5-fss.postinst
A debian/php5-fss.prerm
4 files changed, 31 insertions(+), 2 deletions(-)

Approvals:
  Giuseppe Lavagetto: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/debian/changelog b/debian/changelog
index 2e608ed..9c67b39 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,15 @@
+php5-fss (1.1-3.1) UNRELEASED; urgency=medium
+
+  * Correct links for the php5 package
+
+ -- Giuseppe Lavagetto <[email protected]>  Mon, 16 Feb 2015 12:23:41 
+0100
+
 php5-fss (1.1-3) trusty-wikimedia; urgency=medium
 
   * Now hhvm-fss depends on the current HHVM version
   * Version bump for the new build of HHVM
 
- -- root <[email protected]>  Mon, 28 Jul 2014 14:55:39 +0000
+ -- Giuseppe Lavagetto <[email protected]>  Mon, 28 Jul 2014 14:55:39 
+0000
 
 php5-fss (1.1-2) trusty-wikimedia; urgency=medium
 
diff --git a/debian/php5-fss.install b/debian/php5-fss.install
index 9748426..dcbbfc0 100644
--- a/debian/php5-fss.install
+++ b/debian/php5-fss.install
@@ -1 +1 @@
-debian/fss.ini /etc/php5/conf.d
+debian/fss.ini /etc/php5/mods-available
diff --git a/debian/php5-fss.postinst b/debian/php5-fss.postinst
new file mode 100755
index 0000000..ec2857e
--- /dev/null
+++ b/debian/php5-fss.postinst
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+set -e
+
+#EXTRA#
+/usr/sbin/php5enmod -s ALL fss
+
+#DEBHELPER#
+
+exit 0
diff --git a/debian/php5-fss.prerm b/debian/php5-fss.prerm
new file mode 100755
index 0000000..679437e
--- /dev/null
+++ b/debian/php5-fss.prerm
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+set -e
+
+#EXTRA#
+
+if [ "$1" = "remove" ] || [ "$1" = "deconfigure" ]; then
+   /usr/sbin/php5dismod -s ALL fss
+fi;
+
+#DEBHELPER#
+
+exit 0

-- 
To view, visit https://gerrit.wikimedia.org/r/190796
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Icfd5113f7cbb64e29b4f6f1d824c1edd26fe3f66
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/php/FastStringSearch
Gerrit-Branch: master
Gerrit-Owner: Giuseppe Lavagetto <[email protected]>
Gerrit-Reviewer: Filippo Giunchedi <[email protected]>
Gerrit-Reviewer: Giuseppe Lavagetto <[email protected]>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to