Giuseppe Lavagetto has submitted this change and it was merged.

Change subject: add alternatives installation for /usr/bin/php
......................................................................


add alternatives installation for /usr/bin/php

Also, the installation of config files is avoided as they're not
generally needed at the moment.

Change-Id: I5d562cc890fa7e572f7ea6aefafa71a65d9069ef
Signed-off-by: Giuseppe Lavagetto <glavage...@wikimedia.org>
---
A debian/hhvm.postinst
M debian/rules
2 files changed, 2 insertions(+), 5 deletions(-)

Approvals:
  Filippo Giunchedi: Looks good to me, but someone else must approve
  Giuseppe Lavagetto: Verified; Looks good to me, approved



diff --git a/debian/hhvm.postinst b/debian/hhvm.postinst
new file mode 100755
index 0000000..3116515
--- /dev/null
+++ b/debian/hhvm.postinst
@@ -0,0 +1,2 @@
+#!/bin/bash -e
+/usr/bin/update-alternatives --install /usr/bin/php php /usr/bin/hhvm 60
diff --git a/debian/rules b/debian/rules
index 7a1d4b3..354928e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -29,9 +29,4 @@
 override_dh_strip:
        dh_strip --dbg-package=hhvm-dbg
 
-override_dh_auto_install:
-       dh_auto_install
-       install -m 0755 debian/hhvm.ini debian/etc/hhvm/hhvm.ini
-       install -m 0755 debian/config.hdf debian/etc/hhvm/config.hdf
-
 .PHONY: override_dh_auto_build override_dh_auto_configure 
override_dh_auto_test override_dh_strip

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I5d562cc890fa7e572f7ea6aefafa71a65d9069ef
Gerrit-PatchSet: 1
Gerrit-Project: operations/debs/hhvm
Gerrit-Branch: master
Gerrit-Owner: Giuseppe Lavagetto <glavage...@wikimedia.org>
Gerrit-Reviewer: Filippo Giunchedi <fgiunch...@wikimedia.org>
Gerrit-Reviewer: Giuseppe Lavagetto <glavage...@wikimedia.org>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to