diff --git a/build/makepack-dolibarr.pl b/build/makepack-dolibarr.pl
index 0e8f2ea0fdda9d466aaee500d2ae575a4371f081..3f637ef856edceac5119109bfdc74eab8fddb500 100755
--- a/build/makepack-dolibarr.pl
+++ b/build/makepack-dolibarr.pl
@@ -63,19 +63,19 @@ $PUBLISHSTABLE="eldy,dolibarr\@frs.sourceforge.net:/home/frs/project/dolibarr";
 $PUBLISHBETARC="ldestailleur\@asso.dolibarr.org:/home/dolibarr/dolibarr.org/files";
 if (! $ENV{"DESTIBETARC"} || ! $ENV{"DESTISTABLE"})
 {
-    print "Error: Missing environment variables.\n";
+	print "Error: Missing environment variables.\n";
 	print "You must define the environment variable DESTIBETARC and DESTISTABLE to point to the\ndirectories where you want to save the generated packages.\n";
 	print "Example: DESTIBETARC='/media/HDDATA1_LD/Mes Sites/Web/Dolibarr/dolibarr.org/files/lastbuild'\n";
 	print "Example: DESTISTABLE='/media/HDDATA1_LD/Mes Sites/Web/Dolibarr/dolibarr.org/files/stable'\n";
 	print "$PROG.$Extension aborted.\n";
-    sleep 2;
+	sleep 2;
 	exit 1;
 }
 if (! -d $ENV{"DESTIBETARC"} || ! -d $ENV{"DESTISTABLE"})
 {
-    print "Error: Directory of environment variable DESTIBETARC or DESTISTABLE does not exist.\n";
+	print "Error: Directory of environment variable DESTIBETARC or DESTISTABLE does not exist.\n";
 	print "$PROG.$Extension aborted.\n";
-    sleep 2;
+	sleep 2;
 	exit 1;
 }
 
@@ -85,31 +85,31 @@ if ("$^O" =~ /linux/i || (-d "/etc" && -d "/var" && "$^O" !~ /cygwin/i)) { $OS='
 elsif (-d "/etc" && -d "/Users") { $OS='macosx'; $CR=''; }
 elsif ("$^O" =~ /cygwin/i || "$^O" =~ /win32/i) { $OS='windows'; $CR="\r"; }
 if (! $OS) {
-    print "Error: Can't detect your OS.\n";
+	print "Error: Can't detect your OS.\n";
 	print "Can't continue.\n";
 	print "$PROG.$Extension aborted.\n";
-    sleep 2;
+	sleep 2;
 	exit 1;
 }
 
 # Define buildroot
 # ----------------
 if ($OS =~ /linux/) {
-    $TEMP=$ENV{"TEMP"}||$ENV{"TMP"}||"/tmp";
+	$TEMP=$ENV{"TEMP"}||$ENV{"TMP"}||"/tmp";
 }
 if ($OS =~ /macos/) {
-    $TEMP=$ENV{"TEMP"}||$ENV{"TMP"}||"/tmp";
+	$TEMP=$ENV{"TEMP"}||$ENV{"TMP"}||"/tmp";
 }
 if ($OS =~ /windows/) {
-    $TEMP=$ENV{"TEMP"}||$ENV{"TMP"}||"c:/temp";
-    $PROGPATH=$ENV{"ProgramFiles"};
+	$TEMP=$ENV{"TEMP"}||$ENV{"TMP"}||"c:/temp";
+	$PROGPATH=$ENV{"ProgramFiles"};
 }
 if (! $TEMP || ! -d $TEMP) {
-    print "Error: A temporary directory can not be find.\n";
-    print "Check that TEMP or TMP environment variable is set correctly.\n";
+	print "Error: A temporary directory can not be find.\n";
+	print "Check that TEMP or TMP environment variable is set correctly.\n";
 	print "$PROG.$Extension aborted.\n";
-    sleep 2;
-    exit 2;
+	sleep 2;
+	exit 2;
 } 
 $BUILDROOT="$TEMP/buildroot";
 
@@ -169,10 +169,10 @@ my $batch=0;
 for (0..@ARGV-1) {
 	if ($ARGV[$_] =~ /^-*target=(\w+)/i)   { $target=$1; $batch=1; }
 	if ($ARGV[$_] =~ /^-*desti=(.+)/i)     { $DESTI=$1; }
-    if ($ARGV[$_] =~ /^-*prefix=(.+)/i)    {
-    	$PREFIX=$1; 
-    	$FILENAMESNAPSHOT.="-".$PREFIX; 
-    }
+	if ($ARGV[$_] =~ /^-*prefix=(.+)/i)    {
+		$PREFIX=$1; 
+		$FILENAMESNAPSHOT.="-".$PREFIX; 
+	}
 }
 if ($ENV{"DESTIBETARC"} && $BUILD =~ /[a-z]/i)   { $DESTI = $ENV{"DESTIBETARC"}; }	# Force output dir if env DESTIBETARC is defined
 if ($ENV{"DESTISTABLE"} && $BUILD =~ /^[0-9]+$/) { $DESTI = $ENV{"DESTISTABLE"}; }	# Force output dir if env DESTISTABLE is defined
@@ -192,7 +192,7 @@ print "Target directory (DESTI) : $DESTI\n";
 if ($target) {
 	if ($target eq "ALL") { 
 		foreach my $key (@LISTETARGET) {
-	    	if ($key ne 'SNAPSHOT' && $key ne 'SF' && $key ne 'ASSO') { $CHOOSEDTARGET{$key}=1; }
+			if ($key ne 'SNAPSHOT' && $key ne 'SF' && $key ne 'ASSO') { $CHOOSEDTARGET{$key}=1; }
 		}
 	}
 	if ($target ne "ALL" && $target ne "SF" && $target ne "ASSO") { $CHOOSEDTARGET{uc($target)}=1; }
@@ -200,56 +200,56 @@ if ($target) {
 	if ($target eq "ASSO") { $CHOOSEDPUBLISH{"ASSO"}=1; }
 }
 else {
-    my $found=0;
-    my $NUM_SCRIPT;
-   	my $cpt=0;
-    while (! $found) {
-    	printf(" %2d - %-14s  (%s)\n",$cpt,"ALL (1..9)","Need ".join(",",values %REQUIREMENTTARGET));
-    	foreach my $target (@LISTETARGET) {
-    		$cpt++;
-    		printf(" %2d - %-14s  (%s)\n",$cpt,$target,"Need ".$REQUIREMENTTARGET{$target});
-    	}
-    	$cpt=98;
-    	printf(" %2d - %-14s  (%s)\n",$cpt,"ASSO (publish)","Need ".join(",",values %REQUIREMENTPUBLISH));
-    	$cpt=99;
-    	printf(" %2d - %-14s  (%s)\n",$cpt,"SF (publish)","Need ".join(",",values %REQUIREMENTPUBLISH));
-    
-    	# Ask which target to build
-    	print "Choose one package number or several separated with space (0 - ".$cpt."): ";
-    	$NUM_SCRIPT=<STDIN>; 
-    	chomp($NUM_SCRIPT);
-    	if ($NUM_SCRIPT !~ /^[0-9\s]+$/)
-    	{
-    		print "This is not a valid package number list.\n";
-    		$found = 0;
-    	}
-    	else
-    	{
-    		$found = 1;
-    	}
-    }
-    print "\n";
-    if ($NUM_SCRIPT eq "98") {
-   		$CHOOSEDPUBLISH{"ASSO"}=1;
-    }
-    else 
-    {
-    	if ($NUM_SCRIPT eq "99") {
-	   		$CHOOSEDPUBLISH{"SF"}=1;
-	    }
-	    else {
-		    if ($NUM_SCRIPT eq "0") {
-		    	foreach my $key (@LISTETARGET) {
-		    		if ($key ne 'SNAPSHOT' && $key ne 'ASSO' && $key ne 'SF') { $CHOOSEDTARGET{$key}=1; }
-		        }
-		    }
-		    else {
-		   		foreach my $num (split(/\s+/,$NUM_SCRIPT)) {
-		   			$CHOOSEDTARGET{$LISTETARGET[$num-1]}=1;
-		   		}
-		    }
-	    }
-    }
+	my $found=0;
+	my $NUM_SCRIPT;
+	my $cpt=0;
+	while (! $found) {
+		printf(" %2d - %-14s  (%s)\n",$cpt,"ALL (1..9)","Need ".join(",",values %REQUIREMENTTARGET));
+		foreach my $target (@LISTETARGET) {
+			$cpt++;
+			printf(" %2d - %-14s  (%s)\n",$cpt,$target,"Need ".$REQUIREMENTTARGET{$target});
+		}
+		$cpt=98;
+		printf(" %2d - %-14s  (%s)\n",$cpt,"ASSO (publish)","Need ".join(",",values %REQUIREMENTPUBLISH));
+		$cpt=99;
+		printf(" %2d - %-14s  (%s)\n",$cpt,"SF (publish)","Need ".join(",",values %REQUIREMENTPUBLISH));
+	
+		# Ask which target to build
+		print "Choose one package number or several separated with space (0 - ".$cpt."): ";
+		$NUM_SCRIPT=<STDIN>; 
+		chomp($NUM_SCRIPT);
+		if ($NUM_SCRIPT !~ /^[0-9\s]+$/)
+		{
+			print "This is not a valid package number list.\n";
+			$found = 0;
+		}
+		else
+		{
+			$found = 1;
+		}
+	}
+	print "\n";
+	if ($NUM_SCRIPT eq "98") {
+		$CHOOSEDPUBLISH{"ASSO"}=1;
+	}
+	else 
+	{
+		if ($NUM_SCRIPT eq "99") {
+			$CHOOSEDPUBLISH{"SF"}=1;
+		}
+		else {
+			if ($NUM_SCRIPT eq "0") {
+				foreach my $key (@LISTETARGET) {
+					if ($key ne 'SNAPSHOT' && $key ne 'ASSO' && $key ne 'SF') { $CHOOSEDTARGET{$key}=1; }
+				}
+			}
+			else {
+				foreach my $num (split(/\s+/,$NUM_SCRIPT)) {
+					$CHOOSEDTARGET{$LISTETARGET[$num-1]}=1;
+				}
+			}
+		}
+	}
 }
 
 # Test if requirement is ok
@@ -265,34 +265,34 @@ foreach my $target (keys %CHOOSEDTARGET) {
 		}
 		$atleastonerpm=1;			
 	} 
-    foreach my $req (split(/[,\s]/,$REQUIREMENTTARGET{$target})) 
-    {
-        # Test    
-        print "Test requirement for target $target: Search '$req'... ";
-        $newreq=$req; $newparam='';
-        if ($newreq eq 'zip') { $newparam.='-h'; }
-        if ($newreq eq 'xz') { $newparam.='-h'; }
-        $cmd="\"$newreq\" $newparam 2>&1";
-        print "Test command ".$cmd."... ";
-        $ret=`$cmd`;
-        $coderetour=$?; $coderetour2=$coderetour>>8;
-        if ($coderetour != 0 && (($coderetour2 == 1 && $OS =~ /windows/ && $ret !~ /Usage/i) || ($coderetour2 == 127 && $OS !~ /windows/)) && $PROGPATH) { 
-            # Not found error, we try in PROGPATH
-            $ret=`"$PROGPATH/$ALTERNATEPATH{$req}/$req\" 2>&1`;
-            $coderetour=$?; $coderetour2=$coderetour>>8;
-            $REQUIREMENTTARGET{$target}="$PROGPATH/$ALTERNATEPATH{$req}/$req";
-        } 
-
-        if ($coderetour != 0 && (($coderetour2 == 1 && $OS =~ /windows/ && $ret !~ /Usage/i) || ($coderetour2 == 127 && $OS !~ /windows/))) {
-            # Not found error
-            print "Not found\nCan't build target $target. Requirement '$req' not found in PATH\n";
-            $CHOOSEDTARGET{$target}=-1;
-            last;
-        } else {
-            # Pas erreur ou erreur autre que programme absent
-            print " Found ".$req."\n";
-        }
-    }
+	foreach my $req (split(/[,\s]/,$REQUIREMENTTARGET{$target})) 
+	{
+		# Test    
+		print "Test requirement for target $target: Search '$req'... ";
+		$newreq=$req; $newparam='';
+		if ($newreq eq 'zip') { $newparam.='-h'; }
+		if ($newreq eq 'xz') { $newparam.='-h'; }
+		$cmd="\"$newreq\" $newparam 2>&1";
+		print "Test command ".$cmd."... ";
+		$ret=`$cmd`;
+		$coderetour=$?; $coderetour2=$coderetour>>8;
+		if ($coderetour != 0 && (($coderetour2 == 1 && $OS =~ /windows/ && $ret !~ /Usage/i) || ($coderetour2 == 127 && $OS !~ /windows/)) && $PROGPATH) { 
+			# Not found error, we try in PROGPATH
+			$ret=`"$PROGPATH/$ALTERNATEPATH{$req}/$req\" 2>&1`;
+			$coderetour=$?; $coderetour2=$coderetour>>8;
+			$REQUIREMENTTARGET{$target}="$PROGPATH/$ALTERNATEPATH{$req}/$req";
+		} 
+
+		if ($coderetour != 0 && (($coderetour2 == 1 && $OS =~ /windows/ && $ret !~ /Usage/i) || ($coderetour2 == 127 && $OS !~ /windows/))) {
+			# Not found error
+			print "Not found\nCan't build target $target. Requirement '$req' not found in PATH\n";
+			$CHOOSEDTARGET{$target}=-1;
+			last;
+		} else {
+			# Pas erreur ou erreur autre que programme absent
+			print " Found ".$req."\n";
+		}
+	}
 }
 
 print "\n";
@@ -303,7 +303,7 @@ $nboftargetok=0;
 $nboftargetneedbuildroot=0;
 $nbofpublishneedtag=0;
 foreach my $target (keys %CHOOSEDTARGET) {
-    if ($CHOOSEDTARGET{$target} < 0) { next; }
+	if ($CHOOSEDTARGET{$target} < 0) { next; }
 	if ($target ne 'EXE' && $target ne 'EXEDOLIWAMP') 
 	{
 		$nboftargetneedbuildroot++;
@@ -311,7 +311,7 @@ foreach my $target (keys %CHOOSEDTARGET) {
 	$nboftargetok++;
 }
 foreach my $target (keys %CHOOSEDPUBLISH) {
-    if ($CHOOSEDPUBLISH{$target} < 0) { next; }
+	if ($CHOOSEDPUBLISH{$target} < 0) { next; }
 	if ($target eq 'ASSO') { $nbofpublishneedtag++; }
 	if ($target eq 'SF') { $nbofpublishneedtag++; }
 	$nboftargetok++;
@@ -319,714 +319,714 @@ foreach my $target (keys %CHOOSEDPUBLISH) {
 
 if ($nboftargetok) {
 
-    # Update CVS if required
-    #-----------------------
-    if ($nbofpublishneedtag)
+	# Update CVS if required
+	#-----------------------
+	if ($nbofpublishneedtag)
 	{
-    	print "Go to directory $SOURCE\n";
-   		$olddir=getcwd();
-   		chdir("$SOURCE");
-    	print 'Run git tag -a -m "'.$MAJOR.'.'.$MINOR.'.'.$BUILD.'" "'.$MAJOR.'.'.$MINOR.'.'.$BUILD.'"'."\n";
-    	$ret=`git tag -a -m "$MAJOR.$MINOR.$BUILD" "$MAJOR.$MINOR.$BUILD" 2>&1`;
-    	if ($ret =~ /already exists/)
-    	{
-    		print "WARNING: Tag ".$MAJOR.'.'.$MINOR.'.'.$BUILD." already exists. Overwrite (y/N) ? ";
-	    	$QUESTIONOVERWRITETAG=<STDIN>; 
-	    	chomp($QUESTIONOVERWRITETAG);
-	    	if ($QUESTIONOVERWRITETAG =~ /(o|y)/)
-	    	{
-		    	print 'Run git tag -a -f -m "'.$MAJOR.'.'.$MINOR.'.'.$BUILD.'" "'.$MAJOR.'.'.$MINOR.'.'.$BUILD.'"'."\n";
-		    	$ret=`git tag -a -f -m "$MAJOR.$MINOR.$BUILD" "$MAJOR.$MINOR.$BUILD"`;
-	    	}
-    	}
-    	print 'Run git push --tags'."\n";
-    	$ret=`git push --tags`;
-    	chdir("$olddir");
+		print "Go to directory $SOURCE\n";
+		$olddir=getcwd();
+		chdir("$SOURCE");
+		print 'Run git tag -a -m "'.$MAJOR.'.'.$MINOR.'.'.$BUILD.'" "'.$MAJOR.'.'.$MINOR.'.'.$BUILD.'"'."\n";
+		$ret=`git tag -a -m "$MAJOR.$MINOR.$BUILD" "$MAJOR.$MINOR.$BUILD" 2>&1`;
+		if ($ret =~ /already exists/)
+		{
+			print "WARNING: Tag ".$MAJOR.'.'.$MINOR.'.'.$BUILD." already exists. Overwrite (y/N) ? ";
+			$QUESTIONOVERWRITETAG=<STDIN>; 
+			chomp($QUESTIONOVERWRITETAG);
+			if ($QUESTIONOVERWRITETAG =~ /(o|y)/)
+			{
+				print 'Run git tag -a -f -m "'.$MAJOR.'.'.$MINOR.'.'.$BUILD.'" "'.$MAJOR.'.'.$MINOR.'.'.$BUILD.'"'."\n";
+				$ret=`git tag -a -f -m "$MAJOR.$MINOR.$BUILD" "$MAJOR.$MINOR.$BUILD"`;
+			}
+		}
+		print 'Run git push --tags'."\n";
+		$ret=`git push --tags`;
+		chdir("$olddir");
 	}
 	
-    # Update buildroot if required
-    #-----------------------------
-    if ($nboftargetneedbuildroot)
+	# Update buildroot if required
+	#-----------------------------
+	if ($nboftargetneedbuildroot)
 	{
-	    if (! $copyalreadydone) {
-	    	print "Creation of a buildroot used for all packages\n";
-
-	    	print "Delete directory $BUILDROOT\n";
-	    	$ret=`rm -fr "$BUILDROOT"`;
-	    
-	    	mkdir "$BUILDROOT";
-	    	mkdir "$BUILDROOT/$PROJECT";
-	    	print "Copy $SOURCE into $BUILDROOT/$PROJECT\n";
-	    	$ret=`cp -pr "$SOURCE" "$BUILDROOT/$PROJECT"`;
-
-	    	#print "Copy $SOURCE/build/debian/apache/.htaccess into $BUILDROOT/$PROJECT/build/debian/apache/.htaccess\n";
-	    	#$ret=`cp -pr "$SOURCE/build/debian/apache/.htaccess" "$BUILDROOT/$PROJECT/build/debian/apache/.htaccess"`;
-	    }
-	    print "Clean $BUILDROOT\n";
-	    $ret=`rm -f  $BUILDROOT/$PROJECT/.buildpath`;
-	    $ret=`rm -fr $BUILDROOT/$PROJECT/.cache`;
-	    $ret=`rm -fr $BUILDROOT/$PROJECT/.externalToolBuilders`;
-	    $ret=`rm -fr $BUILDROOT/$PROJECT/.git*`;
-	    $ret=`rm -fr $BUILDROOT/$PROJECT/.project`;
-	    $ret=`rm -fr $BUILDROOT/$PROJECT/.settings`;
-	    $ret=`rm -fr $BUILDROOT/$PROJECT/.scrutinizer.yml`;
-	    $ret=`rm -fr $BUILDROOT/$PROJECT/.travis.yml`;
-	    $ret=`rm -fr $BUILDROOT/$PROJECT/.tx`;
-	    $ret=`rm -f  $BUILDROOT/$PROJECT/build.xml`;
-	    $ret=`rm -f  $BUILDROOT/$PROJECT/quickbuild.xml`;
-        $ret=`rm -f  $BUILDROOT/$PROJECT/pom.xml`;
-        
-	    $ret=`rm -fr $BUILDROOT/$PROJECT/build/html`;
-        $ret=`rm -f  $BUILDROOT/$PROJECT/build/Doli*-*`;
-        $ret=`rm -f  $BUILDROOT/$PROJECT/build/dolibarr_*.deb`;
-        $ret=`rm -f  $BUILDROOT/$PROJECT/build/dolibarr_*.dsc`;
-        $ret=`rm -f  $BUILDROOT/$PROJECT/build/dolibarr_*.tar.gz`;
-        $ret=`rm -f  $BUILDROOT/$PROJECT/build/dolibarr-*.deb`;
-        $ret=`rm -f  $BUILDROOT/$PROJECT/build/dolibarr-*.rpm`;
-        $ret=`rm -f  $BUILDROOT/$PROJECT/build/dolibarr-*.tar`;
-        $ret=`rm -f  $BUILDROOT/$PROJECT/build/dolibarr-*.tar.gz`;
-        $ret=`rm -f  $BUILDROOT/$PROJECT/build/dolibarr-*.tgz`;
-        $ret=`rm -f  $BUILDROOT/$PROJECT/build/dolibarr-*.xz`;
-        $ret=`rm -f  $BUILDROOT/$PROJECT/build/dolibarr-*.zip`;
-        $ret=`rm -f  $BUILDROOT/$PROJECT/build/doxygen/doxygen_warnings.log`;
-        $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/cache.manifest`;
-	    $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/conf/conf.php`;
-        $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/conf/conf.php.mysql`;
-        $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/conf/conf.php.old`;
-        $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/conf/conf.php.postgres`;
-        $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/conf/conf*sav*`;
-
-        $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/install/mssql/README`;
-        $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/install/mysql/README`;
-        $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/install/pgsql/README`;
-
-        $ret=`rm -fr  $BUILDROOT/$PROJECT/htdocs/install/mssql`;
-
-        $ret=`rm -fr $BUILDROOT/$PROJECT/dev/codesniffer`;
-        $ret=`rm -fr $BUILDROOT/$PROJECT/dev/codetemplates`;
-        $ret=`rm -fr $BUILDROOT/$PROJECT/dev/dbmodel`;
-        $ret=`rm -fr $BUILDROOT/$PROJECT/dev/initdata`;
-        $ret=`rm -fr $BUILDROOT/$PROJECT/dev/iso-normes`;
-        $ret=`rm -fr $BUILDROOT/$PROJECT/dev/ldap`;
-        $ret=`rm -fr $BUILDROOT/$PROJECT/dev/licence`;
-        $ret=`rm -fr $BUILDROOT/$PROJECT/dev/mail`;
-        $ret=`rm -fr $BUILDROOT/$PROJECT/dev/phpcheckstyle`;
-        $ret=`rm -fr $BUILDROOT/$PROJECT/dev/phpunit`;
-        $ret=`rm -fr $BUILDROOT/$PROJECT/dev/security`;
-        $ret=`rm -fr $BUILDROOT/$PROJECT/dev/spec`;
-        $ret=`rm -fr $BUILDROOT/$PROJECT/dev/test`;
-        $ret=`rm -fr $BUILDROOT/$PROJECT/dev/uml`;
-        $ret=`rm -fr $BUILDROOT/$PROJECT/dev/vagrant`;
-        $ret=`rm -fr $BUILDROOT/$PROJECT/dev/xdebug`;
-        $ret=`rm -f  $BUILDROOT/$PROJECT/dev/dolibarr_changes.txt`;
-        $ret=`rm -f  $BUILDROOT/$PROJECT/dev/README`;
-        $ret=`rm -f  $BUILDROOT/$PROJECT/doc/images/dolibarr_screenshot2.png`;
-        $ret=`rm -f  $BUILDROOT/$PROJECT/doc/images/dolibarr_screenshot3.png`;
-        $ret=`rm -f  $BUILDROOT/$PROJECT/doc/images/dolibarr_screenshot4.png`;
-        $ret=`rm -f  $BUILDROOT/$PROJECT/doc/images/dolibarr_screenshot5.png`;
-        $ret=`rm -f  $BUILDROOT/$PROJECT/doc/images/dolibarr_screenshot6.png`;
-        $ret=`rm -f  $BUILDROOT/$PROJECT/doc/images/dolibarr_screenshot7.png`;
-        $ret=`rm -f  $BUILDROOT/$PROJECT/doc/images/dolibarr_screenshot8.png`;
-        $ret=`rm -f  $BUILDROOT/$PROJECT/doc/images/dolibarr_screenshot9.png`;
-        $ret=`rm -f  $BUILDROOT/$PROJECT/doc/images/dolibarr_screenshot10.png`;
-        $ret=`rm -f  $BUILDROOT/$PROJECT/doc/images/dolibarr_screenshot11.png`;
-        $ret=`rm -f  $BUILDROOT/$PROJECT/doc/images/dolibarr_screenshot12.png`;
-
-	    $ret=`rm -fr $BUILDROOT/$PROJECT/document`;
-	    $ret=`rm -fr $BUILDROOT/$PROJECT/documents`;
-	    $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/document`;
-	    $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/documents`;
-	    $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/bootstrap*`;
-	    $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/custom*`;
-	    $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/multicompany*`;
-	    $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/nltechno*`;
-	    $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/pos*`;
-	    $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/public/test`;
-	    $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/teclib*`;
-	    $ret=`rm -fr $BUILDROOT/$PROJECT/test`;
-	    $ret=`rm -fr $BUILDROOT/$PROJECT/Thumbs.db $BUILDROOT/$PROJECT/*/Thumbs.db $BUILDROOT/$PROJECT/*/*/Thumbs.db $BUILDROOT/$PROJECT/*/*/*/Thumbs.db $BUILDROOT/$PROJECT/*/*/*/*/Thumbs.db`;
-	    $ret=`rm -f  $BUILDROOT/$PROJECT/.cvsignore $BUILDROOT/$PROJECT/*/.cvsignore $BUILDROOT/$PROJECT/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/*/*/*/.cvsignore`;
-	    $ret=`rm -f  $BUILDROOT/$PROJECT/.gitignore $BUILDROOT/$PROJECT/*/.gitignore $BUILDROOT/$PROJECT/*/*/.gitignore $BUILDROOT/$PROJECT/*/*/*/.gitignore $BUILDROOT/$PROJECT/*/*/*/*/.gitignore $BUILDROOT/$PROJECT/*/*/*/*/*/.gitignore $BUILDROOT/$PROJECT/*/*/*/*/*/*/.gitignore`;
-   	    $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/includes/geoip/sample*.*`;
-        $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/jqueryFileTree/connectors/jqueryFileTree.pl`;    # Avoid errors into rpmlint
-        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/template`;  # Package not valid for most linux distributions (errors reported into compile.js). Package should be embed by modules to avoid problems.
-        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/phpmailer`;                # Package not valid for most linux distributions (errors reported into file LICENSE). Package should be embed by modules to avoid problems.
-        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/ckeditor/adapters`;		# Keep this removal in case we embed libraries
-        #$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/ckeditor/_source`;		# _source must be kept into tarball
-   	    
-        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/datatables/extras/TableTools/swf`;	# Source of this flash is not available
-	    $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/multiselect/MIT-LICENSE.txt`;
-        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/nusoap/lib/Mail`;
-        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/nusoap/samples`;
-        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/phpexcel/license.txt`;
-        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/phpexcel/PHPExcel/Shared/PDF`;
-        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/phpexcel/PHPExcel/Shared/PCLZip`;
-        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/dejavu-fonts-ttf-*`;
-        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/freefont-*`;
-        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/utils`;
-	    $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/LICENSE.TXT`;
-        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/savant`;
+		if (! $copyalreadydone) {
+			print "Creation of a buildroot used for all packages\n";
+
+			print "Delete directory $BUILDROOT\n";
+			$ret=`rm -fr "$BUILDROOT"`;
+		
+			mkdir "$BUILDROOT";
+			mkdir "$BUILDROOT/$PROJECT";
+			print "Copy $SOURCE into $BUILDROOT/$PROJECT\n";
+			$ret=`cp -pr "$SOURCE" "$BUILDROOT/$PROJECT"`;
+
+			#print "Copy $SOURCE/build/debian/apache/.htaccess into $BUILDROOT/$PROJECT/build/debian/apache/.htaccess\n";
+			#$ret=`cp -pr "$SOURCE/build/debian/apache/.htaccess" "$BUILDROOT/$PROJECT/build/debian/apache/.htaccess"`;
+		}
+		print "Clean $BUILDROOT\n";
+		$ret=`rm -f  $BUILDROOT/$PROJECT/.buildpath`;
+		$ret=`rm -fr $BUILDROOT/$PROJECT/.cache`;
+		$ret=`rm -fr $BUILDROOT/$PROJECT/.externalToolBuilders`;
+		$ret=`rm -fr $BUILDROOT/$PROJECT/.git*`;
+		$ret=`rm -fr $BUILDROOT/$PROJECT/.project`;
+		$ret=`rm -fr $BUILDROOT/$PROJECT/.settings`;
+		$ret=`rm -fr $BUILDROOT/$PROJECT/.scrutinizer.yml`;
+		$ret=`rm -fr $BUILDROOT/$PROJECT/.travis.yml`;
+		$ret=`rm -fr $BUILDROOT/$PROJECT/.tx`;
+		$ret=`rm -f  $BUILDROOT/$PROJECT/build.xml`;
+		$ret=`rm -f  $BUILDROOT/$PROJECT/quickbuild.xml`;
+		$ret=`rm -f  $BUILDROOT/$PROJECT/pom.xml`;
+		
+		$ret=`rm -fr $BUILDROOT/$PROJECT/build/html`;
+		$ret=`rm -f  $BUILDROOT/$PROJECT/build/Doli*-*`;
+		$ret=`rm -f  $BUILDROOT/$PROJECT/build/dolibarr_*.deb`;
+		$ret=`rm -f  $BUILDROOT/$PROJECT/build/dolibarr_*.dsc`;
+		$ret=`rm -f  $BUILDROOT/$PROJECT/build/dolibarr_*.tar.gz`;
+		$ret=`rm -f  $BUILDROOT/$PROJECT/build/dolibarr-*.deb`;
+		$ret=`rm -f  $BUILDROOT/$PROJECT/build/dolibarr-*.rpm`;
+		$ret=`rm -f  $BUILDROOT/$PROJECT/build/dolibarr-*.tar`;
+		$ret=`rm -f  $BUILDROOT/$PROJECT/build/dolibarr-*.tar.gz`;
+		$ret=`rm -f  $BUILDROOT/$PROJECT/build/dolibarr-*.tgz`;
+		$ret=`rm -f  $BUILDROOT/$PROJECT/build/dolibarr-*.xz`;
+		$ret=`rm -f  $BUILDROOT/$PROJECT/build/dolibarr-*.zip`;
+		$ret=`rm -f  $BUILDROOT/$PROJECT/build/doxygen/doxygen_warnings.log`;
+		$ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/cache.manifest`;
+		$ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/conf/conf.php`;
+		$ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/conf/conf.php.mysql`;
+		$ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/conf/conf.php.old`;
+		$ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/conf/conf.php.postgres`;
+		$ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/conf/conf*sav*`;
+
+		$ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/install/mssql/README`;
+		$ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/install/mysql/README`;
+		$ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/install/pgsql/README`;
+
+		$ret=`rm -fr  $BUILDROOT/$PROJECT/htdocs/install/mssql`;
+
+		$ret=`rm -fr $BUILDROOT/$PROJECT/dev/codesniffer`;
+		$ret=`rm -fr $BUILDROOT/$PROJECT/dev/codetemplates`;
+		$ret=`rm -fr $BUILDROOT/$PROJECT/dev/dbmodel`;
+		$ret=`rm -fr $BUILDROOT/$PROJECT/dev/initdata`;
+		$ret=`rm -fr $BUILDROOT/$PROJECT/dev/iso-normes`;
+		$ret=`rm -fr $BUILDROOT/$PROJECT/dev/ldap`;
+		$ret=`rm -fr $BUILDROOT/$PROJECT/dev/licence`;
+		$ret=`rm -fr $BUILDROOT/$PROJECT/dev/mail`;
+		$ret=`rm -fr $BUILDROOT/$PROJECT/dev/phpcheckstyle`;
+		$ret=`rm -fr $BUILDROOT/$PROJECT/dev/phpunit`;
+		$ret=`rm -fr $BUILDROOT/$PROJECT/dev/security`;
+		$ret=`rm -fr $BUILDROOT/$PROJECT/dev/spec`;
+		$ret=`rm -fr $BUILDROOT/$PROJECT/dev/test`;
+		$ret=`rm -fr $BUILDROOT/$PROJECT/dev/uml`;
+		$ret=`rm -fr $BUILDROOT/$PROJECT/dev/vagrant`;
+		$ret=`rm -fr $BUILDROOT/$PROJECT/dev/xdebug`;
+		$ret=`rm -f  $BUILDROOT/$PROJECT/dev/dolibarr_changes.txt`;
+		$ret=`rm -f  $BUILDROOT/$PROJECT/dev/README`;
+		$ret=`rm -f  $BUILDROOT/$PROJECT/doc/images/dolibarr_screenshot2.png`;
+		$ret=`rm -f  $BUILDROOT/$PROJECT/doc/images/dolibarr_screenshot3.png`;
+		$ret=`rm -f  $BUILDROOT/$PROJECT/doc/images/dolibarr_screenshot4.png`;
+		$ret=`rm -f  $BUILDROOT/$PROJECT/doc/images/dolibarr_screenshot5.png`;
+		$ret=`rm -f  $BUILDROOT/$PROJECT/doc/images/dolibarr_screenshot6.png`;
+		$ret=`rm -f  $BUILDROOT/$PROJECT/doc/images/dolibarr_screenshot7.png`;
+		$ret=`rm -f  $BUILDROOT/$PROJECT/doc/images/dolibarr_screenshot8.png`;
+		$ret=`rm -f  $BUILDROOT/$PROJECT/doc/images/dolibarr_screenshot9.png`;
+		$ret=`rm -f  $BUILDROOT/$PROJECT/doc/images/dolibarr_screenshot10.png`;
+		$ret=`rm -f  $BUILDROOT/$PROJECT/doc/images/dolibarr_screenshot11.png`;
+		$ret=`rm -f  $BUILDROOT/$PROJECT/doc/images/dolibarr_screenshot12.png`;
+
+		$ret=`rm -fr $BUILDROOT/$PROJECT/document`;
+		$ret=`rm -fr $BUILDROOT/$PROJECT/documents`;
+		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/document`;
+		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/documents`;
+		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/bootstrap*`;
+		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/custom*`;
+		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/multicompany*`;
+		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/nltechno*`;
+		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/pos*`;
+		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/public/test`;
+		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/teclib*`;
+		$ret=`rm -fr $BUILDROOT/$PROJECT/test`;
+		$ret=`rm -fr $BUILDROOT/$PROJECT/Thumbs.db $BUILDROOT/$PROJECT/*/Thumbs.db $BUILDROOT/$PROJECT/*/*/Thumbs.db $BUILDROOT/$PROJECT/*/*/*/Thumbs.db $BUILDROOT/$PROJECT/*/*/*/*/Thumbs.db`;
+		$ret=`rm -f  $BUILDROOT/$PROJECT/.cvsignore $BUILDROOT/$PROJECT/*/.cvsignore $BUILDROOT/$PROJECT/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/*/*/*/.cvsignore`;
+		$ret=`rm -f  $BUILDROOT/$PROJECT/.gitignore $BUILDROOT/$PROJECT/*/.gitignore $BUILDROOT/$PROJECT/*/*/.gitignore $BUILDROOT/$PROJECT/*/*/*/.gitignore $BUILDROOT/$PROJECT/*/*/*/*/.gitignore $BUILDROOT/$PROJECT/*/*/*/*/*/.gitignore $BUILDROOT/$PROJECT/*/*/*/*/*/*/.gitignore`;
+		$ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/includes/geoip/sample*.*`;
+		$ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/jqueryFileTree/connectors/jqueryFileTree.pl`;    # Avoid errors into rpmlint
+		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/template`;  # Package not valid for most linux distributions (errors reported into compile.js). Package should be embed by modules to avoid problems.
+		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/phpmailer`;                # Package not valid for most linux distributions (errors reported into file LICENSE). Package should be embed by modules to avoid problems.
+		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/ckeditor/adapters`;		# Keep this removal in case we embed libraries
+		#$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/ckeditor/_source`;		# _source must be kept into tarball
+		
+		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/datatables/extras/TableTools/swf`;	# Source of this flash is not available
+		$ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/multiselect/MIT-LICENSE.txt`;
+		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/nusoap/lib/Mail`;
+		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/nusoap/samples`;
+		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/phpexcel/license.txt`;
+		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/phpexcel/PHPExcel/Shared/PDF`;
+		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/phpexcel/PHPExcel/Shared/PCLZip`;
+		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/dejavu-fonts-ttf-*`;
+		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/freefont-*`;
+		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/utils`;
+		$ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/LICENSE.TXT`;
+		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/savant`;
 	}
 
-    # Build package for each target
-    #------------------------------
-    foreach my $target (keys %CHOOSEDTARGET) 
-    {
-        if ($CHOOSEDTARGET{$target} < 0) { next; }
-    
-        print "\nBuild package for target $target\n";
-
-    	if ($target eq 'SNAPSHOT') 
-    	{
-    		$NEWDESTI=$DESTI;
-
-    		print "Remove target $FILENAMESNAPSHOT.tgz...\n";
-    		unlink("$NEWDESTI/$FILENAMESNAPSHOT.tgz");
-
-            #rmdir "$BUILDROOT/$FILENAMESNAPSHOT";
-    		$ret=`rm -fr $BUILDROOT/$FILENAMESNAPSHOT`;
-            print "Copy $BUILDROOT/$PROJECT to $BUILDROOT/$FILENAMESNAPSHOT\n";
-    		$cmd="cp -pr \"$BUILDROOT/$PROJECT\" \"$BUILDROOT/$FILENAMESNAPSHOT\"";
-            $ret=`$cmd`;
-
-    		print "Compress $BUILDROOT into $FILENAMESNAPSHOT.tgz...\n";
-   		    $cmd="tar --exclude doli*.tgz --exclude doli*.deb --exclude doli*.exe --exclude doli*.xz --exclude doli*.zip --exclude doli*.rpm --exclude .cache --exclude .settings --exclude conf.php --exclude conf.php.mysql --exclude conf.php.old --exclude conf.php.postgres --directory \"$BUILDROOT\" --mode=go-w --group=500 --owner=500 -czvf \"$FILENAMESNAPSHOT.tgz\" $FILENAMESNAPSHOT";
+	# Build package for each target
+	#------------------------------
+	foreach my $target (keys %CHOOSEDTARGET) 
+	{
+		if ($CHOOSEDTARGET{$target} < 0) { next; }
+	
+		print "\nBuild package for target $target\n";
+
+		if ($target eq 'SNAPSHOT') 
+		{
+			$NEWDESTI=$DESTI;
+
+			print "Remove target $FILENAMESNAPSHOT.tgz...\n";
+			unlink("$NEWDESTI/$FILENAMESNAPSHOT.tgz");
+
+			#rmdir "$BUILDROOT/$FILENAMESNAPSHOT";
+			$ret=`rm -fr $BUILDROOT/$FILENAMESNAPSHOT`;
+			print "Copy $BUILDROOT/$PROJECT to $BUILDROOT/$FILENAMESNAPSHOT\n";
+			$cmd="cp -pr \"$BUILDROOT/$PROJECT\" \"$BUILDROOT/$FILENAMESNAPSHOT\"";
+			$ret=`$cmd`;
+
+			print "Compress $BUILDROOT into $FILENAMESNAPSHOT.tgz...\n";
+			$cmd="tar --exclude doli*.tgz --exclude doli*.deb --exclude doli*.exe --exclude doli*.xz --exclude doli*.zip --exclude doli*.rpm --exclude .cache --exclude .settings --exclude conf.php --exclude conf.php.mysql --exclude conf.php.old --exclude conf.php.postgres --directory \"$BUILDROOT\" --mode=go-w --group=500 --owner=500 -czvf \"$FILENAMESNAPSHOT.tgz\" $FILENAMESNAPSHOT";
 			print $cmd."\n";
 			$ret=`$cmd`;
 
-    		# Move to final dir
-       		print "Move $FILENAMESNAPSHOT.tgz to $NEWDESTI/$FILENAMESNAPSHOT.tgz\n";
-       		$ret=`mv "$FILENAMESNAPSHOT.tgz" "$NEWDESTI/$FILENAMESNAPSHOT.tgz"`;
-    		next;
-    	}
+			# Move to final dir
+			print "Move $FILENAMESNAPSHOT.tgz to $NEWDESTI/$FILENAMESNAPSHOT.tgz\n";
+			$ret=`mv "$FILENAMESNAPSHOT.tgz" "$NEWDESTI/$FILENAMESNAPSHOT.tgz"`;
+			next;
+		}
 
-    	if ($target eq 'TGZ') 
-    	{
-    		$NEWDESTI=$DESTI;
-    		mkdir($DESTI.'/standard');
+		if ($target eq 'TGZ') 
+		{
+			$NEWDESTI=$DESTI;
+			mkdir($DESTI.'/standard');
 			if (-d $DESTI.'/standard') { $NEWDESTI=$DESTI.'/standard'; } 
 
-    		print "Remove target $FILENAMETGZ.tgz...\n";
-    		unlink("$NEWDESTI/$FILENAMETGZ.tgz");
+			print "Remove target $FILENAMETGZ.tgz...\n";
+			unlink("$NEWDESTI/$FILENAMETGZ.tgz");
 
-            #rmdir "$BUILDROOT/$FILENAMETGZ";
-    		$ret=`rm -fr $BUILDROOT/$FILENAMETGZ`;
-            print "Copy $BUILDROOT/$PROJECT/ to $BUILDROOT/$FILENAMETGZ\n";
-    		$cmd="cp -pr \"$BUILDROOT/$PROJECT/\" \"$BUILDROOT/$FILENAMETGZ\"";
-            $ret=`$cmd`;
+			#rmdir "$BUILDROOT/$FILENAMETGZ";
+			$ret=`rm -fr $BUILDROOT/$FILENAMETGZ`;
+			print "Copy $BUILDROOT/$PROJECT/ to $BUILDROOT/$FILENAMETGZ\n";
+			$cmd="cp -pr \"$BUILDROOT/$PROJECT/\" \"$BUILDROOT/$FILENAMETGZ\"";
+			$ret=`$cmd`;
 
-		    $ret=`rm -fr $BUILDROOT/$FILENAMETGZ/build/exe`;
+			$ret=`rm -fr $BUILDROOT/$FILENAMETGZ/build/exe`;
 			$ret=`rm -fr $BUILDROOT/$FILENAMETGZ/htdocs/includes/ckeditor/_source`;	# We can't remove it with exclude file, we need it for some tarball packages
 			
-    		print "Compress $FILENAMETGZ into $FILENAMETGZ.tgz...\n";
-   		    $cmd="tar --exclude-vcs --exclude-from \"$BUILDROOT/$PROJECT/build/tgz/tar_exclude.txt\" --directory \"$BUILDROOT\" --mode=go-w --group=500 --owner=500 -czvf \"$BUILDROOT/$FILENAMETGZ.tgz\" $FILENAMETGZ";
-   		    print "$cmd\n";
-   		    $ret=`$cmd`;
-
-    		# Move to final dir
-       		print "Move $BUILDROOT/$FILENAMETGZ.tgz to $NEWDESTI/$FILENAMETGZ.tgz\n";
-       		$ret=`mv "$BUILDROOT/$FILENAMETGZ.tgz" "$NEWDESTI/$FILENAMETGZ.tgz"`;
-    		next;
-    	}
-
-    	if ($target eq 'XZ') 
-    	{
-    		$NEWDESTI=$DESTI;
-    		mkdir($DESTI.'/standard');
+			print "Compress $FILENAMETGZ into $FILENAMETGZ.tgz...\n";
+			$cmd="tar --exclude-vcs --exclude-from \"$BUILDROOT/$PROJECT/build/tgz/tar_exclude.txt\" --directory \"$BUILDROOT\" --mode=go-w --group=500 --owner=500 -czvf \"$BUILDROOT/$FILENAMETGZ.tgz\" $FILENAMETGZ";
+			print "$cmd\n";
+			$ret=`$cmd`;
+
+			# Move to final dir
+			print "Move $BUILDROOT/$FILENAMETGZ.tgz to $NEWDESTI/$FILENAMETGZ.tgz\n";
+			$ret=`mv "$BUILDROOT/$FILENAMETGZ.tgz" "$NEWDESTI/$FILENAMETGZ.tgz"`;
+			next;
+		}
+
+		if ($target eq 'XZ') 
+		{
+			$NEWDESTI=$DESTI;
+			mkdir($DESTI.'/standard');
 			if (-d $DESTI.'/standard') { $NEWDESTI=$DESTI.'/standard'; } 
 
-    		print "Remove target $FILENAMEXZ.xz...\n";
-    		unlink("$NEWDESTI/$FILENAMEXZ.xz");
+			print "Remove target $FILENAMEXZ.xz...\n";
+			unlink("$NEWDESTI/$FILENAMEXZ.xz");
 
-            #rmdir "$BUILDROOT/$FILENAMEXZ";
-    		$ret=`rm -fr $BUILDROOT/$FILENAMEXZ`;
-            print "Copy $BUILDROOT/$PROJECT to $BUILDROOT/$FILENAMEXZ\n";
-    		$cmd="cp -pr \"$BUILDROOT/$PROJECT\" \"$BUILDROOT/$FILENAMEXZ\"";
-            $ret=`$cmd`;
+			#rmdir "$BUILDROOT/$FILENAMEXZ";
+			$ret=`rm -fr $BUILDROOT/$FILENAMEXZ`;
+			print "Copy $BUILDROOT/$PROJECT to $BUILDROOT/$FILENAMEXZ\n";
+			$cmd="cp -pr \"$BUILDROOT/$PROJECT\" \"$BUILDROOT/$FILENAMEXZ\"";
+			$ret=`$cmd`;
 
-		    $ret=`rm -fr $BUILDROOT/$FILENAMEXZ/build/exe`;
+			$ret=`rm -fr $BUILDROOT/$FILENAMEXZ/build/exe`;
 			$ret=`rm -fr $BUILDROOT/$FILENAMEXZ/htdocs/includes/ckeditor/_source`;	# We can't remove it with exclude file, we need it for some tarball packages
 			
-    		print "Compress $FILENAMEXZ into $FILENAMEXZ.xz...\n";
- 
-            print "Go to directory $BUILDROOT\n";
-     		$olddir=getcwd();
-     		chdir("$BUILDROOT");
-    		$cmd= "xz -9 -r $BUILDROOT/$FILENAMEAPS.xz \*";
+			print "Compress $FILENAMEXZ into $FILENAMEXZ.xz...\n";
+
+			print "Go to directory $BUILDROOT\n";
+			$olddir=getcwd();
+			chdir("$BUILDROOT");
+			$cmd= "xz -9 -r $BUILDROOT/$FILENAMEAPS.xz \*";
 			print $cmd."\n";
 			$ret= `$cmd`;
-            chdir("$olddir");
-
-    		# Move to final dir
-            print "Move $FILENAMEXZ.xz to $NEWDESTI/$FILENAMEXZ.xz\n";
-            $ret=`mv "$BUILDROOT/$FILENAMEXZ.xz" "$NEWDESTI/$FILENAMEXZ.xz"`;
-    		next;
-    	}
-    	
-    	if ($target eq 'ZIP') 
-    	{
-    		$NEWDESTI=$DESTI;
-    		mkdir($DESTI.'/standard');
+			chdir("$olddir");
+
+			# Move to final dir
+			print "Move $FILENAMEXZ.xz to $NEWDESTI/$FILENAMEXZ.xz\n";
+			$ret=`mv "$BUILDROOT/$FILENAMEXZ.xz" "$NEWDESTI/$FILENAMEXZ.xz"`;
+			next;
+		}
+		
+		if ($target eq 'ZIP') 
+		{
+			$NEWDESTI=$DESTI;
+			mkdir($DESTI.'/standard');
 			if (-d $DESTI.'/standard') { $NEWDESTI=$DESTI.'/standard'; } 
 
-    		print "Remove target $FILENAMEZIP.zip...\n";
-    		unlink("$NEWDESTI/$FILENAMEZIP.zip");
+			print "Remove target $FILENAMEZIP.zip...\n";
+			unlink("$NEWDESTI/$FILENAMEZIP.zip");
 
-            #rmdir "$BUILDROOT/$FILENAMEZIP";
-    		$ret=`rm -fr $BUILDROOT/$FILENAMEZIP`;
-            print "Copy $BUILDROOT/$PROJECT to $BUILDROOT/$FILENAMEZIP\n";
-    		$cmd="cp -pr \"$BUILDROOT/$PROJECT\" \"$BUILDROOT/$FILENAMEZIP\"";
-            $ret=`$cmd`;
+			#rmdir "$BUILDROOT/$FILENAMEZIP";
+			$ret=`rm -fr $BUILDROOT/$FILENAMEZIP`;
+			print "Copy $BUILDROOT/$PROJECT to $BUILDROOT/$FILENAMEZIP\n";
+			$cmd="cp -pr \"$BUILDROOT/$PROJECT\" \"$BUILDROOT/$FILENAMEZIP\"";
+			$ret=`$cmd`;
 
-		    $ret=`rm -fr $BUILDROOT/$FILENAMEZIP/build/exe`;
+			$ret=`rm -fr $BUILDROOT/$FILENAMEZIP/build/exe`;
 			$ret=`rm -fr $BUILDROOT/$FILENAMEZIP/htdocs/includes/ckeditor/_source`;	# We can't remove it with exclude file, we need it for some tarball packages
 
-    		print "Compress $FILENAMEZIP into $FILENAMEZIP.zip...\n";
- 
-            print "Go to directory $BUILDROOT\n";
-     		$olddir=getcwd();
-     		chdir("$BUILDROOT");
-    		$cmd= "7z a -r -tzip -xr\@\"$BUILDROOT\/$FILENAMEZIP\/build\/zip\/zip_exclude.txt\" -mx $BUILDROOT/$FILENAMEZIP.zip $FILENAMEZIP\/*";
+			print "Compress $FILENAMEZIP into $FILENAMEZIP.zip...\n";
+
+			print "Go to directory $BUILDROOT\n";
+			$olddir=getcwd();
+			chdir("$BUILDROOT");
+			$cmd= "7z a -r -tzip -xr\@\"$BUILDROOT\/$FILENAMEZIP\/build\/zip\/zip_exclude.txt\" -mx $BUILDROOT/$FILENAMEZIP.zip $FILENAMEZIP\/*";
 			print $cmd."\n";
 			$ret= `$cmd`;
-            chdir("$olddir");
-            			
-    		# Move to final dir
-            print "Move $FILENAMEZIP.zip to $NEWDESTI/$FILENAMEZIP.zip\n";
-            $ret=`mv "$BUILDROOT/$FILENAMEZIP.zip" "$NEWDESTI/$FILENAMEZIP.zip"`;
-    		next;
-    	}
-    
-    	if ($target =~ /RPM/)	                 # Linux only 
-    	{
-    		$NEWDESTI=$DESTI;
-    		$subdir="package_rpm_generic";
-    		if ($target =~ /FEDO/i) { $subdir="package_rpm_redhat-fedora"; }
-    		if ($target =~ /MAND/i) { $subdir="package_rpm_mandriva"; }
-    		if ($target =~ /OPEN/i) { $subdir="package_rpm_opensuse"; }
-    		mkdir($DESTI.'/'.$subdir);
+			chdir("$olddir");
+						
+			# Move to final dir
+			print "Move $FILENAMEZIP.zip to $NEWDESTI/$FILENAMEZIP.zip\n";
+			$ret=`mv "$BUILDROOT/$FILENAMEZIP.zip" "$NEWDESTI/$FILENAMEZIP.zip"`;
+			next;
+		}
+	
+		if ($target =~ /RPM/)	                 # Linux only 
+		{
+			$NEWDESTI=$DESTI;
+			$subdir="package_rpm_generic";
+			if ($target =~ /FEDO/i) { $subdir="package_rpm_redhat-fedora"; }
+			if ($target =~ /MAND/i) { $subdir="package_rpm_mandriva"; }
+			if ($target =~ /OPEN/i) { $subdir="package_rpm_opensuse"; }
+			mkdir($DESTI.'/'.$subdir);
 			if (-d $DESTI.'/'.$subdir) { $NEWDESTI=$DESTI.'/'.$subdir; } 
 
 			if ($RPMDIR eq "") { $RPMDIR=$ENV{'HOME'}."/rpmbuild"; }
 
-            print "Version is $MAJOR.$MINOR.$REL1-$RPMSUBVERSION\n";
+			print "Version is $MAJOR.$MINOR.$REL1-$RPMSUBVERSION\n";
 
-    		print "Remove target ".$FILENAMERPM."...\n";
-    		unlink("$NEWDESTI/".$FILENAMERPM);
-    		print "Remove target ".$FILENAMETGZ2."-".$RPMSUBVERSION.".src.rpm...\n";
-    		unlink("$NEWDESTI/".$FILENAMETGZ2."-".$RPMSUBVERSION.".src.rpm");
+			print "Remove target ".$FILENAMERPM."...\n";
+			unlink("$NEWDESTI/".$FILENAMERPM);
+			print "Remove target ".$FILENAMETGZ2."-".$RPMSUBVERSION.".src.rpm...\n";
+			unlink("$NEWDESTI/".$FILENAMETGZ2."-".$RPMSUBVERSION.".src.rpm");
 
-    		print "Create directory $BUILDROOT/$FILENAMETGZ2\n";
-    		$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2`;
-    		
-            print "Copy $BUILDROOT/$PROJECT to $BUILDROOT/$FILENAMETGZ2\n";
-    		$cmd="cp -pr '$BUILDROOT/$PROJECT' '$BUILDROOT/$FILENAMETGZ2'";
-            $ret=`$cmd`;
+			print "Create directory $BUILDROOT/$FILENAMETGZ2\n";
+			$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2`;
+			
+			print "Copy $BUILDROOT/$PROJECT to $BUILDROOT/$FILENAMETGZ2\n";
+			$cmd="cp -pr '$BUILDROOT/$PROJECT' '$BUILDROOT/$FILENAMETGZ2'";
+			$ret=`$cmd`;
 
-            # Removed files we don't need
-            $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/htdocs/includes/ckeditor/_source`;
+			# Removed files we don't need
+			$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/htdocs/includes/ckeditor/_source`;
 
-            print "Set permissions on files/dir\n";
-		    $ret=`chmod -R 755 $BUILDROOT/$FILENAMETGZ2`;
-		    $cmd="find $BUILDROOT/$FILENAMETGZ2 -type f -exec chmod 644 {} \\; ";
-            $ret=`$cmd`;
+			print "Set permissions on files/dir\n";
+			$ret=`chmod -R 755 $BUILDROOT/$FILENAMETGZ2`;
+			$cmd="find $BUILDROOT/$FILENAMETGZ2 -type f -exec chmod 644 {} \\; ";
+			$ret=`$cmd`;
 
 			# Build tgz
-    		print "Compress $FILENAMETGZ2 into $FILENAMETGZ2.tgz...\n";
-    		$ret=`tar --exclude-from "$SOURCE/build/tgz/tar_exclude.txt" --directory "$BUILDROOT" -czvf "$BUILDROOT/$FILENAMETGZ2.tgz" $FILENAMETGZ2`;
-
-    		print "Move $BUILDROOT/$FILENAMETGZ2.tgz to $RPMDIR/SOURCES/$FILENAMETGZ2.tgz\n";
-    		$cmd="mv $BUILDROOT/$FILENAMETGZ2.tgz $RPMDIR/SOURCES/$FILENAMETGZ2.tgz";
-            $ret=`$cmd`;
-
-    		$BUILDFIC="${FILENAME}.spec";
-    		$BUILDFICSRC="${FILENAME}_generic.spec";
-    		if ($target =~ /FEDO/i) { $BUILDFICSRC="${FILENAME}_fedora.spec"; }
-    		if ($target =~ /MAND/i) { $BUILDFICSRC="${FILENAME}_mandriva.spec"; }
-    		if ($target =~ /OPEN/i) { $BUILDFICSRC="${FILENAME}_opensuse.spec"; }
-    		
- 			print "Generate file $BUILDROOT/$BUILDFIC from $SOURCE/build/rpm/${BUILDFICSRC}\n";
-            open (SPECFROM,"<$SOURCE/build/rpm/${BUILDFICSRC}") || die "Error";
-            open (SPECTO,">$BUILDROOT/$BUILDFIC") || die "Error";
-            while (<SPECFROM>) {
-                $_ =~ s/__FILENAMETGZ__/$FILENAMETGZ/;
-                $_ =~ s/__VERSION__/$MAJOR.$MINOR.$REL1/;
-                $_ =~ s/__RELEASE__/$RPMSUBVERSION/;
-                print SPECTO $_;
-            }
-            close SPECFROM;
-            close SPECTO;
-    
-    		print "Copy patch file to $RPMDIR/SOURCES\n";
-    		$ret=`cp "$SOURCE/build/rpm/dolibarr-forrpm.patch" "$RPMDIR/SOURCES"`;
-		    $ret=`chmod 644 $RPMDIR/SOURCES/dolibarr-forrpm.patch`;
-
-    		print "Launch RPM build (rpmbuild --clean -ba $BUILDROOT/${BUILDFIC})\n";
-    		#$ret=`rpmbuild -vvvv --clean -ba $BUILDROOT/${BUILDFIC}`;
-    		$ret=`rpmbuild --clean -ba $BUILDROOT/${BUILDFIC}`;
-
-    		# Move to final dir
-   		    print "Move $RPMDIR/RPMS/".$ARCH."/".$FILENAMETGZ2."-".$RPMSUBVERSION."*.".$ARCH.".rpm into $NEWDESTI/".$FILENAMETGZ2."-".$RPMSUBVERSION."*.".$ARCH.".rpm\n";
-   		    $cmd="mv $RPMDIR/RPMS/".$ARCH."/".$FILENAMETGZ2."-".$RPMSUBVERSION."*.".$ARCH.".rpm \"$NEWDESTI/\"";
-    		$ret=`$cmd`;
-   		    print "Move $RPMDIR/SRPMS/".$FILENAMETGZ2."-".$RPMSUBVERSION."*.src.rpm into $NEWDESTI/".$FILENAMETGZ2."-".$RPMSUBVERSION."*.src.rpm\n";
-   		    $cmd="mv $RPMDIR/SRPMS/".$FILENAMETGZ2."-".$RPMSUBVERSION."*.src.rpm \"$NEWDESTI/\"";
-    		$ret=`$cmd`;
-   		    print "Move $RPMDIR/SOURCES/".$FILENAMETGZ2.".tgz into $NEWDESTI/".$FILENAMETGZ2.".tgz\n";
-   		    $cmd="mv \"$RPMDIR/SOURCES/".$FILENAMETGZ2.".tgz\" \"$NEWDESTI/".$FILENAMETGZ2.".tgz\"";
-    		$ret=`$cmd`;
-    		next;
-    	}
-
-    	if ($target eq 'DEB') 
-    	{
-    		$NEWDESTI=$DESTI;
-    		mkdir($DESTI.'/package_debian-ubuntu');
+			print "Compress $FILENAMETGZ2 into $FILENAMETGZ2.tgz...\n";
+			$ret=`tar --exclude-from "$SOURCE/build/tgz/tar_exclude.txt" --directory "$BUILDROOT" -czvf "$BUILDROOT/$FILENAMETGZ2.tgz" $FILENAMETGZ2`;
+
+			print "Move $BUILDROOT/$FILENAMETGZ2.tgz to $RPMDIR/SOURCES/$FILENAMETGZ2.tgz\n";
+			$cmd="mv $BUILDROOT/$FILENAMETGZ2.tgz $RPMDIR/SOURCES/$FILENAMETGZ2.tgz";
+			$ret=`$cmd`;
+
+			$BUILDFIC="${FILENAME}.spec";
+			$BUILDFICSRC="${FILENAME}_generic.spec";
+			if ($target =~ /FEDO/i) { $BUILDFICSRC="${FILENAME}_fedora.spec"; }
+			if ($target =~ /MAND/i) { $BUILDFICSRC="${FILENAME}_mandriva.spec"; }
+			if ($target =~ /OPEN/i) { $BUILDFICSRC="${FILENAME}_opensuse.spec"; }
+			
+			print "Generate file $BUILDROOT/$BUILDFIC from $SOURCE/build/rpm/${BUILDFICSRC}\n";
+			open (SPECFROM,"<$SOURCE/build/rpm/${BUILDFICSRC}") || die "Error";
+			open (SPECTO,">$BUILDROOT/$BUILDFIC") || die "Error";
+			while (<SPECFROM>) {
+				$_ =~ s/__FILENAMETGZ__/$FILENAMETGZ/;
+				$_ =~ s/__VERSION__/$MAJOR.$MINOR.$REL1/;
+				$_ =~ s/__RELEASE__/$RPMSUBVERSION/;
+				print SPECTO $_;
+			}
+			close SPECFROM;
+			close SPECTO;
+	
+			print "Copy patch file to $RPMDIR/SOURCES\n";
+			$ret=`cp "$SOURCE/build/rpm/dolibarr-forrpm.patch" "$RPMDIR/SOURCES"`;
+			$ret=`chmod 644 $RPMDIR/SOURCES/dolibarr-forrpm.patch`;
+
+			print "Launch RPM build (rpmbuild --clean -ba $BUILDROOT/${BUILDFIC})\n";
+			#$ret=`rpmbuild -vvvv --clean -ba $BUILDROOT/${BUILDFIC}`;
+			$ret=`rpmbuild --clean -ba $BUILDROOT/${BUILDFIC}`;
+
+			# Move to final dir
+			print "Move $RPMDIR/RPMS/".$ARCH."/".$FILENAMETGZ2."-".$RPMSUBVERSION."*.".$ARCH.".rpm into $NEWDESTI/".$FILENAMETGZ2."-".$RPMSUBVERSION."*.".$ARCH.".rpm\n";
+			$cmd="mv $RPMDIR/RPMS/".$ARCH."/".$FILENAMETGZ2."-".$RPMSUBVERSION."*.".$ARCH.".rpm \"$NEWDESTI/\"";
+			$ret=`$cmd`;
+			print "Move $RPMDIR/SRPMS/".$FILENAMETGZ2."-".$RPMSUBVERSION."*.src.rpm into $NEWDESTI/".$FILENAMETGZ2."-".$RPMSUBVERSION."*.src.rpm\n";
+			$cmd="mv $RPMDIR/SRPMS/".$FILENAMETGZ2."-".$RPMSUBVERSION."*.src.rpm \"$NEWDESTI/\"";
+			$ret=`$cmd`;
+			print "Move $RPMDIR/SOURCES/".$FILENAMETGZ2.".tgz into $NEWDESTI/".$FILENAMETGZ2.".tgz\n";
+			$cmd="mv \"$RPMDIR/SOURCES/".$FILENAMETGZ2.".tgz\" \"$NEWDESTI/".$FILENAMETGZ2.".tgz\"";
+			$ret=`$cmd`;
+			next;
+		}
+
+		if ($target eq 'DEB') 
+		{
+			$NEWDESTI=$DESTI;
+			mkdir($DESTI.'/package_debian-ubuntu');
 			if (-d $DESTI.'/package_debian-ubuntu') { $NEWDESTI=$DESTI.'/package_debian-ubuntu'; } 
 
-            $olddir=getcwd();
-
-    		print "Remove target ${FILENAMEDEB}_all.deb...\n";
-    		unlink("$NEWDESTI/${FILENAMEDEB}_all.deb");
-    		print "Remove target ${FILENAMEDEB}.dsc...\n";
-    		unlink("$NEWDESTI/${FILENAMEDEB}.dsc");
-    		print "Remove target ${FILENAMEDEB}.tar.gz...\n";
-    		unlink("$NEWDESTI/${FILENAMEDEB}.tar.gz");
-    		print "Remove target ${FILENAMEDEB}.changes...\n";
-    		unlink("$NEWDESTI/${FILENAMEDEB}.changes");
-    		print "Remove target ${FILENAMEDEB}.debian.tar.gz...\n";
-    		unlink("$NEWDESTI/${FILENAMEDEB}.debian.tar.gz");
-    		print "Remove target ${FILENAMEDEBNATIVE}.orig.tar.gz...\n";
-    		unlink("$NEWDESTI/${FILENAMEDEBNATIVE}.orig.tar.gz");
-
-    		$ret=`rm -fr $BUILDROOT/$PROJECT.tmp`;
-    		$ret=`rm -fr $BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build`;
-    		
+			$olddir=getcwd();
+
+			print "Remove target ${FILENAMEDEB}_all.deb...\n";
+			unlink("$NEWDESTI/${FILENAMEDEB}_all.deb");
+			print "Remove target ${FILENAMEDEB}.dsc...\n";
+			unlink("$NEWDESTI/${FILENAMEDEB}.dsc");
+			print "Remove target ${FILENAMEDEB}.tar.gz...\n";
+			unlink("$NEWDESTI/${FILENAMEDEB}.tar.gz");
+			print "Remove target ${FILENAMEDEB}.changes...\n";
+			unlink("$NEWDESTI/${FILENAMEDEB}.changes");
+			print "Remove target ${FILENAMEDEB}.debian.tar.gz...\n";
+			unlink("$NEWDESTI/${FILENAMEDEB}.debian.tar.gz");
+			print "Remove target ${FILENAMEDEBNATIVE}.orig.tar.gz...\n";
+			unlink("$NEWDESTI/${FILENAMEDEBNATIVE}.orig.tar.gz");
+
+			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp`;
+			$ret=`rm -fr $BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build`;
+			
 			print "Copy $BUILDROOT/$PROJECT to $BUILDROOT/$PROJECT.tmp\n";
 			$cmd="cp -pr \"$BUILDROOT/$PROJECT\" \"$BUILDROOT/$PROJECT.tmp\"";
 			$ret=`$cmd`;
 			$cmd="cp -pr \"$BUILDROOT/$PROJECT/build/debian/apache/.htaccess\" \"$BUILDROOT/$PROJECT.tmp/build/debian/apache/.htaccess\"";
 			$ret=`$cmd`;
 
- 			print "Remove other files\n";
-            $ret=`rm -f  $BUILDROOT/$PROJECT.tmp/README-FR`;
-            $ret=`rm -f  $BUILDROOT/$PROJECT.tmp/build/README`;
-            $ret=`rm -f  $BUILDROOT/$PROJECT.tmp/build/README-FR`;
-            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/build/aps`;
-            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/build/dmg`;
-            $ret=`rm -f  $BUILDROOT/$PROJECT.tmp/build/pad/README`;
-            $ret=`rm -f  $BUILDROOT/$PROJECT.tmp/build/tgz/README`;
-            #$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/build/debian`;
-            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/build/debian/po`;
-            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/build/debian/source`;
-            $ret=`rm -f  $BUILDROOT/$PROJECT.tmp/build/debian/changelog`;
-            $ret=`rm -f  $BUILDROOT/$PROJECT.tmp/build/debian/compat`;
-            $ret=`rm -f  $BUILDROOT/$PROJECT.tmp/build/debian/control*`;
-            $ret=`rm -f  $BUILDROOT/$PROJECT.tmp/build/debian/copyright`;
-            $ret=`rm -f  $BUILDROOT/$PROJECT.tmp/build/debian/dolibarr.config`;
-            $ret=`rm -f  $BUILDROOT/$PROJECT.tmp/build/debian/dolibarr.desktop`;
-            $ret=`rm -f  $BUILDROOT/$PROJECT.tmp/build/debian/dolibarr.docs`;
-            $ret=`rm -f  $BUILDROOT/$PROJECT.tmp/build/debian/dolibarr.install`;
-            $ret=`rm -f  $BUILDROOT/$PROJECT.tmp/build/debian/dolibarr.lintian-overrides`;
-            $ret=`rm -f  $BUILDROOT/$PROJECT.tmp/build/debian/dolibarr.postrm`;
-            $ret=`rm -f  $BUILDROOT/$PROJECT.tmp/build/debian/dolibarr.postinst`;
-            $ret=`rm -f  $BUILDROOT/$PROJECT.tmp/build/debian/dolibarr.templates`;
-            $ret=`rm -f  $BUILDROOT/$PROJECT.tmp/build/debian/dolibarr.templates.futur`;
-            $ret=`rm -f  $BUILDROOT/$PROJECT.tmp/build/debian/rules`;
-            $ret=`rm -f  $BUILDROOT/$PROJECT.tmp/build/debian/README.Debian`;
-            $ret=`rm -f  $BUILDROOT/$PROJECT.tmp/build/debian/README.howto`;
-            $ret=`rm -f  $BUILDROOT/$PROJECT.tmp/build/debian/watch`;
-            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/build/doap`;
-            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/build/exe`;
-            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/build/launchpad`;
-            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/build/live`;
-            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/build/patch`;
-            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/build/perl`;
-            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/build/rpm`;
-            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/build/zip`;
-            # Removed duplicate license files
-            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/ckeditor/_source/LICENSE.md`;
-            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/ckeditor/_source/plugins/scayt/LICENSE.md`;
-            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/ckeditor/_source/plugins/wsc/LICENSE.md`;
-            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/ckeditor/LICENSE.md`;
-            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/ckeditor/plugins/scayt/LICENSE.md`;
-            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/ckeditor/plugins/wsc/LICENSE.md`;
-            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/jquery/plugins/flot/LICENSE.txt`;
-            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/tcpdf/fonts/dejavu-fonts-ttf-2.34/LICENSE`;
-            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/tcpdf/fonts/freefont-20120503/COPYING`;
-            # Removed files we don't need
-            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/ckeditor/_source`;
-            
-            # Rename upstream changelog to match debian rules
+			print "Remove other files\n";
+			$ret=`rm -f  $BUILDROOT/$PROJECT.tmp/README-FR`;
+			$ret=`rm -f  $BUILDROOT/$PROJECT.tmp/build/README`;
+			$ret=`rm -f  $BUILDROOT/$PROJECT.tmp/build/README-FR`;
+			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/build/aps`;
+			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/build/dmg`;
+			$ret=`rm -f  $BUILDROOT/$PROJECT.tmp/build/pad/README`;
+			$ret=`rm -f  $BUILDROOT/$PROJECT.tmp/build/tgz/README`;
+			#$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/build/debian`;
+			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/build/debian/po`;
+			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/build/debian/source`;
+			$ret=`rm -f  $BUILDROOT/$PROJECT.tmp/build/debian/changelog`;
+			$ret=`rm -f  $BUILDROOT/$PROJECT.tmp/build/debian/compat`;
+			$ret=`rm -f  $BUILDROOT/$PROJECT.tmp/build/debian/control*`;
+			$ret=`rm -f  $BUILDROOT/$PROJECT.tmp/build/debian/copyright`;
+			$ret=`rm -f  $BUILDROOT/$PROJECT.tmp/build/debian/dolibarr.config`;
+			$ret=`rm -f  $BUILDROOT/$PROJECT.tmp/build/debian/dolibarr.desktop`;
+			$ret=`rm -f  $BUILDROOT/$PROJECT.tmp/build/debian/dolibarr.docs`;
+			$ret=`rm -f  $BUILDROOT/$PROJECT.tmp/build/debian/dolibarr.install`;
+			$ret=`rm -f  $BUILDROOT/$PROJECT.tmp/build/debian/dolibarr.lintian-overrides`;
+			$ret=`rm -f  $BUILDROOT/$PROJECT.tmp/build/debian/dolibarr.postrm`;
+			$ret=`rm -f  $BUILDROOT/$PROJECT.tmp/build/debian/dolibarr.postinst`;
+			$ret=`rm -f  $BUILDROOT/$PROJECT.tmp/build/debian/dolibarr.templates`;
+			$ret=`rm -f  $BUILDROOT/$PROJECT.tmp/build/debian/dolibarr.templates.futur`;
+			$ret=`rm -f  $BUILDROOT/$PROJECT.tmp/build/debian/rules`;
+			$ret=`rm -f  $BUILDROOT/$PROJECT.tmp/build/debian/README.Debian`;
+			$ret=`rm -f  $BUILDROOT/$PROJECT.tmp/build/debian/README.howto`;
+			$ret=`rm -f  $BUILDROOT/$PROJECT.tmp/build/debian/watch`;
+			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/build/doap`;
+			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/build/exe`;
+			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/build/launchpad`;
+			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/build/live`;
+			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/build/patch`;
+			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/build/perl`;
+			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/build/rpm`;
+			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/build/zip`;
+			# Removed duplicate license files
+			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/ckeditor/_source/LICENSE.md`;
+			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/ckeditor/_source/plugins/scayt/LICENSE.md`;
+			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/ckeditor/_source/plugins/wsc/LICENSE.md`;
+			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/ckeditor/LICENSE.md`;
+			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/ckeditor/plugins/scayt/LICENSE.md`;
+			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/ckeditor/plugins/wsc/LICENSE.md`;
+			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/jquery/plugins/flot/LICENSE.txt`;
+			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/tcpdf/fonts/dejavu-fonts-ttf-2.34/LICENSE`;
+			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/tcpdf/fonts/freefont-20120503/COPYING`;
+			# Removed files we don't need
+			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/ckeditor/_source`;
+			
+			# Rename upstream changelog to match debian rules
 			$ret=`mv $BUILDROOT/$PROJECT.tmp/ChangeLog $BUILDROOT/$PROJECT.tmp/changelog`;
 			
-            # Prepare source package (init debian dir)
-            print "Create directory $BUILDROOT/$PROJECT.tmp/debian\n";
-            $ret=`mkdir "$BUILDROOT/$PROJECT.tmp/debian"`;
-            print "Copy $SOURCE/build/debian/xxx to $BUILDROOT/$PROJECT.tmp/debian\n";
-            # Add files for dpkg-source
-            $ret=`cp -f  "$SOURCE/build/debian/changelog"      "$BUILDROOT/$PROJECT.tmp/debian"`;
-            $ret=`cp -f  "$SOURCE/build/debian/compat"         "$BUILDROOT/$PROJECT.tmp/debian"`;
-            $ret=`cp -f  "$SOURCE/build/debian/control"        "$BUILDROOT/$PROJECT.tmp/debian"`;
-            $ret=`cp -f  "$SOURCE/build/debian/copyright"      "$BUILDROOT/$PROJECT.tmp/debian"`;
-            $ret=`cp -f  "$SOURCE/build/debian/dolibarr.desktop"        	"$BUILDROOT/$PROJECT.tmp/debian"`;
-            $ret=`cp -f  "$SOURCE/build/debian/dolibarr.docs"        		"$BUILDROOT/$PROJECT.tmp/debian"`;
-            $ret=`cp -f  "$SOURCE/build/debian/dolibarr.install" 	        "$BUILDROOT/$PROJECT.tmp/debian"`;
-            $ret=`cp -f  "$SOURCE/build/debian/dolibarr.lintian-overrides"  "$BUILDROOT/$PROJECT.tmp/debian"`;
-            $ret=`cp -f  "$SOURCE/build/debian/dolibarr.xpm"  		      	"$BUILDROOT/$PROJECT.tmp/debian"`;
-            $ret=`cp -f  "$SOURCE/build/debian/rules"          "$BUILDROOT/$PROJECT.tmp/debian"`;
-            $ret=`cp -f  "$SOURCE/build/debian/watch"          "$BUILDROOT/$PROJECT.tmp/debian"`;
-            $ret=`cp -fr "$SOURCE/build/debian/patches"        "$BUILDROOT/$PROJECT.tmp/debian"`;
-            $ret=`cp -fr "$SOURCE/build/debian/po"             "$BUILDROOT/$PROJECT.tmp/debian"`;
-            $ret=`cp -fr "$SOURCE/build/debian/source"         "$BUILDROOT/$PROJECT.tmp/debian"`;
-            $ret=`cp -fr "$SOURCE/build/debian/apache"         "$BUILDROOT/$PROJECT.tmp/debian/apache"`;
-            $ret=`cp -f  "$SOURCE/build/debian/apache/.htaccess" "$BUILDROOT/$PROJECT.tmp/debian/apache"`;
-            $ret=`cp -fr "$SOURCE/build/debian/lighttpd"       "$BUILDROOT/$PROJECT.tmp/debian/lighttpd"`;
-            # Add files also required to build binary package
-            $ret=`cp -f  "$SOURCE/build/debian/dolibarr.config"         "$BUILDROOT/$PROJECT.tmp/debian"`;
-            $ret=`cp -f  "$SOURCE/build/debian/dolibarr.postinst"       "$BUILDROOT/$PROJECT.tmp/debian"`;
-            $ret=`cp -f  "$SOURCE/build/debian/dolibarr.postrm"         "$BUILDROOT/$PROJECT.tmp/debian"`;
-            $ret=`cp -f  "$SOURCE/build/debian/dolibarr.templates"      "$BUILDROOT/$PROJECT.tmp/debian"`;
-            $ret=`cp -f  "$SOURCE/build/debian/install.forced.php.install"      "$BUILDROOT/$PROJECT.tmp/debian"`;
-            
+			# Prepare source package (init debian dir)
+			print "Create directory $BUILDROOT/$PROJECT.tmp/debian\n";
+			$ret=`mkdir "$BUILDROOT/$PROJECT.tmp/debian"`;
+			print "Copy $SOURCE/build/debian/xxx to $BUILDROOT/$PROJECT.tmp/debian\n";
+			# Add files for dpkg-source
+			$ret=`cp -f  "$SOURCE/build/debian/changelog"      "$BUILDROOT/$PROJECT.tmp/debian"`;
+			$ret=`cp -f  "$SOURCE/build/debian/compat"         "$BUILDROOT/$PROJECT.tmp/debian"`;
+			$ret=`cp -f  "$SOURCE/build/debian/control"        "$BUILDROOT/$PROJECT.tmp/debian"`;
+			$ret=`cp -f  "$SOURCE/build/debian/copyright"      "$BUILDROOT/$PROJECT.tmp/debian"`;
+			$ret=`cp -f  "$SOURCE/build/debian/dolibarr.desktop"        	"$BUILDROOT/$PROJECT.tmp/debian"`;
+			$ret=`cp -f  "$SOURCE/build/debian/dolibarr.docs"        		"$BUILDROOT/$PROJECT.tmp/debian"`;
+			$ret=`cp -f  "$SOURCE/build/debian/dolibarr.install" 	        "$BUILDROOT/$PROJECT.tmp/debian"`;
+			$ret=`cp -f  "$SOURCE/build/debian/dolibarr.lintian-overrides"  "$BUILDROOT/$PROJECT.tmp/debian"`;
+			$ret=`cp -f  "$SOURCE/build/debian/dolibarr.xpm"  		      	"$BUILDROOT/$PROJECT.tmp/debian"`;
+			$ret=`cp -f  "$SOURCE/build/debian/rules"          "$BUILDROOT/$PROJECT.tmp/debian"`;
+			$ret=`cp -f  "$SOURCE/build/debian/watch"          "$BUILDROOT/$PROJECT.tmp/debian"`;
+			$ret=`cp -fr "$SOURCE/build/debian/patches"        "$BUILDROOT/$PROJECT.tmp/debian"`;
+			$ret=`cp -fr "$SOURCE/build/debian/po"             "$BUILDROOT/$PROJECT.tmp/debian"`;
+			$ret=`cp -fr "$SOURCE/build/debian/source"         "$BUILDROOT/$PROJECT.tmp/debian"`;
+			$ret=`cp -fr "$SOURCE/build/debian/apache"         "$BUILDROOT/$PROJECT.tmp/debian/apache"`;
+			$ret=`cp -f  "$SOURCE/build/debian/apache/.htaccess" "$BUILDROOT/$PROJECT.tmp/debian/apache"`;
+			$ret=`cp -fr "$SOURCE/build/debian/lighttpd"       "$BUILDROOT/$PROJECT.tmp/debian/lighttpd"`;
+			# Add files also required to build binary package
+			$ret=`cp -f  "$SOURCE/build/debian/dolibarr.config"         "$BUILDROOT/$PROJECT.tmp/debian"`;
+			$ret=`cp -f  "$SOURCE/build/debian/dolibarr.postinst"       "$BUILDROOT/$PROJECT.tmp/debian"`;
+			$ret=`cp -f  "$SOURCE/build/debian/dolibarr.postrm"         "$BUILDROOT/$PROJECT.tmp/debian"`;
+			$ret=`cp -f  "$SOURCE/build/debian/dolibarr.templates"      "$BUILDROOT/$PROJECT.tmp/debian"`;
+			$ret=`cp -f  "$SOURCE/build/debian/install.forced.php.install"      "$BUILDROOT/$PROJECT.tmp/debian"`;
+			
 			# Set owners and permissions
-            #print "Set owners on files/dir\n";
-		    #$ret=`chown -R root.root $BUILDROOT/$PROJECT.tmp`;
-
-            print "Set permissions on files/dir\n";
-		    $ret=`chmod -R 755 $BUILDROOT/$PROJECT.tmp`;
-		    $cmd="find $BUILDROOT/$PROJECT.tmp -type f -exec chmod 644 {} \\; ";
-            $ret=`$cmd`;
-            $cmd="find $BUILDROOT/$PROJECT.tmp/build -name '*.php' -type f -exec chmod 755 {} \\; ";
-            $ret=`$cmd`;
-            $cmd="find $BUILDROOT/$PROJECT.tmp/build -name '*.dpatch' -type f -exec chmod 755 {} \\; ";
-            $ret=`$cmd`;
-            $cmd="find $BUILDROOT/$PROJECT.tmp/build -name '*.pl' -type f -exec chmod 755 {} \\; ";
-            $ret=`$cmd`;
-            $cmd="find $BUILDROOT/$PROJECT.tmp/dev -name '*.php' -type f -exec chmod 755 {} \\; ";
-            $ret=`$cmd`;
-            $ret=`chmod 755 $BUILDROOT/$PROJECT.tmp/debian/rules`;
-            $ret=`chmod -R 644 $BUILDROOT/$PROJECT.tmp/dev/translation/autotranslator.class.php`;
-            $ret=`chmod -R 644 $BUILDROOT/$PROJECT.tmp/dev/skeletons/modMyModule.class.php`;
-            $ret=`chmod -R 644 $BUILDROOT/$PROJECT.tmp/dev/skeletons/skeleton_class.class.php`;
-            $ret=`chmod -R 644 $BUILDROOT/$PROJECT.tmp/dev/skeletons/skeleton_page.php`;
-            $ret=`chmod -R 644 $BUILDROOT/$PROJECT.tmp/dev/skeletons/skeleton_webservice_server.php`;
-            $cmd="find $BUILDROOT/$PROJECT.tmp/scripts -name '*.php' -type f -exec chmod 755 {} \\; ";
-            $ret=`$cmd`;
-            $cmd="find $BUILDROOT/$PROJECT.tmp/scripts -name '*.sh' -type f -exec chmod 755 {} \\; ";
-            $ret=`$cmd`;
-            
-          
-            print "Rename directory $BUILDROOT/$PROJECT.tmp into $BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build\n";
-            $cmd="mv $BUILDROOT/$PROJECT.tmp $BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build";
-            $ret=`$cmd`;
-
-
-     		print "Go into directory $BUILDROOT\n";
-            chdir("$BUILDROOT");
+			#print "Set owners on files/dir\n";
+			#$ret=`chown -R root.root $BUILDROOT/$PROJECT.tmp`;
+
+			print "Set permissions on files/dir\n";
+			$ret=`chmod -R 755 $BUILDROOT/$PROJECT.tmp`;
+			$cmd="find $BUILDROOT/$PROJECT.tmp -type f -exec chmod 644 {} \\; ";
+			$ret=`$cmd`;
+			$cmd="find $BUILDROOT/$PROJECT.tmp/build -name '*.php' -type f -exec chmod 755 {} \\; ";
+			$ret=`$cmd`;
+			$cmd="find $BUILDROOT/$PROJECT.tmp/build -name '*.dpatch' -type f -exec chmod 755 {} \\; ";
+			$ret=`$cmd`;
+			$cmd="find $BUILDROOT/$PROJECT.tmp/build -name '*.pl' -type f -exec chmod 755 {} \\; ";
+			$ret=`$cmd`;
+			$cmd="find $BUILDROOT/$PROJECT.tmp/dev -name '*.php' -type f -exec chmod 755 {} \\; ";
+			$ret=`$cmd`;
+			$ret=`chmod 755 $BUILDROOT/$PROJECT.tmp/debian/rules`;
+			$ret=`chmod -R 644 $BUILDROOT/$PROJECT.tmp/dev/translation/autotranslator.class.php`;
+			$ret=`chmod -R 644 $BUILDROOT/$PROJECT.tmp/dev/skeletons/modMyModule.class.php`;
+			$ret=`chmod -R 644 $BUILDROOT/$PROJECT.tmp/dev/skeletons/skeleton_class.class.php`;
+			$ret=`chmod -R 644 $BUILDROOT/$PROJECT.tmp/dev/skeletons/skeleton_page.php`;
+			$ret=`chmod -R 644 $BUILDROOT/$PROJECT.tmp/dev/skeletons/skeleton_webservice_server.php`;
+			$cmd="find $BUILDROOT/$PROJECT.tmp/scripts -name '*.php' -type f -exec chmod 755 {} \\; ";
+			$ret=`$cmd`;
+			$cmd="find $BUILDROOT/$PROJECT.tmp/scripts -name '*.sh' -type f -exec chmod 755 {} \\; ";
+			$ret=`$cmd`;
+			
+		
+			print "Rename directory $BUILDROOT/$PROJECT.tmp into $BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build\n";
+			$cmd="mv $BUILDROOT/$PROJECT.tmp $BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build";
+			$ret=`$cmd`;
+
+
+			print "Go into directory $BUILDROOT\n";
+			chdir("$BUILDROOT");
 			
 			# We need a tarball to be able to build "quilt" debian package (not required for native but we need patch so it is not a native)
-    		print "Compress $BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build into $BUILDROOT/$FILENAMEDEBNATIVE.orig.tar.gz...\n";
-   		    $cmd="tar --exclude-vcs --exclude-from \"$BUILDROOT/$PROJECT/build/tgz/tar_exclude.txt\" --directory \"$BUILDROOT\" --mode=go-w --group=500 --owner=500 -czvf \"$BUILDROOT/$FILENAMEDEBNATIVE.orig.tar.gz\" $PROJECT-$MAJOR.$MINOR.$build";
-   		    print $cmd."\n";
-   		    $ret=`$cmd`;
+			print "Compress $BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build into $BUILDROOT/$FILENAMEDEBNATIVE.orig.tar.gz...\n";
+			$cmd="tar --exclude-vcs --exclude-from \"$BUILDROOT/$PROJECT/build/tgz/tar_exclude.txt\" --directory \"$BUILDROOT\" --mode=go-w --group=500 --owner=500 -czvf \"$BUILDROOT/$FILENAMEDEBNATIVE.orig.tar.gz\" $PROJECT-$MAJOR.$MINOR.$build";
+			print $cmd."\n";
+			$ret=`$cmd`;
 
 			# Creation of source package          
-     		print "Go into directory $BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build\n";
-            chdir("$BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build");
-            #$cmd="dpkg-source -b $BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build";
-            $cmd="dpkg-buildpackage -us -uc";
-            print "Launch DEB build ($cmd)\n";
-            $ret=`$cmd 2>&1 3>&1`;
-            print $ret."\n";
-
-            chdir("$olddir");
-    		
-    		print "You can check bin package with lintian --pedantic -E -I \"$NEWDESTI/${FILENAMEDEB}_all.deb\"\n";
-    		print "You can check src package with lintian --pedantic -E -I \"$NEWDESTI/${FILENAMEDEB}.dsc\"\n";
-    		
-    		# Move to final dir
-            print "Move *_all.deb *.dsc *.orig.tar.gz *.changes to $NEWDESTI\n";
-            $ret=`mv $BUILDROOT/*_all.deb "$NEWDESTI/"`;
-            $ret=`mv $BUILDROOT/*.dsc "$NEWDESTI/"`;
-            $ret=`mv $BUILDROOT/*.orig.tar.gz "$NEWDESTI/"`;
-            $ret=`mv $BUILDROOT/*.debian.tar.gz "$NEWDESTI/"`;
-            $ret=`mv $BUILDROOT/*.changes "$NEWDESTI/"`;
-        	next;
-        }
-        
-    	if ($target eq 'APS') 
-    	{
+			print "Go into directory $BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build\n";
+			chdir("$BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build");
+			#$cmd="dpkg-source -b $BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build";
+			$cmd="dpkg-buildpackage -us -uc";
+			print "Launch DEB build ($cmd)\n";
+			$ret=`$cmd 2>&1 3>&1`;
+			print $ret."\n";
+
+			chdir("$olddir");
+			
+			print "You can check bin package with lintian --pedantic -E -I \"$NEWDESTI/${FILENAMEDEB}_all.deb\"\n";
+			print "You can check src package with lintian --pedantic -E -I \"$NEWDESTI/${FILENAMEDEB}.dsc\"\n";
+			
+			# Move to final dir
+			print "Move *_all.deb *.dsc *.orig.tar.gz *.changes to $NEWDESTI\n";
+			$ret=`mv $BUILDROOT/*_all.deb "$NEWDESTI/"`;
+			$ret=`mv $BUILDROOT/*.dsc "$NEWDESTI/"`;
+			$ret=`mv $BUILDROOT/*.orig.tar.gz "$NEWDESTI/"`;
+			$ret=`mv $BUILDROOT/*.debian.tar.gz "$NEWDESTI/"`;
+			$ret=`mv $BUILDROOT/*.changes "$NEWDESTI/"`;
+			next;
+		}
+		
+		if ($target eq 'APS') 
+		{
 			$NEWDESTI=$DESTI;
-    		mkdir($DESTI.'/package_aps');
+			mkdir($DESTI.'/package_aps');
 			if (-d $DESTI.'/package_aps') { $NEWDESTI=$DESTI.'/package_aps'; } 
 			
-            $newbuild = $BUILD;
-            $newbuild =~ s/(dev|alpha)/0/gi;                # dev
-            $newbuild =~ s/beta/1/gi;                       # beta
-            $newbuild =~ s/rc./2/gi;                        # rc
-            if ($newbuild !~ /-/) { $newbuild.='-3'; }      # finale
-            # now newbuild is 0-0 or 0-3 for example
-            $REL1 = $newbuild; $REL1 =~ s/-.*$//gi;
-            if ($RPMSUBVERSION eq 'auto') { $RPMSUBVERSION = $newbuild; $RPMSUBVERSION =~ s/^.*-//gi; }
-            print "Version is $MAJOR.$MINOR.$REL1-$RPMSUBVERSION\n";
-    		
-     		print "Remove target $FILENAMEAPS.zip...\n";
-    		unlink "$NEWDESTI/$FILENAMEAPS.zip";
- 
-            #rmdir "$BUILDROOT/$PROJECT.tmp";
-            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp`;
-            print "Create directory $BUILDROOT/$PROJECT.tmp\n";
-            $ret=`mkdir -p "$BUILDROOT/$PROJECT.tmp"`;
-            print "Copy $BUILDROOT/$PROJECT to $BUILDROOT/$PROJECT.tmp\n";
-            $cmd="cp -pr \"$BUILDROOT/$PROJECT\" \"$BUILDROOT/$PROJECT.tmp\"";
-            $ret=`$cmd`;
-
-            print "Remove other files\n";
-            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/deb`;
-            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/dmg`;
-            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/doap`;
-            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/exe`;
-            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/live`;
-            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/patch`;
-            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/rpm`;
-            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/zip`;
-            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/perl`;
-
-            $APSVERSION="1.2";
-            print "Create APS files $BUILDROOT/$PROJECT.tmp/$PROJECT/APP-META.xml\n";
-            open (SPECFROM,"<$BUILDROOT/$PROJECT/build/aps/APP-META-$APSVERSION.xml") || die "Error";
-            open (SPECTO,">$BUILDROOT/$PROJECT.tmp/$PROJECT/APP-META.xml") || die "Error";
-            while (<SPECFROM>) {
-                $newbuild = $BUILD;
-                $newbuild =~ s/(dev|alpha)/0/gi;                # dev
-                $newbuild =~ s/beta/1/gi;                       # beta
-                $newbuild =~ s/rc./2/gi;                        # rc
-                if ($newbuild !~ /-/) { $newbuild.='-3'; }      # finale
-                # now newbuild is 0-0 or 0-3 for example
-                $_ =~ s/__VERSION__/$MAJOR.$MINOR.$REL1/;
-                $_ =~ s/__RELEASE__/$RPMSUBVERSION/;
-                print SPECTO $_;
-            }
-            close SPECFROM;
-            close SPECTO;
-            print "Version set to $MAJOR.$MINOR.$newbuild\n";
-            #$cmd="cp -pr \"$BUILDROOT/$PROJECT/build/aps/configure\" \"$BUILDROOT/$PROJECT.tmp/$PROJECT/scripts/configure\"";
-            #$ret=`$cmd`;
-            $cmd="cp -pr \"$BUILDROOT/$PROJECT/build/aps/configure.php\" \"$BUILDROOT/$PROJECT.tmp/$PROJECT/scripts/configure.php\"";
-            $ret=`$cmd`;
-            $cmd="cp -pr \"$BUILDROOT/$PROJECT/doc/images\" \"$BUILDROOT/$PROJECT.tmp/$PROJECT/images\"";
-            $ret=`$cmd`;
- 
-            print "Remove other files\n";
-            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/dev`;
-            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/doc`;
-            
-            print "Build APP-LIST.xml files\n";
-            
-            print "Compress $BUILDROOT/$PROJECT.tmp/$PROJECT into $FILENAMEAPS.zip...\n";
- 
-            print "Go to directory $BUILDROOT/$PROJECT.tmp\/$PROJECT\n";
-            $olddir=getcwd();
-            chdir("$BUILDROOT\/$PROJECT.tmp\/$PROJECT");
-            $cmd= "zip -9 -r $BUILDROOT/$FILENAMEAPS.zip \*";
-            print $cmd."\n";
-            $ret= `$cmd`;
-            chdir("$olddir");
-                        
-    		# Move to final dir
-            print "Move $BUILDROOT/$FILENAMEAPS.zip to $NEWDESTI/$FILENAMEAPS.zip\n";
-            $ret=`mv "$BUILDROOT/$FILENAMEAPS.zip" "$NEWDESTI/$FILENAMEAPS.zip"`;
-            next;
-    	}
-
-    	if ($target eq 'EXEDOLIWAMP')
-    	{
-    		$NEWDESTI=$DESTI;
-    		mkdir($DESTI.'/package_windows');
+			$newbuild = $BUILD;
+			$newbuild =~ s/(dev|alpha)/0/gi;                # dev
+			$newbuild =~ s/beta/1/gi;                       # beta
+			$newbuild =~ s/rc./2/gi;                        # rc
+			if ($newbuild !~ /-/) { $newbuild.='-3'; }      # finale
+			# now newbuild is 0-0 or 0-3 for example
+			$REL1 = $newbuild; $REL1 =~ s/-.*$//gi;
+			if ($RPMSUBVERSION eq 'auto') { $RPMSUBVERSION = $newbuild; $RPMSUBVERSION =~ s/^.*-//gi; }
+			print "Version is $MAJOR.$MINOR.$REL1-$RPMSUBVERSION\n";
+			
+			print "Remove target $FILENAMEAPS.zip...\n";
+			unlink "$NEWDESTI/$FILENAMEAPS.zip";
+
+			#rmdir "$BUILDROOT/$PROJECT.tmp";
+			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp`;
+			print "Create directory $BUILDROOT/$PROJECT.tmp\n";
+			$ret=`mkdir -p "$BUILDROOT/$PROJECT.tmp"`;
+			print "Copy $BUILDROOT/$PROJECT to $BUILDROOT/$PROJECT.tmp\n";
+			$cmd="cp -pr \"$BUILDROOT/$PROJECT\" \"$BUILDROOT/$PROJECT.tmp\"";
+			$ret=`$cmd`;
+
+			print "Remove other files\n";
+			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/deb`;
+			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/dmg`;
+			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/doap`;
+			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/exe`;
+			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/live`;
+			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/patch`;
+			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/rpm`;
+			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/zip`;
+			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/perl`;
+
+			$APSVERSION="1.2";
+			print "Create APS files $BUILDROOT/$PROJECT.tmp/$PROJECT/APP-META.xml\n";
+			open (SPECFROM,"<$BUILDROOT/$PROJECT/build/aps/APP-META-$APSVERSION.xml") || die "Error";
+			open (SPECTO,">$BUILDROOT/$PROJECT.tmp/$PROJECT/APP-META.xml") || die "Error";
+			while (<SPECFROM>) {
+				$newbuild = $BUILD;
+				$newbuild =~ s/(dev|alpha)/0/gi;                # dev
+				$newbuild =~ s/beta/1/gi;                       # beta
+				$newbuild =~ s/rc./2/gi;                        # rc
+				if ($newbuild !~ /-/) { $newbuild.='-3'; }      # finale
+				# now newbuild is 0-0 or 0-3 for example
+				$_ =~ s/__VERSION__/$MAJOR.$MINOR.$REL1/;
+				$_ =~ s/__RELEASE__/$RPMSUBVERSION/;
+				print SPECTO $_;
+			}
+			close SPECFROM;
+			close SPECTO;
+			print "Version set to $MAJOR.$MINOR.$newbuild\n";
+			#$cmd="cp -pr \"$BUILDROOT/$PROJECT/build/aps/configure\" \"$BUILDROOT/$PROJECT.tmp/$PROJECT/scripts/configure\"";
+			#$ret=`$cmd`;
+			$cmd="cp -pr \"$BUILDROOT/$PROJECT/build/aps/configure.php\" \"$BUILDROOT/$PROJECT.tmp/$PROJECT/scripts/configure.php\"";
+			$ret=`$cmd`;
+			$cmd="cp -pr \"$BUILDROOT/$PROJECT/doc/images\" \"$BUILDROOT/$PROJECT.tmp/$PROJECT/images\"";
+			$ret=`$cmd`;
+
+			print "Remove other files\n";
+			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/dev`;
+			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/doc`;
+			
+			print "Build APP-LIST.xml files\n";
+			
+			print "Compress $BUILDROOT/$PROJECT.tmp/$PROJECT into $FILENAMEAPS.zip...\n";
+
+			print "Go to directory $BUILDROOT/$PROJECT.tmp\/$PROJECT\n";
+			$olddir=getcwd();
+			chdir("$BUILDROOT\/$PROJECT.tmp\/$PROJECT");
+			$cmd= "zip -9 -r $BUILDROOT/$FILENAMEAPS.zip \*";
+			print $cmd."\n";
+			$ret= `$cmd`;
+			chdir("$olddir");
+						
+			# Move to final dir
+			print "Move $BUILDROOT/$FILENAMEAPS.zip to $NEWDESTI/$FILENAMEAPS.zip\n";
+			$ret=`mv "$BUILDROOT/$FILENAMEAPS.zip" "$NEWDESTI/$FILENAMEAPS.zip"`;
+			next;
+		}
+
+		if ($target eq 'EXEDOLIWAMP')
+		{
+			$NEWDESTI=$DESTI;
+			mkdir($DESTI.'/package_windows');
 			if (-d $DESTI.'/package_windows') { $NEWDESTI=$DESTI.'/package_windows'; } 
-    		
-     		print "Remove target $FILENAMEEXEDOLIWAMP.exe...\n";
-    		unlink "$NEWDESTI/$FILENAMEEXEDOLIWAMP.exe";
- 
- 			$SOURCEBACK=$SOURCE;
- 			$SOURCEBACK =~ s/\//\\/g;
-    		print "Compil exe $FILENAMEEXEDOLIWAMP.exe file from iss file \"$SOURCEBACK\\build\\exe\\doliwamp\\doliwamp.iss\"\n";
-    		$cmd= "ISCC.exe \"$SOURCEBACK\\build\\exe\\doliwamp\\doliwamp.iss\"";
+			
+			print "Remove target $FILENAMEEXEDOLIWAMP.exe...\n";
+			unlink "$NEWDESTI/$FILENAMEEXEDOLIWAMP.exe";
+
+			$SOURCEBACK=$SOURCE;
+			$SOURCEBACK =~ s/\//\\/g;
+			print "Compil exe $FILENAMEEXEDOLIWAMP.exe file from iss file \"$SOURCEBACK\\build\\exe\\doliwamp\\doliwamp.iss\"\n";
+			$cmd= "ISCC.exe \"$SOURCEBACK\\build\\exe\\doliwamp\\doliwamp.iss\"";
 			print "$cmd\n";
 			$ret= `$cmd`;
 			#print "$ret\n";
 
-    		# Move to final dir
+			# Move to final dir
 			print "Move \"$SOURCE\\build\\$FILENAMEEXEDOLIWAMP.exe\" to $NEWDESTI/$FILENAMEEXEDOLIWAMP.exe\n";
-    		rename("$SOURCE/build/$FILENAMEEXEDOLIWAMP.exe","$NEWDESTI/$FILENAMEEXEDOLIWAMP.exe");
-            print "Move $SOURCE/build/$FILENAMEEXEDOLIWAMP.exe to $NEWDESTI/$FILENAMEEXEDOLIWAMP.exe\n";
-            $ret=`mv "$SOURCE/build/$FILENAMEEXEDOLIWAMP.exe" "$NEWDESTI/$FILENAMEEXEDOLIWAMP.exe"`;
-    		next;
-    	}
-    }
-
-    # Publish package for each target
-    #--------------------------------
-    foreach my $target (keys %CHOOSEDPUBLISH) 
-    {
-        if ($CHOOSEDPUBLISH{$target} < 0) { next; }
-    
+			rename("$SOURCE/build/$FILENAMEEXEDOLIWAMP.exe","$NEWDESTI/$FILENAMEEXEDOLIWAMP.exe");
+			print "Move $SOURCE/build/$FILENAMEEXEDOLIWAMP.exe to $NEWDESTI/$FILENAMEEXEDOLIWAMP.exe\n";
+			$ret=`mv "$SOURCE/build/$FILENAMEEXEDOLIWAMP.exe" "$NEWDESTI/$FILENAMEEXEDOLIWAMP.exe"`;
+			next;
+		}
+	}
+
+	# Publish package for each target
+	#--------------------------------
+	foreach my $target (keys %CHOOSEDPUBLISH) 
+	{
+		if ($CHOOSEDPUBLISH{$target} < 0) { next; }
+	
 		print "\nList of files to publish\n";
-    	%filestoscansf=(
-    		"$DESTI/package_rpm_generic/$FILENAMERPM"=>'Dolibarr installer for Fedora-Redhat-Mandriva-Opensuse (DoliRpm)',
-    		"$DESTI/package_debian-ubuntu/${FILENAMEDEB}_all.deb"=>'Dolibarr installer for Debian-Ubuntu (DoliDeb)',
-    		"$DESTI/package_windows/$FILENAMEEXEDOLIWAMP.exe"=>'Dolibarr installer for Windows (DoliWamp)',
-    		"$DESTI/standard/$FILENAMETGZ.tgz"=>'Dolibarr ERP-CRM',
-    		"$DESTI/standard/$FILENAMETGZ.zip"=>'Dolibarr ERP-CRM'
-    	);
-    	use POSIX qw/strftime/;
-    	foreach my $file (sort keys %filestoscansf)
-    	{
-    		$found=0;
-    		my $filesize = -s $file;
-    		my $filedate = (stat $file)[9];
-    		print $file." ".($filesize?"(found)":"(not found)");
-    		print ($filesize?" - ".$filesize:"");
-    		print ($filedate?" - ".strftime("%Y-%m-%d %H:%M:%S",localtime($filedate)):"");
-    		print "\n";
-    	}
-
-    	if ($target eq 'SF' || $target eq 'ASSO') 
-    	{
-    		print "\n";
-    		
-    		if ($target eq 'SF') { $PUBLISH = $PUBLISHSTABLE; }
+		%filestoscansf=(
+			"$DESTI/package_rpm_generic/$FILENAMERPM"=>'Dolibarr installer for Fedora-Redhat-Mandriva-Opensuse (DoliRpm)',
+			"$DESTI/package_debian-ubuntu/${FILENAMEDEB}_all.deb"=>'Dolibarr installer for Debian-Ubuntu (DoliDeb)',
+			"$DESTI/package_windows/$FILENAMEEXEDOLIWAMP.exe"=>'Dolibarr installer for Windows (DoliWamp)',
+			"$DESTI/standard/$FILENAMETGZ.tgz"=>'Dolibarr ERP-CRM',
+			"$DESTI/standard/$FILENAMETGZ.zip"=>'Dolibarr ERP-CRM'
+		);
+		use POSIX qw/strftime/;
+		foreach my $file (sort keys %filestoscansf)
+		{
+			$found=0;
+			my $filesize = -s $file;
+			my $filedate = (stat $file)[9];
+			print $file." ".($filesize?"(found)":"(not found)");
+			print ($filesize?" - ".$filesize:"");
+			print ($filedate?" - ".strftime("%Y-%m-%d %H:%M:%S",localtime($filedate)):"");
+			print "\n";
+		}
+
+		if ($target eq 'SF' || $target eq 'ASSO') 
+		{
+			print "\n";
+			
+			if ($target eq 'SF') { $PUBLISH = $PUBLISHSTABLE; }
 			if ($target eq 'ASSO' && $BUILD =~ /[a-z]/i)   { $PUBLISH = $PUBLISHBETARC.'/lastbuild'; }
 			if ($target eq 'ASSO' && $BUILD =~ /^[0-9]+$/) { $PUBLISH = $PUBLISHBETARC.'/stable'; }
 			
-    		$NEWPUBLISH=$PUBLISH;
-    		print "Publish to target $NEWPUBLISH. Click enter or CTRL+C...\n";
+			$NEWPUBLISH=$PUBLISH;
+			print "Publish to target $NEWPUBLISH. Click enter or CTRL+C...\n";
 
-	    	# Ask which target to build
-	    	$NUM_SCRIPT=<STDIN>; 
-	    	chomp($NUM_SCRIPT);
+			# Ask which target to build
+			$NUM_SCRIPT=<STDIN>; 
+			chomp($NUM_SCRIPT);
 
 			print "Create empty dir /tmp/emptydir. We need it to create target dir using rsync.\n";
-            $ret=`mkdir -p "/tmp/emptydir/"`;
-            
-            %filestoscan=%filestoscansf;
-            
-	    	foreach my $file (sort keys %filestoscan)
-	    	{
-	    		$found=0;
-	    		my $filesize = -s $file;
-	    		if (! $filesize) { next; }
+			$ret=`mkdir -p "/tmp/emptydir/"`;
+			
+			%filestoscan=%filestoscansf;
+			
+			foreach my $file (sort keys %filestoscan)
+			{
+				$found=0;
+				my $filesize = -s $file;
+				if (! $filesize) { next; }
 
 				print "\n";
-	    		print "Publish file ".$file." to ".$filestoscan{$file}."\n";
-	    		
-	    		$destFolder="$NEWPUBLISH/$filestoscan{$file}/".$MAJOR.'.'.$MINOR.'.'.$BUILD;
+				print "Publish file ".$file." to ".$filestoscan{$file}."\n";
+				
+				$destFolder="$NEWPUBLISH/$filestoscan{$file}/".$MAJOR.'.'.$MINOR.'.'.$BUILD;
 
 				# mkdir	   
 				#my $ssh = Net::SSH::Perl->new("frs.sourceforge.net");
 				#$ssh->login("$user","$pass"); 		
-	    		#use String::ShellQuote qw( shell_quote );
+				#use String::ShellQuote qw( shell_quote );
 				#$ssh->cmd('mkdir '.shell_quote($destFolder).' && exit');
 
 				#use Net::SFTP::Foreign;
@@ -1045,23 +1045,23 @@ if ($nboftargetok) {
 				print "$command\n";	
 				my $ret=`$command 2>&1`;
 				print "$ret\n";
-	    	}
-    	}
-    }    
+			}
+		}
+	}    
 }
 
 print "\n----- Summary -----\n";
 foreach my $target (keys %CHOOSEDTARGET) {
-    if ($CHOOSEDTARGET{$target} < 0) {
-        print "Package $target not built (bad requirement).\n";
-    } else {
-        print "Package $target built successfully in $DESTI\n";
-    }
+	if ($CHOOSEDTARGET{$target} < 0) {
+		print "Package $target not built (bad requirement).\n";
+	} else {
+		print "Package $target built successfully in $DESTI\n";
+	}
 }
 
 if (! $batch) {
-    print "\nPress key to finish...";
-    my $WAITKEY=<STDIN>;
+	print "\nPress key to finish...";
+	my $WAITKEY=<STDIN>;
 }
 
 0;