diff --git a/build/debian/control b/build/debian/control index 198e93ce8c0..b66c18f91bd 100755 --- a/build/debian/control +++ b/build/debian/control @@ -9,13 +9,12 @@ Build-Depends: debhelper (>= 7), po-debconf, dpatch 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, - libphp-adodb, - libfpdi-php, - libfpdf-tpl-php, + php5-cli, php5-curl, php5-gd, php5-ldap, php-pear, php-mail-mime, php5-geoip, + php-fpdf, + libphp-adodb, libnusoap-php, libphp-pclzip, - libjs-jquery, libjs-jquery-ui, libjs-flot, ckeditor, + libjs-jquery, libjs-jquery-ui, ckeditor, ttf-dejavu-core, xdg-utils, mysql-server, diff --git a/build/debian/control.debianbin b/build/debian/control.debianbin index 50217f0b861..cfba2bd9ab9 100755 --- a/build/debian/control.debianbin +++ b/build/debian/control.debianbin @@ -6,11 +6,10 @@ Installed-Size: 61200 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, + libphp-adodb, libnusoap-php, libphp-pclzip, - libfpdi-php, - libfpdf-tpl-php, - ckeditor, + libjs-jquery, libjs-jquery-ui, ckeditor, ttf-dejavu-core, xdg-utils, mysql-server diff --git a/build/debian/dolibarr.postinst b/build/debian/dolibarr.postinst index 436dbe46b70..52ee8cb2067 100644 --- a/build/debian/dolibarr.postinst +++ b/build/debian/dolibarr.postinst @@ -94,7 +94,7 @@ case "$1" in # File already exist. We add params not found. echo Add new params to overwrite path to use shared libraries/fonts grep -q -c "dolibarr_lib_ADODB_PATH" $config || echo "" >> $config - grep -q -c "dolibarr_lib_FPDI_PATH" $config || echo "" >> $config + #grep -q -c "dolibarr_lib_FPDI_PATH" $config || echo "" >> $config grep -q -c "dolibarr_lib_GEOIP_PATH" $config || echo "" >> $config grep -q -c "dolibarr_lib_NUSOAP_PATH" $config || echo "" >> $config grep -q -c "dolibarr_lib_ODTPHP_PATHTOPCLZIP" $config || echo "" >> $config @@ -103,7 +103,7 @@ case "$1" in grep -q -c "dolibarr_js_CKEDITOR" $config || echo "" >> $config grep -q -c "dolibarr_js_JQUERY" $config || echo "" >> $config grep -q -c "dolibarr_js_JQUERY_UI" $config || echo "" >> $config - grep -q -c "dolibarr_js_JQUERY_FLOT" $config || echo "" >> $config + #grep -q -c "dolibarr_js_JQUERY_FLOT" $config || echo "" >> $config grep -q -c "dolibarr_font_DOL_DEFAULT_TTF_BOLD" $config || echo "" >> $config fi diff --git a/build/debian/install.forced.php.install b/build/debian/install.forced.php.install index 4e04e5da077..9ecc7ecf550 100755 --- a/build/debian/install.forced.php.install +++ b/build/debian/install.forced.php.install @@ -27,7 +27,7 @@ $force_install_lockinstall='444'; // Value to overwrite path to use shared libraries/fonts instead of embedded one $force_dolibarr_lib_ADODB_PATH='/usr/share/php/adodb'; -$force_dolibarr_lib_FPDI_PATH='/usr/share/php/fpdi'; +//$force_dolibarr_lib_FPDI_PATH='/usr/share/php/fpdi'; $force_dolibarr_lib_GEOIP_PATH=''; $force_dolibarr_lib_NUSOAP_PATH='/usr/share/php/nusoap'; $force_dolibarr_lib_ODTPHP_PATHTOPCLZIP='/usr/share/php/libphp-pclzip'; @@ -36,7 +36,7 @@ $force_dolibarr_lib_TCPDF_PATH=''; $force_dolibarr_js_CKEDITOR='/javascript/ckeditor'; $force_dolibarr_js_JQUERY='/javascript/jquery'; $force_dolibarr_js_JQUERY_UI='/javascript/jquery-ui'; -$force_dolibarr_js_JQUERY_FLOT='/javascript/flot'; +//$force_dolibarr_js_JQUERY_FLOT='/javascript/flot'; $force_dolibarr_font_DOL_DEFAULT_TTF_BOLD='/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-Bold.ttf'; ?> \ No newline at end of file diff --git a/build/debian/rules b/build/debian/rules index 02af430a9c0..511d26147b4 100755 --- a/build/debian/rules +++ b/build/debian/rules @@ -93,17 +93,18 @@ clean: # clean from all embedded libraries (we use package dependencies instead) rm -fr htdocs/includes/adodbtime rm -fr htdocs/includes/ckeditor - rm -fr htdocs/includes/fpdfi +# rm -fr htdocs/includes/fpdfi rm -fr htdocs/includes/fonts rm -fr htdocs/includes/geoip rm -fr htdocs/includes/nusoap rm -fr htdocs/includes/odtphp/zip/pclzip rm -fr htdocs/includes/jquery/css rm -fr htdocs/includes/jquery/js - rm -fr htdocs/includes/jquery/plugins/flot +# rm -fr htdocs/includes/jquery/plugins/flot rm -fr htdocs/includes/jquery/plugins/jstree rm -fr htdocs/includes/jquery/plugins/lightbox rm -fr htdocs/includes/jquery/plugins/mobile + rm -fr htdocs/includes/jquery/plugins/multiselect rm -fr htdocs/includes/phpexcel/PHPExcel/Shared/PDF rm -fr htdocs/includes/phpexcel/PHPExcel/Shared/PCLZip rm -fr htdocs/includes/tcpdf/fonts/dejavu-fonts-ttf-2.33