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: I74c3c832c7b5b2f4e4e4c3fce142ee98ba34f905 --- M debian/changelog M debian/php-wikidiff2.install A debian/php-wikidiff2.postinst A debian/php-wikidiff2.prerm 4 files changed, 30 insertions(+), 1 deletion(-) Approvals: Filippo Giunchedi: Looks good to me, but someone else must approve Giuseppe Lavagetto: Looks good to me, approved jenkins-bot: Verified diff --git a/debian/changelog b/debian/changelog index 7221f48..fdc7819 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +php-wikidiff2 (1.3-3.1) trusty-wikimedia; urgency=medium + + * Corrected the path of the ini file. + + -- Giuseppe Lavagetto <[email protected]> Mon, 16 Feb 2015 11:48:03 +0100 + php-wikidiff2 (1.3-3) trusty-wikimedia; urgency=medium * Now this package correctly depends from the hhvm version diff --git a/debian/php-wikidiff2.install b/debian/php-wikidiff2.install index 4d3c594..3838a97 100644 --- a/debian/php-wikidiff2.install +++ b/debian/php-wikidiff2.install @@ -1 +1 @@ -wikidiff2.ini etc/php5/conf.d +wikidiff2.ini etc/php5/mods-available diff --git a/debian/php-wikidiff2.postinst b/debian/php-wikidiff2.postinst new file mode 100755 index 0000000..8ff8d2b --- /dev/null +++ b/debian/php-wikidiff2.postinst @@ -0,0 +1,10 @@ +#!/bin/sh + +set -e + +#EXTRA# +[ "$1" = "configure "] && php5enmod -s ALL wikidiff2 + +#DEBHELPER# + +exit 0 diff --git a/debian/php-wikidiff2.prerm b/debian/php-wikidiff2.prerm new file mode 100755 index 0000000..8eb3648 --- /dev/null +++ b/debian/php-wikidiff2.prerm @@ -0,0 +1,13 @@ +#!/bin/sh + +set -e + +#EXTRA# + +if [ "$1" = "remove" ] || [ "$1" = "deconfigure" ]; then + php5dismod -s ALL wikidiff2 +fi; + +#DEBHELPER# + +exit 0 -- To view, visit https://gerrit.wikimedia.org/r/190789 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I74c3c832c7b5b2f4e4e4c3fce142ee98ba34f905 Gerrit-PatchSet: 3 Gerrit-Project: mediawiki/php/wikidiff2 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
