From 7afcee03b9bc8c5e89c281a337643a0fa5c6db86 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 18 Feb 2012 03:29:43 +0100
Subject: [PATCH] Work on debian package
---
build/debian/control | 4 +++-
build/debian/control.debianbin | 2 ++
build/debian/install.forced.php.install | 2 +-
build/debian/rules | 1 +
htdocs/admin/system/constall.php | 8 ++++----
htdocs/conf/conf.php.example | 2 +-
htdocs/core/lib/pdf.lib.php | 4 ++--
htdocs/filefunc.inc.php | 2 +-
8 files changed, 15 insertions(+), 10 deletions(-)
diff --git a/build/debian/control b/build/debian/control
index e10b43f392d..87a9ec3570a 100755
--- a/build/debian/control
+++ b/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,
diff --git a/build/debian/control.debianbin b/build/debian/control.debianbin
index 2262f245447..50217f0b861 100755
--- a/build/debian/control.debianbin
+++ b/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,
diff --git a/build/debian/install.forced.php.install b/build/debian/install.forced.php.install
index 3f8e2f85c1f..9e86f144e19 100755
--- a/build/debian/install.forced.php.install
+++ b/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='';
diff --git a/build/debian/rules b/build/debian/rules
index 04247898209..8adc43d021c 100755
--- a/build/debian/rules
+++ b/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
diff --git a/htdocs/admin/system/constall.php b/htdocs/admin/system/constall.php
index 83413719df0..49badc2c3ef 100644
--- a/htdocs/admin/system/constall.php
+++ b/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',
diff --git a/htdocs/conf/conf.php.example b/htdocs/conf/conf.php.example
index 9d3c326e60d..9b2a5fc1d41 100644
--- a/htdocs/conf/conf.php.example
+++ b/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
diff --git a/htdocs/core/lib/pdf.lib.php b/htdocs/core/lib/pdf.lib.php
index 3c26fb13733..2efed69b78c 100644
--- a/htdocs/core/lib/pdf.lib.php
+++ b/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');
diff --git a/htdocs/filefunc.inc.php b/htdocs/filefunc.inc.php
index 0eaf46b41ac..b853ecb59bc 100755
--- a/htdocs/filefunc.inc.php
+++ b/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.'/')); }
--
GitLab