Giuseppe Lavagetto has submitted this change and it was merged.

Change subject: Upgrade debian/rules for HHVM 3.12
......................................................................


Upgrade debian/rules for HHVM 3.12

Bug: T119637
Change-Id: Ie6ce1e58ce404715e02d2b64a5e0b60db17d91d3
---
M debian/changelog
M debian/rules
2 files changed, 8 insertions(+), 1 deletion(-)

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



diff --git a/debian/changelog b/debian/changelog
index 8fdade4..34d335f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+php-luasandbox (2.0.12) trusty-wikimedia; urgency=medium
+
+  * Adapting debian/rules to the newer HHVM package
+
+ -- Giuseppe Lavagetto <[email protected]>  Tue, 01 Mar 2016 13:30:04 
+0100
+
 php-luasandbox (2.0.11) trusty-wikimedia; urgency=medium
 
   * Dynamically allocate luasandbox_timer instances
diff --git a/debian/rules b/debian/rules
index b99b488..c19f212 100755
--- a/debian/rules
+++ b/debian/rules
@@ -67,7 +67,8 @@
 
 hhvm_gencontrol:
        # HHVM does *not* ensure binary compatibility
-       echo "hhvm:ApiVersion=hhvm-api-$(shell /usr/bin/hhvm --version | sed 
-ne 's/^Extension API:\ //p')" >> debian/hhvm-luasandbox.substvars
+       hhvmapi=$(shell /usr/bin/hhvm --version | sed -ne 's/^HipHop VM 
\(.*\)\..*/\1/p') && \
+               [ -n "$${hhvmapi}" ] && echo 
"hhvm:ApiVersion=hhvm-api-$${hhvmapi}" >> debian/hhvm-luasandbox.substvars
 
 override_dh_auto_clean:
        rm -rf debian/build*

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie6ce1e58ce404715e02d2b64a5e0b60db17d91d3
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/php/luasandbox
Gerrit-Branch: master
Gerrit-Owner: Giuseppe Lavagetto <[email protected]>
Gerrit-Reviewer: Anomie <[email protected]>
Gerrit-Reviewer: Giuseppe Lavagetto <[email protected]>
Gerrit-Reviewer: Jackmcbarn <[email protected]>
Gerrit-Reviewer: jenkins-bot <>

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

Reply via email to