Work on debian package

build/debian/control

@@ -9,9 +9,11 @@ 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,
+    php5-cli, php5-curl, php5-gd, php5-ldap, php-pear, php-mail-mime, php5-geoip, php-fpdf,
     libnusoap-php,
     libphp-pclzip,
+    libfpdi-php,
+    libfpdf-tpl-php,
     ckeditor,
     ttf-dejavu-core,
     xdg-utils,

build/debian/control.debianbin

@@ -8,6 +8,8 @@ Depends: libapache2-mod-php5 | libapache2-mod-php5filter | php5-cgi | php5-fpm |
     php5-cli, php5-curl, php5-gd, php5-ldap, php-pear, php-mail-mime, php5-geoip,
     libnusoap-php,
     libphp-pclzip,
+    libfpdi-php,
+    libfpdf-tpl-php,
     ckeditor,
     ttf-dejavu-core,
     xdg-utils,

build/debian/install.forced.php.install

@@ -25,7 +25,7 @@ $force_install_dolibarrlogin='admin';
 $force_install_nophpinfo='1';
 $force_install_lockinstall='444';
 
-$force_dolibarr_lib_FPDI_PATH='';
+$force_dolibarr_lib_FPDI_PATH='/usr/share/php/fpdi';
 $force_dolibarr_lib_GEOIP_PATH='';
 $force_dolibarr_lib_PHPEXCEL_PATH='';
 $force_dolibarr_lib_TCPDF_PATH='';

build/debian/rules

@@ -101,6 +101,7 @@ clean:
 	rm -fr build/rpm
 	rm -fr build/zip
 	rm -fr htdocs/includes/ckeditor
+	rm -fr htdocs/includes/fpdfi
 	rm -fr htdocs/includes/fonts
 	rm -fr htdocs/includes/geoip
 	rm -fr htdocs/includes/nusoap

htdocs/admin/system/constall.php

@@ -74,8 +74,8 @@ $configfileparameters=array(
                             'separator',
                             '?dolibarr_lib_ADODB_PATH',
                             '?dolibarr_lib_TCPDF_PATH',
-                            '?dolibarr_lib_FPDFI_PATH',
-                            '?dolibarr_lib_NUSOAP_PATH',
+                            '?dolibarr_lib_FPDI_PATH',
+							'?dolibarr_lib_NUSOAP_PATH',
                             '?dolibarr_lib_PHPEXCEL_PATH',
                             '?dolibarr_lib_GEOIP_PATH',
 							'?dolibarr_lib_ODTPHP_PATH',
@@ -114,8 +114,8 @@ $configfilelib=array(
 					'separator',
                     'dolibarr_lib_ADODB_PATH',
                     'dolibarr_lib_TCPDF_PATH',
-                    'dolibarr_lib_FPDFI_PATH',
-                    'dolibarr_lib_NUSOAP_PATH',
+                    'dolibarr_lib_FPDI_PATH',
+					'dolibarr_lib_NUSOAP_PATH',
                     'dolibarr_lib_PHPEXCEL_PATH',
                     'dolibarr_lib_GEOIP_PATH',
 					'dolibarr_lib_ODTPHP_PATH',

htdocs/conf/conf.php.example

@@ -266,7 +266,7 @@ $dolibarr_main_prod='0';
 // Value to overwrite path to use shared libraries instead of embedded one
 //$dolibarr_lib_TCPDF_PATH='';
 // Value to overwrite path to use shared libraries instead of embedded one
-//$dolibarr_lib_FPDFI_PATH='';
+//$dolibarr_lib_FPDI_PATH='/usr/share/php/fpdi';
 // Value to overwrite path to use shared libraries instead of embedded one
 //$dolibarr_lib_NUSOAP_PATH='/usr/share/php/nusoap';
 // Value to overwrite path to use shared libraries instead of embedded one

htdocs/core/lib/pdf.lib.php

@@ -79,7 +79,7 @@ function pdf_getInstance($format='',$metric='mm',$pagetype='P')
 
 	require_once(TCPDF_PATH.'tcpdf.php');
 	// We need to instantiate fpdi object (instead of tcpdf) to use merging features. But we can disable it.
-	if (empty($conf->global->MAIN_DISABLE_FPDI)) require_once(FPDFI_PATH.'fpdi.php');
+	if (empty($conf->global->MAIN_DISABLE_FPDI)) require_once(FPDI_PATH.'fpdi.php');
 
 	//$arrayformat=pdf_getFormat();
 	//$format=array($arrayformat['width'],$arrayformat['height']);
@@ -101,7 +101,7 @@ function pdf_getInstance($format='',$metric='mm',$pagetype='P')
 		 */
 		if (! empty($conf->global->MAIN_USE_FPDF))
 		{
-			require_once(FPDFI_PATH.'fpdi_protection.php');
+			require_once(FPDI_PATH.'fpdi_protection.php');
 			$pdf = new FPDI_Protection($pagetype,$metric,$format);
 			// For FPDF, we specify permission we want to open
 			$pdfrights = array('print');

htdocs/filefunc.inc.php

@@ -183,7 +183,7 @@ define('MAIN_DB_PREFIX',$dolibarr_main_db_prefix);
 // Path to root libraries
 if (! defined('ADODB_PATH'))           { define('ADODB_PATH',           (!isset($dolibarr_lib_ADODB_PATH))?DOL_DOCUMENT_ROOT.'/includes/adodbtime/':(empty($dolibarr_lib_ADODB_PATH)?'':$dolibarr_lib_ADODB_PATH.'/')); }
 if (! defined('TCPDF_PATH'))           { define('TCPDF_PATH',           (!isset($dolibarr_lib_TCPDF_PATH))?DOL_DOCUMENT_ROOT.'/includes/tcpdf/':(empty($dolibarr_lib_TCPDF_PATH)?'':$dolibarr_lib_TCPDF_PATH.'/')); }
-if (! defined('FPDFI_PATH'))           { define('FPDFI_PATH',           (!isset($dolibarr_lib_FPDFI_PATH))?DOL_DOCUMENT_ROOT.'/includes/fpdfi/':(empty($dolibarr_lib_FPDFI_PATH)?'':$dolibarr_lib_FPDFI_PATH.'/')); }
+if (! defined('FPDI_PATH'))            { define('FPDI_PATH',            (!isset($dolibarr_lib_FPDI_PATH))?DOL_DOCUMENT_ROOT.'/includes/fpdfi/':(empty($dolibarr_lib_FPDI_PATH)?'':$dolibarr_lib_FPDI_PATH.'/')); }
 if (! defined('NUSOAP_PATH'))          { define('NUSOAP_PATH',          (!isset($dolibarr_lib_NUSOAP_PATH))?DOL_DOCUMENT_ROOT.'/includes/nusoap/lib/':(empty($dolibarr_lib_NUSOAP_PATH)?'':$dolibarr_lib_NUSOAP_PATH.'/')); }
 if (! defined('PHPEXCEL_PATH'))        { define('PHPEXCEL_PATH',        (!isset($dolibarr_lib_PHPEXCEL_PATH))?DOL_DOCUMENT_ROOT.'/includes/phpexcel/':(empty($dolibarr_lib_PHPEXCEL_PATH)?'':$dolibarr_lib_PHPEXCEL_PATH.'/')); }
 if (! defined('GEOIP_PATH'))           { define('GEOIP_PATH',           (!isset($dolibarr_lib_GEOIP_PATH))?DOL_DOCUMENT_ROOT.'/includes/geoip/':(empty($dolibarr_lib_GEOIP_PATH)?'':$dolibarr_lib_GEOIP_PATH.'/')); }