Giuseppe Lavagetto has uploaded a new change for review. https://gerrit.wikimedia.org/r/150217
Change subject: Make hhvm-wikidiff2 depend on hhvm-build and not on the package ...................................................................... Make hhvm-wikidiff2 depend on hhvm-build and not on the package Change-Id: I73c00aba7f3a8f08bbb30a0d8f08fc20d3eae8b0 Signed-off-by: Giuseppe Lavagetto <glavage...@wikimedia.org> --- M debian/control M debian/rules 2 files changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/php/wikidiff2 refs/changes/17/150217/1 diff --git a/debian/control b/debian/control index 6f23e98..72f298f 100644 --- a/debian/control +++ b/debian/control @@ -21,7 +21,7 @@ Package: hhvm-wikidiff2 Architecture: any -Depends: hhvm (= ${hhvm:Depends}), ${shlibs:Depends}, ${misc:Depends} +Depends: ${hhvm:Depends}, ${shlibs:Depends}, ${misc:Depends} Description: external diff engine for MediaWiki (HHVM extension) Wikidiff2 is PHP 5 module providing external diff engine for MediaWiki. It performs word-level (space-delimited) diffs on general text, and diff --git a/debian/rules b/debian/rules index 6b125ac..bb5bbdc 100755 --- a/debian/rules +++ b/debian/rules @@ -37,7 +37,7 @@ override_dh_gencontrol: echo "php:Depends=phpapi-$(shell php-config5 --phpapi)" >> debian/php-wikidiff2.substvars # HHVM does *not* ensure binary compatibility - echo "hhvm:Depends=$(shell dpkg -s hhvm-dev | grep -i "version:" | cut -d\ -f 2)" >> debian/hhvm-wikidiff2.substvars + echo "hhvm:Depends=hhvm-build-$(shell dpkg -s hhvm-dev | sed -ne 's/^Version:\ //p' | sed -e s'/\+wmf[0-9]//'" >> debian/hhvm-wikidiff2.substvars dh_gencontrol override_dh_auto_clean: -- To view, visit https://gerrit.wikimedia.org/r/150217 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I73c00aba7f3a8f08bbb30a0d8f08fc20d3eae8b0 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/php/wikidiff2 Gerrit-Branch: master Gerrit-Owner: Giuseppe Lavagetto <glavage...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits