Giuseppe Lavagetto has uploaded a new change for review.
https://gerrit.wikimedia.org/r/150216
Change subject: Make hhvm-fss depend on hhvm-build and not on the package
......................................................................
Make hhvm-fss depend on hhvm-build and not on the package
Change-Id: If1ef111b99c070a3695b622caee688460bc73297
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/FastStringSearch
refs/changes/16/150216/1
diff --git a/debian/control b/debian/control
index cb256b1..3b45bf3 100644
--- a/debian/control
+++ b/debian/control
@@ -17,7 +17,7 @@
Package: hhvm-fss
Architecture: any
-Depends: hhvm (= ${hhvm:Depends}), ${shlibs:Depends}, ${misc:Depends},
${php:Depends}
+Depends: ${hhvm:Depends}, ${shlibs:Depends}, ${misc:Depends}, ${php:Depends}
Description: fast string search extension for HHVM
This is a HHVM extension for fast string search and replace that supports
multiple search terms. It can be used as a replacement for PHP's strtr, which
diff --git a/debian/rules b/debian/rules
index cbf9253..712ebc4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -33,7 +33,7 @@
override_dh_gencontrol:
echo "php:Depends=phpapi-$(shell php-config5 --phpapi)" >>
debian/php5-fss.substvars
# HHVM does *not* ensure abi compatibility.
- echo "hhvm:Depends=$(shell dpkg -s hhvm-dev | grep -i "version:" | cut
-d\ -f 2)" >> debian/hhvm-fss.substvars
+ echo "hhvm:Depends=hhvm-build-$(shell dpkg -s hhvm-dev | sed -ne
's/^Version:\ //p' | sed -e s'/\+wmf[0-9]//'" >> debian/hhvm-fss.substvars
dh_gencontrol
override_dh_auto_clean:
--
To view, visit https://gerrit.wikimedia.org/r/150216
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If1ef111b99c070a3695b622caee688460bc73297
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/php/FastStringSearch
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
