diff --git a/build/debian/changelog b/build/debian/changelog
index ab2fe33ec0a45361f4f2231ec5f73c0b13be81ef..4a711c9868c6407c34b8ebc48b1924a32f934fd4 100644
--- a/build/debian/changelog
+++ b/build/debian/changelog
@@ -1,3 +1,10 @@
+dolibarr (3.6.2-3) unstable; urgency=low
+
+ [ Laurent Destailleur (eldy) ]
+ * New upstream release.
+
+ -- Laurent Destailleur (eldy) <eldy@users.sourceforge.net> Sat, 27 dec 2014 12:00:00 +0100
+
dolibarr (3.6.1-3) unstable; urgency=low
[ Laurent Destailleur (eldy) ]
diff --git a/build/exe/doliwamp/.gitignore b/build/exe/doliwamp/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..ce74d54f78e7d434300e1d4f50dcbdadae00cb0f
--- /dev/null
+++ b/build/exe/doliwamp/.gitignore
@@ -0,0 +1 @@
+/doliwamp.tmp.iss
diff --git a/build/exe/doliwamp/doliwamp.iss b/build/exe/doliwamp/doliwamp.iss
index 1657ff1c7e7af737f7710771a481b2d724aa7b53..6183bcac85ca0eb892da8189564c7319c72f75d1 100644
--- a/build/exe/doliwamp/doliwamp.iss
+++ b/build/exe/doliwamp/doliwamp.iss
@@ -16,10 +16,10 @@
[Setup]
; ----- Change this -----
AppName=DoliWamp
-; DoliWamp-x.x.x or DoliWamp-x.x.x-alpha or DoliWamp-x.x.x-beta or DoliWamp-x.x.x-rc or DoliWamp-x.x.x
-AppVerName=DoliWamp-3.6.1
-; DoliWamp-x.x x or DoliWamp-x.x.x-alpha or DoliWamp-x.x.x-beta or DoliWamp-x.x.x-rc or DoliWamp-x.x.x
-OutputBaseFilename=DoliWamp-3.6.1
+; Replace key with DoliWamp-x.x.x or DoliWamp-x.x.x-alpha or DoliWamp-x.x.x-beta or DoliWamp-x.x.x-rc or DoliWamp-x.x.x
+AppVerName=__FILENAMEEXEDOLIWAMP__
+; Replace key with DoliWamp-x.x x or DoliWamp-x.x.x-alpha or DoliWamp-x.x.x-beta or DoliWamp-x.x.x-rc or DoliWamp-x.x.x
+OutputBaseFilename=__FILENAMEEXEDOLIWAMP__
; ----- End of change
;OutputManifestFile=build\doliwampbuild.log
; Define full path from which all relative path are defined
diff --git a/build/makepack-dolibarr.pl b/build/makepack-dolibarr.pl
index 8abac38d8029a206aeac1164690cb6fa2d080eba..8467d4140f322f49cd76f3ad41b8007566e55896 100755
--- a/build/makepack-dolibarr.pl
+++ b/build/makepack-dolibarr.pl
@@ -2,7 +2,7 @@
#----------------------------------------------------------------------------
# \file build/makepack-dolibarr.pl
# \brief Dolibarr package builder (tgz, zip, rpm, deb, exe, aps)
-# \author (c)2004-2013 Laurent Destailleur <eldy@users.sourceforge.net>
+# \author (c)2004-2014 Laurent Destailleur <eldy@users.sourceforge.net>
#
# This is list of constant you can set to have generated packages moved into a specific dir:
#DESTIBETARC='/media/HDDATA1_LD/Mes Sites/Web/Dolibarr/dolibarr.org/files/lastbuild'
@@ -911,8 +911,6 @@ if ($nboftargetok) {
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\"";
@@ -951,8 +949,12 @@ if ($nboftargetok) {
$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 "Prepare file \"$SOURCEBACK\\build\\exe\\doliwamp\\doliwamp.tmp.iss from \"$SOURCEBACK\\build\\exe\\doliwamp\\doliwamp.iss\"\n";
+ $ret=`cat "$SOURCE/build/exe/doliwamp/doliwamp.iss" | sed -e 's/__FILENAMEEXEDOLIWAMP__/$FILENAMEEXEDOLIWAMP/g' > "$SOURCE/build/exe/doliwamp/doliwamp.tmp.iss"`;
+
+ print "Compil exe $FILENAMEEXEDOLIWAMP.exe file from iss file \"$SOURCEBACK\\build\\exe\\doliwamp\\doliwamp.tmp.iss\"\n";
+ $cmd= "ISCC.exe \"$SOURCEBACK\\build\\exe\\doliwamp\\doliwamp.tmp.iss\"";
print "$cmd\n";
$ret= `$cmd`;
#print "$ret\n";
@@ -962,6 +964,9 @@ if ($nboftargetok) {
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"`;
+
+ $ret=`rm "$SOURCE/build/exe/doliwamp/doliwamp.tmp.iss"`;
+
next;
}
}
diff --git a/build/rpm/dolibarr_fedora.spec b/build/rpm/dolibarr_fedora.spec
index 7dc332f04320352fbd84904f364bf175b0f08636..0904797b5a4a3342cf616ca36f9d1aa2edb6f68e 100755
--- a/build/rpm/dolibarr_fedora.spec
+++ b/build/rpm/dolibarr_fedora.spec
@@ -333,6 +333,9 @@ fi
# version x.y.z-0.1.a for alpha, x.y.z-0.2.b for beta, x.y.z-0.3 for release
%changelog
+* Sat Dec 27 2014 Laurent Destailleur 3.6.2-0.3
+- Upstream release
+
* Wed Sep 24 2014 Laurent Destailleur 3.6.1-0.3
- Upstream release
diff --git a/build/rpm/dolibarr_generic.spec b/build/rpm/dolibarr_generic.spec
index 1949398ecc2605bf587a5f6c05cd285056ecda72..44a5ea1d842b3f643ed285434367a23e1a015bd9 100755
--- a/build/rpm/dolibarr_generic.spec
+++ b/build/rpm/dolibarr_generic.spec
@@ -569,6 +569,9 @@ fi
# version x.y.z-0.1.a for alpha, x.y.z-0.2.b for beta, x.y.z-0.3 for release
%changelog
+* Sat Dec 27 2014 Laurent Destailleur 3.6.2-0.3
+- Upstream release
+
* Wed Sep 24 2014 Laurent Destailleur 3.6.1-0.3
- Upstream release
diff --git a/build/rpm/dolibarr_mandriva.spec b/build/rpm/dolibarr_mandriva.spec
index 0331a0a9cc3e76a81067661ac40d80688312c3b2..a06162bcf1ad61adffe5a0e3075008030d79351d 100755
--- a/build/rpm/dolibarr_mandriva.spec
+++ b/build/rpm/dolibarr_mandriva.spec
@@ -338,6 +338,9 @@ fi
# version x.y.z-0.1.a for alpha, x.y.z-0.2.b for beta, x.y.z-0.3 for release
%changelog
+* Sat Dec 27 2014 Laurent Destailleur 3.6.2-0.3
+- Upstream release
+
* Wed Sep 24 2014 Laurent Destailleur 3.6.1-0.3
- Upstream release
diff --git a/build/rpm/dolibarr_opensuse.spec b/build/rpm/dolibarr_opensuse.spec
index f85cc0fa7a093b066d2d4404e6f32fe39e38cb98..1c939abae8773b22a827c0fdc508e990be1d9dbb 100755
--- a/build/rpm/dolibarr_opensuse.spec
+++ b/build/rpm/dolibarr_opensuse.spec
@@ -349,6 +349,9 @@ fi
# version x.y.z-0.1.a for alpha, x.y.z-0.2.b for beta, x.y.z-0.3 for release
%changelog
+* Sat Dec 27 2014 Laurent Destailleur 3.6.2-0.3
+- Upstream release
+
* Wed Sep 24 2014 Laurent Destailleur 3.6.1-0.3
- Upstream release
diff --git a/htdocs/filefunc.inc.php b/htdocs/filefunc.inc.php
index 8066c2a1a226ed81354aecc474e1707c2a486f0e..526f2aa2e57aff3ae13fbccd32159a2499434313 100644
--- a/htdocs/filefunc.inc.php
+++ b/htdocs/filefunc.inc.php
@@ -29,7 +29,7 @@
* \brief File that include conf.php file and commons lib like functions.lib.php
*/
-if (! defined('DOL_VERSION')) define('DOL_VERSION','3.6.1');
+if (! defined('DOL_VERSION')) define('DOL_VERSION','3.6.2');
if (! defined('EURO')) define('EURO',chr(128));
// Define syslog constants