From b020dbf96fb51fb5dae633129372f669a34fbae2 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 26 Sep 2012 13:35:18 +0200 Subject: [PATCH] Prepare 3.3.3 --- build/doxygen/dolibarr-doxygen.doxyfile | 2 +- build/exe/doliwamp/doliwamp.iss | 4 ++-- build/makepack-dolibarr.pl | 2 +- build/makepack-howto.txt | 2 +- build/pad/pad_dolibarr.xml | 4 ++-- build/pad/pad_doliwamp.xml | 4 ++-- build/rpm/dolibarr_fedora.spec | 2 +- build/rpm/dolibarr_generic.spec | 2 +- build/rpm/dolibarr_mandriva.spec | 2 +- build/rpm/dolibarr_opensuse.spec | 2 +- htdocs/filefunc.inc.php | 2 +- htdocs/install/inc.php | 2 +- htdocs/support/inc.php | 2 +- 13 files changed, 16 insertions(+), 16 deletions(-) diff --git a/build/doxygen/dolibarr-doxygen.doxyfile b/build/doxygen/dolibarr-doxygen.doxyfile index 772e3f97a11..d9f94947aaa 100644 --- a/build/doxygen/dolibarr-doxygen.doxyfile +++ b/build/doxygen/dolibarr-doxygen.doxyfile @@ -31,7 +31,7 @@ PROJECT_NAME = dolibarr # This could be handy for archiving the generated documentation or # if some version control system is used. -PROJECT_NUMBER = 3.2.0 +PROJECT_NUMBER = 3.2.3 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) # base path where the generated documentation will be put. diff --git a/build/exe/doliwamp/doliwamp.iss b/build/exe/doliwamp/doliwamp.iss index 9fbed8b0981..91a894df9eb 100644 --- a/build/exe/doliwamp/doliwamp.iss +++ b/build/exe/doliwamp/doliwamp.iss @@ -17,9 +17,9 @@ ; ----- 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.2.2 +AppVerName=DoliWamp-3.2.3 ; 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.2.2 +OutputBaseFilename=DoliWamp-3.2.3 ; Define full path from wich all relative path are defined ; You must modify this to put here your dolibarr root directory ;SourceDir=C:\Documents and Settings\ldestail\git\dolibarr_old diff --git a/build/makepack-dolibarr.pl b/build/makepack-dolibarr.pl index 04692691c7f..d92e3ef2936 100755 --- a/build/makepack-dolibarr.pl +++ b/build/makepack-dolibarr.pl @@ -10,7 +10,7 @@ use Cwd; $PROJECT="dolibarr"; $MAJOR="3"; $MINOR="2"; -$BUILD="2"; # Mettre x pour release, x-dev pour dev, x-beta pour beta, x-rc pour release candidate +$BUILD="3"; # 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/makepack-howto.txt b/build/makepack-howto.txt index 2cbb9d44383..5d034467d3d 100644 --- a/build/makepack-howto.txt +++ b/build/makepack-howto.txt @@ -34,7 +34,7 @@ This files describe steps made by Dolibarr packaging team to make a complete release of Dolibarr, step by step. - Check all files are commited. -- Update version/info in /ChangeLog and /filefunc.inc.php +- Update version/info in /ChangeLog - Update version number with x.x.x-y in build/makepack-dolibarr.pl - Update version number with x.x.x-y in build/exe/doliwamp/doliwamp.iss - Update version number with x.x.x-y in htdocs/filefunc.inc.php diff --git a/build/pad/pad_dolibarr.xml b/build/pad/pad_dolibarr.xml index 64fa42ecba6..025776f7b17 100644 --- a/build/pad/pad_dolibarr.xml +++ b/build/pad/pad_dolibarr.xml @@ -34,9 +34,9 @@ Dolibarr - 3.2.2 + 3.2.3 09 - 10 + 24 2012 diff --git a/build/pad/pad_doliwamp.xml b/build/pad/pad_doliwamp.xml index 85d6cdd1fef..328645c2b83 100644 --- a/build/pad/pad_doliwamp.xml +++ b/build/pad/pad_doliwamp.xml @@ -34,9 +34,9 @@ DoliWamp - 3.2.2 + 3.2.3 09 - 10 + 24 2012 diff --git a/build/rpm/dolibarr_fedora.spec b/build/rpm/dolibarr_fedora.spec index 85ca7508b2f..931895dc507 100755 --- a/build/rpm/dolibarr_fedora.spec +++ b/build/rpm/dolibarr_fedora.spec @@ -312,5 +312,5 @@ fi %changelog -* Mon Jul 23 2012 Laurent Destailleur 3.2.2-0.3 +* Mon Sep 24 2012 Laurent Destailleur 3.2.3-0.3 - Initial version (#723326) diff --git a/build/rpm/dolibarr_generic.spec b/build/rpm/dolibarr_generic.spec index b92bb220e78..2f07275c1d4 100755 --- a/build/rpm/dolibarr_generic.spec +++ b/build/rpm/dolibarr_generic.spec @@ -368,5 +368,5 @@ fi %changelog -* Mon Jul 23 2012 Laurent Destailleur 3.2.2-0.3 +* Mon Sep 24 2012 Laurent Destailleur 3.2.3-0.3 - Initial version (#723326) diff --git a/build/rpm/dolibarr_mandriva.spec b/build/rpm/dolibarr_mandriva.spec index 9ef685919ad..e99cb294784 100755 --- a/build/rpm/dolibarr_mandriva.spec +++ b/build/rpm/dolibarr_mandriva.spec @@ -301,5 +301,5 @@ fi %changelog -* Mon Jul 23 2012 Laurent Destailleur 3.2.2-0.3 +* Mon Sep 24 2012 Laurent Destailleur 3.2.3-0.3 - Initial version (#723326) diff --git a/build/rpm/dolibarr_opensuse.spec b/build/rpm/dolibarr_opensuse.spec index 42740b18e07..17487905dd3 100755 --- a/build/rpm/dolibarr_opensuse.spec +++ b/build/rpm/dolibarr_opensuse.spec @@ -306,5 +306,5 @@ fi %changelog -* Mon Jul 23 2012 Laurent Destailleur 3.2.2-0.3 +* Mon Sep 24 2012 Laurent Destailleur 3.2.3-0.3 - Initial version (#723326) diff --git a/htdocs/filefunc.inc.php b/htdocs/filefunc.inc.php index cac66e7c36b..1ff8878c03f 100755 --- 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.2.2'); // Also defined in htdocs/install/inc.php (Ex: x.y.z-alpha, x.y.z) +if (! defined('DOL_VERSION')) define('DOL_VERSION','3.2.3'); // Also defined in htdocs/install/inc.php (Ex: x.y.z-alpha, x.y.z) if (! defined('EURO')) define('EURO',chr(128)); // Define syslog constants diff --git a/htdocs/install/inc.php b/htdocs/install/inc.php index c2203544c12..0e61d1bab4c 100644 --- a/htdocs/install/inc.php +++ b/htdocs/install/inc.php @@ -24,7 +24,7 @@ * \brief File that define environment for support pages */ -define('DOL_VERSION','3.2.2'); // Also defined in htdocs/master.inc.php (Ex: x.y.z-alpha, x.y.z) +define('DOL_VERSION','3.2.3'); // Also defined in htdocs/master.inc.php (Ex: x.y.z-alpha, x.y.z) // Define DOL_DOCUMENT_ROOT an ADODB_PATH used for install/upgrade process if (! defined('DOL_DOCUMENT_ROOT')) define('DOL_DOCUMENT_ROOT', '..'); diff --git a/htdocs/support/inc.php b/htdocs/support/inc.php index 4665a3d2b36..cf45782d94d 100644 --- a/htdocs/support/inc.php +++ b/htdocs/support/inc.php @@ -24,7 +24,7 @@ * \brief File that define environment for support pages */ -define('DOL_VERSION','3.2.2'); // Also defined in htdocs/master.inc.php +define('DOL_VERSION','3.2.3'); // Also defined in htdocs/master.inc.php // Define DOL_DOCUMENT_ROOT an ADODB_PATH used for install/upgrade process if (! defined('DOL_DOCUMENT_ROOT')) define('DOL_DOCUMENT_ROOT', '..');