php7 compat first round

This commit is contained in:
Mario Fetka
2017-05-20 21:41:48 +02:00
parent fce3ef7f28
commit c0391eb5ba
30 changed files with 3473 additions and 2745 deletions

9
debian/control vendored
View File

@@ -96,13 +96,8 @@ Package: pnp4nagios-web
Architecture: all
Depends:
${misc:Depends},
libapache2-mod-php5 | php5-cgi | php5,
php5-gd,
libkohana2-php,
libfpdi-php,
libjs-jquery (>= 1.6.2),
libjs-jquery-ui (>= 1.8.ooops.14),
libjs-jquery-mobile,
libapache2-mod-php5 | libapache2-mod-php7.0 | php5-cgi | php7.0-cgi | php7.0 | php5,
php7.0-gd | php5-gd ,
rrdtool,
adduser
Recommends: pnp4nagios-bin, pnp4nagios-web-config-icinga | pnp4nagios-web-config-nagios4

8
debian/rules vendored
View File

@@ -15,9 +15,9 @@ override_dh_auto_configure:
dh_auto_configure -- \
--with-layout=debian \
--mandir=/usr/share/man \
--infodir=/usr/share/info \
--without-kohana \
--with-kohana_system=/usr/share/php/kohana2/system
--infodir=/usr/share/info
# --without-kohana \
# --with-kohana_system=/usr/share/php/kohana2/system
override_dh_auto_build:
dh_auto_build -- all
@@ -67,7 +67,7 @@ override_dh_auto_install:
cp debian/icinga-module.cfg debian/tmp/usr/share/doc/pnp4nagios/examples/
# Remove external PHP classes/libraries: FPDF, FPDF-TPL, FPDI
rm -r debian/tmp/usr/share/pnp4nagios/html/application/vendor/fpdf
#rm -r debian/tmp/usr/share/pnp4nagios/html/application/vendor/fpdf
# remove source files
#rm -f debian/tmp/usr/share/pnp4nagios/html/media/js/jquery.imgareaselect.Debian.txt