diff --git a/build/exe/doliwamp/doliwamp.iss b/build/exe/doliwamp/doliwamp.iss index f7ae8ef317e..92bce9fc9b7 100644 --- a/build/exe/doliwamp/doliwamp.iss +++ b/build/exe/doliwamp/doliwamp.iss @@ -18,9 +18,9 @@ ; ----- Change this ----- AppName=DoliWamp ; DoliWamp-x.x.x or DoliWamp-x.x.x-dev or DoliWamp-x.x.x-beta -AppVerName=DoliWamp-3.1.0-beta +AppVerName=DoliWamp-3.1.0 ; DoliWamp-x.x x or DoliWamp-x.x.x-dev or DoliWamp-x.x.x-beta -OutputBaseFilename=DoliWamp-3.1.0-beta +OutputBaseFilename=DoliWamp-3.1.0 ; Define full path from wich all relative path are defined ; You must modify this to put here your dolibarr root directory SourceDir=C:\Mes Developpements\dolibarr diff --git a/build/makepack-dolibarr.pl b/build/makepack-dolibarr.pl index 28398768ae9..ba59db8d4ce 100644 --- a/build/makepack-dolibarr.pl +++ b/build/makepack-dolibarr.pl @@ -11,7 +11,7 @@ use Cwd; $PROJECT="dolibarr"; $MAJOR="3"; $MINOR="1"; -$BUILD="0-beta"; # Mettre x pour release, x-dev pour dev, x-beta pour beta, x-rc pour release candidate +$BUILD="0-rc"; # Mettre x pour release, x-dev pour dev, x-beta pour beta, x-rc pour release candidate $RPMSUBVERSION="auto"; # auto use value found into BUILD @LISTETARGET=("TGZ","ZIP","RPM_GENERIC","RPM_FEDORA","RPM_MANDRIVA","RPM_OPENSUSE","DEB","APS","EXEDOLIWAMP","SNAPSHOT"); # Possible packages diff --git a/build/pad/pad_dolibarr.xml b/build/pad/pad_dolibarr.xml index 972de244b79..4f86aedd989 100644 --- a/build/pad/pad_dolibarr.xml +++ b/build/pad/pad_dolibarr.xml @@ -34,8 +34,8 @@ Dolibarr - 3.1..0 - 07 + 3.1.0 + 09 09 2011 diff --git a/build/pad/pad_doliwamp.xml b/build/pad/pad_doliwamp.xml index 6e860da929b..b76fe5ab49b 100644 --- a/build/pad/pad_doliwamp.xml +++ b/build/pad/pad_doliwamp.xml @@ -35,7 +35,7 @@ DoliWamp 3.1.0 - 07 + 09 09 2011 diff --git a/build/rpm/dolibarr_fedora.spec b/build/rpm/dolibarr_fedora.spec index 78710106a50..0e0fd599b90 100755 --- a/build/rpm/dolibarr_fedora.spec +++ b/build/rpm/dolibarr_fedora.spec @@ -232,5 +232,5 @@ fi %changelog -* Wed Jul 31 2011 Laurent Destailleur 3.2.0-0.1.a +* Wed Jul 31 2011 Laurent Destailleur 3.1.0-0.3.rc1 - Initial version (#723326) diff --git a/build/rpm/dolibarr_generic.spec b/build/rpm/dolibarr_generic.spec index 649cacf0451..d24237ee1f3 100755 --- a/build/rpm/dolibarr_generic.spec +++ b/build/rpm/dolibarr_generic.spec @@ -312,5 +312,5 @@ fi %changelog -* Wed Jul 31 2011 Laurent Destailleur 3.2.0-0.1.a +* Wed Jul 31 2011 Laurent Destailleur 3.1.0-0.3.rc1 - Initial version (#723326) diff --git a/build/rpm/dolibarr_mandriva.spec b/build/rpm/dolibarr_mandriva.spec index 0908c92ce7a..8da0f52b077 100755 --- a/build/rpm/dolibarr_mandriva.spec +++ b/build/rpm/dolibarr_mandriva.spec @@ -221,5 +221,5 @@ fi %changelog -* Wed Jul 31 2011 Laurent Destailleur 3.2.0-0.1.a +* Wed Jul 31 2011 Laurent Destailleur 3.1.0-0.3.rc1 - Initial version (#723326) diff --git a/build/rpm/dolibarr_opensuse.spec b/build/rpm/dolibarr_opensuse.spec index 9b235945526..dc6620bb25c 100755 --- a/build/rpm/dolibarr_opensuse.spec +++ b/build/rpm/dolibarr_opensuse.spec @@ -225,5 +225,5 @@ fi %changelog -* Wed Jul 31 2011 Laurent Destailleur 3.2.0-0.1.a +* Wed Jul 31 2011 Laurent Destailleur 3.1.0-0.3.rc1 - Initial version (#723326) diff --git a/htdocs/filefunc.inc.php b/htdocs/filefunc.inc.php index 0bb3054197d..3b4a5fa50b9 100644 --- a/htdocs/filefunc.inc.php +++ b/htdocs/filefunc.inc.php @@ -30,7 +30,7 @@ * \version $Id: filefunc.inc.php,v 1.22 2011/08/04 12:07:29 eldy Exp $ */ -define('DOL_VERSION','3.1.0-beta'); // Also defined in htdocs/install/inc.php (Ex: x.y.z-alpha, x.y.z) +define('DOL_VERSION','3.1.0'); // Also defined in htdocs/install/inc.php (Ex: x.y.z-alpha, x.y.z) define('EURO',chr(128)); // Definition des constantes syslog diff --git a/htdocs/install/inc.php b/htdocs/install/inc.php index 14ec003c6cf..537a7ca3704 100644 --- a/htdocs/install/inc.php +++ b/htdocs/install/inc.php @@ -24,7 +24,7 @@ * \version $Id: inc.php,v 1.139 2011/08/05 23:47:34 eldy Exp $ */ -define('DOL_VERSION','3.1.0-beta'); // Also defined in htdocs/master.inc.php (Ex: x.y.z-alpha, x.y.z) +define('DOL_VERSION','3.1.0'); // Also defined in htdocs/master.inc.php (Ex: x.y.z-alpha, x.y.z) require_once('../core/class/translate.class.php'); require_once('../lib/functions.lib.php'); diff --git a/htdocs/support/inc.php b/htdocs/support/inc.php index 337c7cb178e..2e17f5bceae 100644 --- a/htdocs/support/inc.php +++ b/htdocs/support/inc.php @@ -24,7 +24,7 @@ * \version $Id: inc.php,v 1.32 2011/08/07 13:10:26 eldy Exp $ */ -define('DOL_VERSION','2.5-dev'); // Also defined in htdocs/master.inc.php +define('DOL_VERSION','3.1.0'); // Also defined in htdocs/master.inc.php require_once('../core/class/translate.class.php'); require_once('../lib/functions.lib.php');