From 6965e987f0444c65d0ad48d3a5a19ecb9b665271 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 22 Oct 2016 14:35:45 +0200
Subject: [PATCH] Keep fpdi embedded

---
 build/debian/control                    | 2 +-
 build/debian/copyright                  | 3 ---
 build/debian/dolibarr.postinst          | 1 -
 build/debian/install.forced.php.install | 2 --
 build/debian/rules                      | 1 -
 5 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/build/debian/control b/build/debian/control
index d5c4a913713..37689ef9bcc 100755
--- a/build/debian/control
+++ b/build/debian/control
@@ -16,7 +16,7 @@ Depends: libapache2-mod-php5 | libapache2-mod-php5filter | php5-cgi | php5-fpm |
     php5-mysql | php5-mysqli, php5-curl, php5-gd, php5-ldap,
 # Required PHP libraries
     php-pear, php-mail-mime, 
-#    php-tcpdf, libfpdi-php,
+#    php-tcpdf,
 #    libfpdf-tpl-php, php-fpdf,
 #    libphp-adodb,
 #    libnusoap-php,
diff --git a/build/debian/copyright b/build/debian/copyright
index e568996551e..e3397d82992 100644
--- a/build/debian/copyright
+++ b/build/debian/copyright
@@ -197,9 +197,6 @@ License: GPL-2+
  On Debian systems, the full text of the GNU General Public
  License version 2 can be found in the file
  `/usr/share/common-licenses/GPL-2'.
-Comment:
- Those files are not shipped in the binary package as we
- configure Dolibarr to use the library packaged in "libfpdi-php".
 
 Files: htdocs/includes/geoip/*
 Copyright: 2007 MaxMind LLC
diff --git a/build/debian/dolibarr.postinst b/build/debian/dolibarr.postinst
index 5f61ffe2083..4b946fda433 100644
--- a/build/debian/dolibarr.postinst
+++ b/build/debian/dolibarr.postinst
@@ -147,7 +147,6 @@ 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    || [ ! -d "/usr/share/php/adodb" ]  || echo "<?php \$dolibarr_lib_ADODB_PATH='/usr/share/php/adodb'; ?>" >> $config
-			#grep -q -c "dolibarr_lib_FPDI_PATH" $config     || [ ! -d "/usr/share/php/fpdi" ]   || echo "<?php \$dolibarr_lib_FPDI_PATH='/usr/share/php/fpdi'; ?>" >> $config
 			##grep -q -c "dolibarr_lib_GEOIP_PATH" $config    || echo "<?php \$dolibarr_lib_GEOIP_PATH=''; ?>" >> $config
 			#grep -q -c "dolibarr_lib_NUSOAP_PATH" $config   || [ ! -d "/usr/share/php/nusoap" ] || echo "<?php \$dolibarr_lib_NUSOAP_PATH='/usr/share/php/nusoap'; ?>" >> $config
 			#grep -q -c "dolibarr_lib_ODTPHP_PATHTOPCLZIP" $config || [ ! -d "/usr/share/php/libphp-pclzip" ]  || echo "<?php \$dolibarr_lib_ODTPHP_PATHTOPCLZIP='/usr/share/php/libphp-pclzip'; ?>" >> $config
diff --git a/build/debian/install.forced.php.install b/build/debian/install.forced.php.install
index 57ab33464bc..56eef3287a6 100644
--- a/build/debian/install.forced.php.install
+++ b/build/debian/install.forced.php.install
@@ -30,8 +30,6 @@ $force_install_lockinstall='444';
 // - not removed from package (see rm in rules file),
 // - declared into dependencies (see Depends in control file)
 //$force_dolibarr_lib_TCPDF_PATH='';
-//$force_dolibarr_lib_FPDF_PATH='/usr/share/php/fpdf';
-//$force_dolibarr_lib_FPDI_PATH='/usr/share/php/fpdi';
 //$force_dolibarr_lib_ADODB_PATH='/usr/share/php/adodb';
 //$force_dolibarr_lib_GEOIP_PATH='';
 //$force_dolibarr_lib_NUSOAP_PATH='/usr/share/php/nusoap';
diff --git a/build/debian/rules b/build/debian/rules
index bd3a9badb09..50866c03e68 100755
--- a/build/debian/rules
+++ b/build/debian/rules
@@ -79,7 +79,6 @@ override_dh_install:
 	
 	# clean from all PHP embedded libraries (we use package dependencies instead)
 #	rm -fr htdocs/includes/adodbtime
-#	rm -fr htdocs/includes/fpdfi
 #	rm -fr htdocs/includes/geoip
 #	rm -fr htdocs/includes/nusoap
 #	rm -fr htdocs/includes/odtphp/zip/pclzip