Can choose nusoap library path.

Work on debian package.

build/deb/README

@@ -18,6 +18,7 @@ with format .DEB (for Debian, Ubuntu, ...).
 # gpg --gen-key                          Generate a GPG key
 #
 # debconf-updatepo					     To run into po dir to regenate templates.pot 
+# podebconf-report-po --from eldy@destailleur.fr	To send email to ask translations
 #
 # lintian --pedantic -E -I package.deb   To test a package   
 #

build/deb/changelog

@@ -1,6 +1,6 @@
-dolibarr (3.2.0-1.1) unstable; urgency=low
+dolibarr (3.2.0+nmu1) unstable; urgency=low
 
-  * Non-maintainer upload
+  * Non-maintainer upload.
   * New upstream release.
     closes: bug#634783
     

build/deb/control.debian

@@ -1,6 +1,6 @@
 Source: dolibarr
 Maintainer: Laurent Destailleur <eldy@users.sourceforge.net>
-Standards-Version: 3.9.1
+Standards-Version: 3.9.2
 Section: web
 Priority: optional
 Homepage: http://www.dolibarr.org
@@ -10,6 +10,7 @@ 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,
+    libnusoap-php,
     libphp-pclzip,
     ttf-dejavu-core,
     xdg-utils,

build/deb/copyright

@@ -1,7 +1,7 @@
-Format: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=135
+Format: http://anonscm.debian.org/viewvc/dep/web/deps/dep5.mdwn?revision=174
 Upstream-Name: Dolibarr
 Upstream-Contact: Laurent Destailleur <eldy@users.sourceforge.net>
-Source: cvs.savannah.nongnu.org:/sources/dolibar
+Source: git@github.com:Dolibarr/dolibarr.git
 
 Files: *
 Copyright: 2002-2009, Rodolphe Quiedeville   <rodolphe@quiedeville.org>
@@ -23,7 +23,7 @@ Copyright: 2002-2009, Rodolphe Quiedeville   <rodolphe@quiedeville.org>
            2007-2008, Jeremie Ollivier       <jeremie.o@laposte.net>
            2008, Raphael Bertrand (Resultic) <raphael.bertrand@resultic.fr>
            2010, Servitux Servicios Informaticos <info@servitux.es>
- License: GPL-2+
+License: GPL-2+
  This program is free software; you can redistribute it
  and/or modify it under the terms of the GNU General Public
  License as published by the Free Software Foundation; either
@@ -44,34 +44,164 @@ Copyright: 2002-2009, Rodolphe Quiedeville   <rodolphe@quiedeville.org>
  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'.
- Full text of Lesser General Public Licence version 3 can be 
+  
- found in the file
- `/usr/share/common-licenses/LGPL-3'.
- 
 Files: htdocs/includes/artichow/*
+Copyright: Artichow team
 License: Public Domain
+ This work is not subject to copyright in any jurisdiction
 
 Files: htdocs/includes/ckeditor/*
+Copyright: CKeditor team
 License: GPL-2+
+ This program is free software; you can redistribute it
+ and/or modify it under the terms of the GNU General Public
+ License as published by the Free Software Foundation; either
+ version 2 of the License, or (at your option) any later
+ version.
+ .
+ This program is distributed in the hope that it will be
+ useful, but WITHOUT ANY WARRANTY; without even the implied
+ warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ PURPOSE.  See the GNU General Public License for more
+ details.
+ .
+ You should have received a copy of the GNU General Public
+ License along with this package; if not, write to the Free
+ Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+ Boston, MA  02110-1301 USA
+ .
+ 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'.
 
 Files: htdocs/includes/fpdi/*
+Copyright: FPDFI team
 License: GPL-2+
+ This program is free software; you can redistribute it
+ and/or modify it under the terms of the GNU General Public
+ License as published by the Free Software Foundation; either
+ version 2 of the License, or (at your option) any later
+ version.
+ .
+ This program is distributed in the hope that it will be
+ useful, but WITHOUT ANY WARRANTY; without even the implied
+ warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ PURPOSE.  See the GNU General Public License for more
+ details.
+ .
+ You should have received a copy of the GNU General Public
+ License along with this package; if not, write to the Free
+ Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+ Boston, MA  02110-1301 USA
+ .
+ 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'.
 
 Files: htdocs/includes/jquery/*
-License: GPL-2+ or MIT
+Copyright: JQuery team
+License: MIT or GPL-2+
+ This program is free software; you can redistribute it
+ and/or modify it under the terms of the GNU General Public
+ License as published by the Free Software Foundation; either
+ version 2 of the License, or (at your option) any later
+ version.
+ .
+ This program is distributed in the hope that it will be
+ useful, but WITHOUT ANY WARRANTY; without even the implied
+ warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ PURPOSE.  See the GNU General Public License for more
+ details.
+ .
+ You should have received a copy of the GNU General Public
+ License along with this package; if not, write to the Free
+ Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+ Boston, MA  02110-1301 USA
+ .
+ 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'.
+ .
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the "Software"), to deal
+ in the Software without restriction, including without limitation the rights
+ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
+ .
+ The above copyright notice and this permission notice shall be included in
+ all copies or substantial portions of the Software.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ THE SOFTWARE.
 
 Files: htdocs/includes/jquery/plugins/flot/*
+Copyright: Flot team
 License: Public Domain
+ This work is not subject to copyright in any jurisdiction
 
 Files: htdocs/includes/jsgantt/*
+Copyright: JSGantt team
 License: GPL-2+
+ This program is free software; you can redistribute it
+ and/or modify it under the terms of the GNU General Public
+ License as published by the Free Software Foundation; either
+ version 2 of the License, or (at your option) any later
+ version.
+ .
+ This program is distributed in the hope that it will be
+ useful, but WITHOUT ANY WARRANTY; without even the implied
+ warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ PURPOSE.  See the GNU General Public License for more
+ details.
+ .
+ You should have received a copy of the GNU General Public
+ License along with this package; if not, write to the Free
+ Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+ Boston, MA  02110-1301 USA
+ .
+ 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'.
 
 Files: htdocs/includes/phpexcel/*
+Copyright: PHPExcel team
 License: LGPL 2.1
+ See http://www.gnu.org/licenses/old-licenses/lgpl-2.1-standalone.html
 
 Files: htdocs/includes/odtphp/*
+Copyright: 2008, Julien Pauli
+           2008, Cyril PIERRE de GEYER 
+           2010, Laurent Destailleur <eldy@users.sourceforge.net>
 License: GPL-2+
+ This program is free software; you can redistribute it
+ and/or modify it under the terms of the GNU General Public
+ License as published by the Free Software Foundation; either
+ version 2 of the License, or (at your option) any later
+ version.
+ .
+ This program is distributed in the hope that it will be
+ useful, but WITHOUT ANY WARRANTY; without even the implied
+ warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ PURPOSE.  See the GNU General Public License for more
+ details.
+ .
+ You should have received a copy of the GNU General Public
+ License along with this package; if not, write to the Free
+ Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+ Boston, MA  02110-1301 USA
+ .
+ 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'.
 
 Files: htdocs/includes/tcpdf/*
+Copyright: TCPDF team
 License: LGPL 3.0
+  See http://www.gnu.org/licenses/old-licenses/lgpl-3.0-standalone.html
  

build/deb/dolibarr.lintian-overrides

@@ -1,5 +1,4 @@
 # Embedded libraries, which don't seem to be available in Debian in correct version
 # or because they were modified and are specific dolibarr code
 embedded-javascript-library usr/share/dolibarr/htdocs/includes/ckeditor/adapters/jquery.js
-embedded-javascript-library usr/share/dolibarr/htdocs/includes/ckeditor/ckeditor.js
+embedded-javascript-library usr/share/dolibarr/htdocs/includes/ckeditor/ckeditor.js
-embedded-php-library usr/share/dolibarr/htdocs/includes/nusoap/lib/nusoap.php

build/deb/install.forced.php.install

@@ -25,7 +25,11 @@ $force_install_dolibarrlogin='admin';
 $force_install_nophpinfo='1';
 $force_install_lockinstall='444';
 
+$force_dolibarr_lib_FPDI_PATH='';
 $force_dolibarr_lib_GEOIP_PATH='';
+$force_dolibarr_lib_PHPEXCEL_PATH='';
+$force_dolibarr_lib_TCPDF_PATH='';
+$force_dolibarr_lib_NUSOAP_PATH='/usr/share/php/nusoap';
 $force_dolibarr_lib_ODTPHP_PATHTOPCLZIP='/usr/share/php/libphp-pclzip';
 $force_dolibarr_font_DOL_DEFAULT_TTF_BOLD='/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-Bold.ttf';
 

build/deb/po/templates.pot

@@ -3,7 +3,6 @@
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
-#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"

build/makepack-dolibarr.pl

@@ -259,9 +259,10 @@ if ($nboftargetok) {
         $ret=`rm -f  $BUILDROOT/$PROJECT/.gitignore`;
 	    $ret=`rm -fr $BUILDROOT/$PROJECT/.project`;
 	    $ret=`rm -fr $BUILDROOT/$PROJECT/.settings`;
-        $ret=`rm -f  $BUILDROOT/$PROJECT/pom.xml`;
+	    $ret=`rm -f  $BUILDROOT/$PROJECT/build.xml`;
         $ret=`rm -f  $BUILDROOT/$PROJECT/default.properties`;
         $ret=`rm -f  $BUILDROOT/$PROJECT/git2cvs.sh`;
+        $ret=`rm -f  $BUILDROOT/$PROJECT/pom.xml`;
         $ret=`rm -f  $BUILDROOT/$PROJECT/README.md`;
         
 	    $ret=`rm -fr $BUILDROOT/$PROJECT/build/html`;
@@ -345,6 +346,7 @@ if ($nboftargetok) {
         $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/free*.ctg.z`;
 		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/free*.z`;
 	    $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/LICENSE.TXT`;
+        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/jstree`;
 	    $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/langs/*/html`;
 		# Removed because not stable yet
         $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/theme/bureau2crea`;
@@ -622,6 +624,8 @@ if ($nboftargetok) {
             $build = $newbuild;
             $build =~ s/-.*$//g;
 			# now build is 0 for example
+			$build .= '+nmu1';
+			# now build is 0+nmu1 for example
 			
     		print "Remove target ${FILENAMEDEB}_all.deb...\n";
     		unlink("$NEWDESTI/${FILENAMEDEB}_all.deb");
@@ -667,7 +671,7 @@ if ($nboftargetok) {
             $ret=`cp -f  "$SOURCE/build/deb/postinst"         "$BUILDROOT/$PROJECT.tmp/DEBIAN"`;
             $ret=`cp -f  "$SOURCE/build/deb/postrm"           "$BUILDROOT/$PROJECT.tmp/DEBIAN"`;
             $ret=`cp -f  "$SOURCE/build/deb/templates"        "$BUILDROOT/$PROJECT.tmp/DEBIAN"`;
-            $ret=`cp -fr "$SOURCE/build/deb/po"              "$BUILDROOT/$PROJECT.tmp/DEBIAN"`;
+            $ret=`cp -fr "$SOURCE/build/deb/po"               "$BUILDROOT/$PROJECT.tmp/DEBIAN"`;
             $ret=`rm -fr "$BUILDROOT/$PROJECT.tmp/DEBIAN/po/CVS*"`;
             
             print "Edit version in file $BUILDROOT/$PROJECT.tmp/DEBIAN/control\n";
@@ -726,6 +730,7 @@ if ($nboftargetok) {
 			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/barcode/php-barcode/fonts`,
 	   	    $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/geoip`;
             $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/odtphp/zip/pclzip`;
+	   	    $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/nusoap`;
 
 			# Apache and lighttpd conf files
     		print "Copy apache.conf file into $BUILDROOT/$PROJECT.tmp/etc/$PROJECT/apache.conf\n";
@@ -772,13 +777,14 @@ if ($nboftargetok) {
             $cmd="find $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/dev -name '*.php' -type f -exec chmod 755 {} \\; ";
             $ret=`$cmd`;
             $ret=`chmod -R 644 $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/dev/translation/langAutoParser.class.php`;
-            $ret=`chmod -R 644 $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/dev/skeletons/skeleton_page.php`;
             $ret=`chmod -R 644 $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/dev/skeletons/modMyModule.class.php`;
             $ret=`chmod -R 644 $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/dev/skeletons/skeleton_class.class.php`;
+            $ret=`chmod -R 644 $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/dev/skeletons/skeleton_page.php`;
+            $ret=`chmod -R 644 $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/dev/skeletons/skeleton_webservice_server.php`;
             $cmd="find $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/scripts -name '*.php' -type f -exec chmod 755 {} \\; ";
             $ret=`$cmd`;
             
-             # Creation of binary package (to build without sources)
+            # Creation of binary package (to build without sources)
      		#print "Go to directory $BUILDROOT\n";
      		#chdir("$BUILDROOT");
     		#$cmd="dpkg -b $BUILDROOT/$PROJECT.tmp $BUILDROOT/${FILENAMEDEB}_all.deb";

htdocs/conf/conf.php.example

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

htdocs/societe/checkvat/checkVatPopup.php

@@ -23,7 +23,7 @@
 
 require ("../../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php");
-require_once(DOL_DOCUMENT_ROOT."/includes/nusoap/lib/nusoap.php");
+require_once(NUSOAP_PATH.'/nusoap.php');
 
 $langs->load("companies");
 

htdocs/webservices/demo_wsclient_invoice.php

@@ -104,6 +104,7 @@ echo '<title>WebService Test: '.$WS_METHOD1.'</title>';
 echo '</head>'."\n";
 
 echo '<body>'."\n";
+echo 'NUSOAP_PATH='.NUSOAP_PATH.'<br>';
 
 echo "<h2>Request:</h2>";
 echo '<h4>Function</h4>';

htdocs/webservices/demo_wsclient_other.php

@@ -81,6 +81,7 @@ echo '<title>WebService Test: '.$WS_METHOD.'</title>';
 echo '</head>'."\n";
 
 echo '<body>'."\n";
+echo 'NUSOAP_PATH='.NUSOAP_PATH.'<br>';
 
 echo "<h2>Request:</h2>";
 echo '<h4>Function</h4>';

htdocs/webservices/demo_wsclient_productorservice.php

@@ -104,6 +104,7 @@ echo '<title>WebService Test: '.$WS_METHOD1.'</title>';
 echo '</head>'."\n";
 
 echo '<body>'."\n";
+echo 'NUSOAP_PATH='.NUSOAP_PATH.'<br>';
 
 echo "<h2>Request:</h2>";
 echo '<h4>Function</h4>';

htdocs/webservices/demo_wsclient_thirdparty.php

@@ -80,6 +80,7 @@ echo '<title>WebService Test: '.$WS_METHOD.'</title>';
 echo '</head>'."\n";
 
 echo '<body>'."\n";
+echo 'NUSOAP_PATH='.NUSOAP_PATH.'<br>';
 
 echo "<h2>Request:</h2>";
 echo '<h4>Function</h4>';