lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix: not dependencies by default to be compatible with all distrib.

Browse Source
This commit is contained in:
Laurent Destailleur 2014-02-02 14:57:55 +01:00
parent 873d44e2c0
commit 4c60873d06
3 changed files with 37 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
build/debian/control
View File

@ -11,13 +11,14 @@ Comments: This package need at least debian 7 or ubuntu 13.04 or any distributio
Package: dolibarr Package: dolibarr
Depends: libapache2-mod-php5 | libapache2-mod-php5filter | php5-cgi | php5-fpm | php5, Depends: libapache2-mod-php5 | libapache2-mod-php5filter | php5-cgi | php5-fpm | php5,
php5-mysql | php5-mysqli, php5-mysql | php5-mysqli,
php5-cli, php5-curl, php5-gd, php5-ldap, php-pear, php-mail-mime, php5-geoip, php5-cli, php5-curl, php5-gd, php5-ldap, php-pear, php-mail-mime,
libphp-adodb, # php5-geoip,
libnusoap-php, # libphp-adodb,
libphp-pclzip, # libnusoap-php,
libfpdi-php, libfpdf-tpl-php, php-fpdf, # libphp-pclzip,
libjs-jquery, libjs-jquery-ui, libjs-flot, ckeditor, # libfpdi-php, libfpdf-tpl-php, php-fpdf,
ttf-dejavu-core, # libjs-jquery, libjs-jquery-ui, libjs-flot, ckeditor,
# ttf-dejavu-core,
xdg-utils, xdg-utils,
mysql-server, mysql-server,
${misc:Depends}, ${misc:Depends},

30
build/debian/install.forced.php.install
View File

@ -27,20 +27,20 @@ $force_install_lockinstall='444';
// Value to overwrite path to use shared libraries/fonts instead of embedded one. // Value to overwrite path to use shared libraries/fonts instead of embedded one.
// If we enable/disable libraries declaration during install, we must also check they are // If we enable/disable libraries declaration during install, we must also check they are
// not removed from package (see in rules file), // - not removed from package (see rm in rules file),
// declared into dependencies (see in control file) // - declared into dependencies (see Depends in control file)
$force_dolibarr_lib_TCPDF_PATH=''; //$force_dolibarr_lib_TCPDF_PATH='';
$force_dolibarr_lib_FPDF_PATH='/usr/share/php/fpdf'; //$force_dolibarr_lib_FPDF_PATH='/usr/share/php/fpdf';
$force_dolibarr_lib_FPDI_PATH='/usr/share/php/fpdi'; //$force_dolibarr_lib_FPDI_PATH='/usr/share/php/fpdi';
$force_dolibarr_lib_ADODB_PATH='/usr/share/php/adodb'; //$force_dolibarr_lib_ADODB_PATH='/usr/share/php/adodb';
$force_dolibarr_lib_GEOIP_PATH=''; //$force_dolibarr_lib_GEOIP_PATH='';
$force_dolibarr_lib_NUSOAP_PATH='/usr/share/php/nusoap'; //$force_dolibarr_lib_NUSOAP_PATH='/usr/share/php/nusoap';
$force_dolibarr_lib_ODTPHP_PATHTOPCLZIP='/usr/share/php/libphp-pclzip'; //$force_dolibarr_lib_ODTPHP_PATHTOPCLZIP='/usr/share/php/libphp-pclzip';
$force_dolibarr_lib_PHPEXCEL_PATH=''; //$force_dolibarr_lib_PHPEXCEL_PATH='';
$force_dolibarr_js_CKEDITOR='/javascript/ckeditor'; //$force_dolibarr_js_CKEDITOR='/javascript/ckeditor';
$force_dolibarr_js_JQUERY='/javascript/jquery'; //$force_dolibarr_js_JQUERY='/javascript/jquery';
$force_dolibarr_js_JQUERY_UI='/javascript/jquery-ui'; //$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'; //$force_dolibarr_font_DOL_DEFAULT_TTF_BOLD='/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-Bold.ttf';
?> ?>

28
build/debian/rules
View File

@ -90,27 +90,27 @@ clean:
rm -fr build/rpm rm -fr build/rpm
rm -fr build/zip rm -fr build/zip
# clean from all embedded libraries (we use package dependencies instead) # clean from all PHP embedded libraries (we use package dependencies instead)
rm -fr htdocs/includes/adodbtime # 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/geoip # rm -fr htdocs/includes/nusoap
rm -fr htdocs/includes/nusoap # rm -fr htdocs/includes/odtphp/zip/pclzip
rm -fr htdocs/includes/odtphp/zip/pclzip # clean from all JS-CSS embedded libraries (we use package dependencies instead)
rm -fr htdocs/includes/phpmailer # rm -fr htdocs/includes/ckeditor
rm -fr htdocs/includes/jquery/css # rm -fr htdocs/includes/jquery/js
rm -fr htdocs/includes/jquery/js # rm -fr htdocs/includes/jquery/css
rm -fr htdocs/includes/jquery/plugins/flot # rm -fr htdocs/includes/jquery/plugins/flot
rm -fr htdocs/includes/jquery/plugins/jstree # clean from all embedded fonts (we use package dependencies instead)
rm -fr htdocs/includes/jquery/plugins/lightbox # rm -fr htdocs/includes/fonts
# clean from useless files
rm -fr htdocs/includes/jquery/plugins/multiselect rm -fr htdocs/includes/jquery/plugins/multiselect
rm -fr htdocs/includes/phpexcel/PHPExcel/Shared/PDF rm -fr htdocs/includes/phpexcel/PHPExcel/Shared/PDF
rm -fr htdocs/includes/phpexcel/PHPExcel/Shared/PCLZip rm -fr htdocs/includes/phpexcel/PHPExcel/Shared/PCLZip
rm -fr htdocs/includes/tcpdf/fonts/dejavu-fonts-ttf-2.33 rm -fr htdocs/includes/tcpdf/fonts/dejavu-fonts-ttf-2.33
rm -fr htdocs/includes/tcpdf/fonts/freefont-20100919 rm -fr htdocs/includes/tcpdf/fonts/freefont-20100919
rm -fr htdocs/includes/tcpdf/fonts/utils rm -fr htdocs/includes/tcpdf/fonts/utils
# clean from files to avoid warning of missing dependencies # clean from files to avoid warning of missing dependencies
rm -fr htdocs/includes/jquery/plugins/jqueryFileTree/connectors/jqueryFileTree.py rm -fr htdocs/includes/jquery/plugins/jqueryFileTree/connectors/jqueryFileTree.py