diff --git a/build/debian/control b/build/debian/control index 87a9ec3570ae8a2d4b21a4772e73e4668047ce3c..1fd7a60d98ff97243f31f91dbea9627c28631b76 100755 --- a/build/debian/control +++ b/build/debian/control @@ -10,10 +10,11 @@ Package: dolibarr Depends: libapache2-mod-php5 | libapache2-mod-php5filter | php5-cgi | php5-fpm | php5, php5-mysql | php5-mysqli, php5-cli, php5-curl, php5-gd, php5-ldap, php-pear, php-mail-mime, php5-geoip, php-fpdf, - libnusoap-php, - libphp-pclzip, + libphp-adodb, libfpdi-php, libfpdf-tpl-php, + libnusoap-php, + libphp-pclzip, ckeditor, ttf-dejavu-core, xdg-utils, diff --git a/build/debian/install.forced.php.install b/build/debian/install.forced.php.install index 9e86f144e197f3ac751ec311fb604c6d94a6cfa3..5344a4be9e0d21a507a3628688d26b7db903b4be 100755 --- a/build/debian/install.forced.php.install +++ b/build/debian/install.forced.php.install @@ -25,6 +25,7 @@ $force_install_dolibarrlogin='admin'; $force_install_nophpinfo='1'; $force_install_lockinstall='444'; +$force_dolibarr_lib_ADODB_PATH='/usr/share/php/adodb'; $force_dolibarr_lib_FPDI_PATH='/usr/share/php/fpdi'; $force_dolibarr_lib_GEOIP_PATH=''; $force_dolibarr_lib_PHPEXCEL_PATH=''; diff --git a/build/rpm/install.forced.php.fedora b/build/rpm/install.forced.php.fedora index 5bb47d1287ec14b16a4a92c045b9f4757b0ff885..8847a85d826f7ca364b6b6a631c34b4b6249e102 100755 --- a/build/rpm/install.forced.php.fedora +++ b/build/rpm/install.forced.php.fedora @@ -20,13 +20,10 @@ $force_install_lockinstall='444'; # Value to overwrite path to use shared libraries instead of embedded one $force_dolibarr_lib_ADODB_PATH='/usr/share/php/adodb'; -# Value to overwrite path to use shared libraries instead of embedded one -$force_dolibarr_lib_NUSOAP_PATH='/usr/share/php/nusoap'; -# Value to overwrite path to use shared libraries instead of embedded one -#$force_dolibarr_lib_ODTPHP_PATHTOPCLZIP="/usr/share/php/libphp-pclzip"; - #$force_dolibarr_lib_GEOIP_PATH=''; +$force_dolibarr_lib_NUSOAP_PATH='/usr/share/php/nusoap'; #$force_dolibarr_lib_ODTPHP_PATHTOPCLZIP='/usr/share/php/libphp-pclzip'; +#$force_dolibarr_js_CKEDITOR='/javascript/ckeditor'; $force_dolibarr_font_DOL_DEFAULT_TTF_BOLD='/usr/share/fonts/dejavu/DejaVuSans-Bold.ttf'; ?> \ No newline at end of file diff --git a/build/rpm/install.forced.php.mandriva b/build/rpm/install.forced.php.mandriva index 2f831fa85e2d25828d870eee9fe623176da5a32f..64908a87d72cab11ad51e650cb0fcbbb3abdc207 100755 --- a/build/rpm/install.forced.php.mandriva +++ b/build/rpm/install.forced.php.mandriva @@ -18,8 +18,12 @@ $force_install_dolibarrlogin='admin'; $force_install_nophpinfo='1'; $force_install_lockinstall='444'; +# Value to overwrite path to use shared libraries instead of embedded one +$force_dolibarr_lib_ADODB_PATH='/usr/share/php/adodb'; #$force_dolibarr_lib_GEOIP_PATH=''; +$force_dolibarr_lib_NUSOAP_PATH='/usr/share/php/nusoap'; #$force_dolibarr_lib_ODTPHP_PATHTOPCLZIP='/usr/share/php/libphp-pclzip'; +#$force_dolibarr_js_CKEDITOR='/javascript/ckeditor'; $force_dolibarr_font_DOL_DEFAULT_TTF_BOLD='/usr/share/fonts/TTF/dejavu/DejaVuSans-Bold.ttf'; ?> \ No newline at end of file diff --git a/build/rpm/install.forced.php.opensuse b/build/rpm/install.forced.php.opensuse index de90d26792e52f3498d6b0f0755b27d164e700e0..ece47981e0c7d34994b76f911113236b48ba9cde 100755 --- a/build/rpm/install.forced.php.opensuse +++ b/build/rpm/install.forced.php.opensuse @@ -18,8 +18,12 @@ $force_install_dolibarrlogin='admin'; $force_install_nophpinfo='1'; $force_install_lockinstall='444'; +# Value to overwrite path to use shared libraries instead of embedded one +$force_dolibarr_lib_ADODB_PATH='/usr/share/php/adodb'; #$force_dolibarr_lib_GEOIP_PATH=''; +$force_dolibarr_lib_NUSOAP_PATH='/usr/share/php/nusoap'; #$force_dolibarr_lib_ODTPHP_PATHTOPCLZIP='/usr/share/php/libphp-pclzip'; +#$force_dolibarr_js_CKEDITOR='/javascript/ckeditor'; $force_dolibarr_font_DOL_DEFAULT_TTF_BOLD='/usr/share/fonts/truetype'; ?> \ No newline at end of file