From 1c6c79811da828e695eef92fb66405684df4cb61 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 6 May 2014 16:09:13 +0200 Subject: [PATCH] Prepare version 3.5.3 --- build/debian/changelog | 7 +++++++ build/doxygen/dolibarr-doxygen.doxyfile | 2 +- build/exe/doliwamp/doliwamp.iss | 4 ++-- build/makepack-howto.txt | 15 ++++++++------- build/perl/virtualmin/dolibarr.pl | 2 +- build/rpm/dolibarr_fedora.spec | 3 +++ build/rpm/dolibarr_generic.spec | 3 +++ build/rpm/dolibarr_mandriva.spec | 3 +++ build/rpm/dolibarr_opensuse.spec | 3 +++ htdocs/filefunc.inc.php | 2 +- 10 files changed, 32 insertions(+), 12 deletions(-) diff --git a/build/debian/changelog b/build/debian/changelog index a29f1b001f1..655dcd7d604 100644 --- a/build/debian/changelog +++ b/build/debian/changelog @@ -1,3 +1,10 @@ +dolibarr (3.5.3-3) unstable; urgency=low + + [ Laurent Destailleur (eldy) ] + * New upstream release. + + -- Laurent Destailleur (eldy) Fri, 2 May 2014 12:00:00 +0100 + dolibarr (3.5.2-3) unstable; urgency=low [ Laurent Destailleur (eldy) ] diff --git a/build/doxygen/dolibarr-doxygen.doxyfile b/build/doxygen/dolibarr-doxygen.doxyfile index 29c36793cfd..41095c5ecce 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.5.2 +PROJECT_NUMBER = 3.5.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 4ecf52cfb12..2375939be4b 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.5.2 +AppVerName=DoliWamp-3.5.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.5.2 +OutputBaseFilename=DoliWamp-3.5.3 ; ----- End of change ;OutputManifestFile=build\doliwampbuild.log ; Define full path from which all relative path are defined diff --git a/build/makepack-howto.txt b/build/makepack-howto.txt index dc149c5e0b8..c43d1769458 100644 --- a/build/makepack-howto.txt +++ b/build/makepack-howto.txt @@ -20,7 +20,8 @@ beta version of Dolibarr, step by step. - Create a branch (x.y). - Run makepack-dolibarr.pl to generate all packages. -- Move build files into www.dolibarr.org web site (/home/dolibarr/wwwroot/files). +- Move build files into www.dolibarr.org web site + (/home/dolibarr/wwwroot/files/lastbuild). - Post a news on dolibarr.org/dolibarr.fr - Send mail on mailings-list @@ -36,17 +37,17 @@ complete release of Dolibarr, step by step. - Update version number with x.y.z in build/debian/changelog - Update version number with x.y.z in build/exe/doliwamp/doliwamp.iss - Update version number with x.y.z in build/rpm/*.spec -- Update PAD files. - Commit all changes. - Add a Tag (x.y.z) - Build Dolibarr and DoliWamp packages with makepack-dolibarr.pl - Check content of built packages. -- Move build files (tgz+exe+deb+rpm...), ChangeLog and PAD files - into www.dolibarr.org web site (/home/dolibarr/wwwroot/files). -- Edit symbolic links in directory "/home/dolibarr/wwwroot/files" on server to - point to new files (used by PAD descriptor). -- Upload files dolibarr.*.tgz and doliwamp.*.exe on sourceforge. +- Move build files into www.dolibarr.org web site + (/home/dolibarr/wwwroot/files/stable). +- Run makepack-dolibarr.pl again with option to publish files on + sourceforge. +- Edit symbolic links in directory "/home/dolibarr/wwwroot/files/stable/xxx" + on server to point to new files (used by some web sites). - Send mail on mailings-list - Send news on OpenSource web sites (if major beta or release) diff --git a/build/perl/virtualmin/dolibarr.pl b/build/perl/virtualmin/dolibarr.pl index 1cd5d1e3b54..dceb3c20898 100644 --- a/build/perl/virtualmin/dolibarr.pl +++ b/build/perl/virtualmin/dolibarr.pl @@ -30,7 +30,7 @@ return "Regis Houssin"; # script_dolibarr_versions() sub script_dolibarr_versions { -return ( "3.5.2", "3.5.1", "3.5.0", "3.4.1", "3.4.0", "3.3.3", "3.3.2", "3.3.1", "3.3.0", "3.2.1", "3.1.1" ); +return ( "3.5.3", "3.5.2", "3.5.1", "3.5.0", "3.4.1", "3.4.0", "3.3.3", "3.3.2", "3.3.1", "3.3.0", "3.2.1", "3.1.1" ); } sub script_dolibarr_category diff --git a/build/rpm/dolibarr_fedora.spec b/build/rpm/dolibarr_fedora.spec index 6f7620d28bc..d25632cf351 100755 --- a/build/rpm/dolibarr_fedora.spec +++ b/build/rpm/dolibarr_fedora.spec @@ -331,6 +331,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 +* Fri May 2 2014 Laurent Destailleur 3.5.3-0.3 +- Upstream release + * Fri Feb 14 2014 Laurent Destailleur 3.5.2-0.3 - Upstream release diff --git a/build/rpm/dolibarr_generic.spec b/build/rpm/dolibarr_generic.spec index 5dea0fa0148..b67d0981217 100755 --- a/build/rpm/dolibarr_generic.spec +++ b/build/rpm/dolibarr_generic.spec @@ -567,6 +567,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 +* Fri May 2 2014 Laurent Destailleur 3.5.3-0.3 +- Upstream release + * Fri Feb 14 2014 Laurent Destailleur 3.5.2-0.3 - Upstream release diff --git a/build/rpm/dolibarr_mandriva.spec b/build/rpm/dolibarr_mandriva.spec index 20901c80aa9..4193de30654 100755 --- a/build/rpm/dolibarr_mandriva.spec +++ b/build/rpm/dolibarr_mandriva.spec @@ -336,6 +336,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 +* Fri May 2 2014 Laurent Destailleur 3.5.3-0.3 +- Upstream release + * Fri Feb 14 2014 Laurent Destailleur 3.5.2-0.3 - Upstream release diff --git a/build/rpm/dolibarr_opensuse.spec b/build/rpm/dolibarr_opensuse.spec index e2363fb6a3c..a539b25a3e8 100755 --- a/build/rpm/dolibarr_opensuse.spec +++ b/build/rpm/dolibarr_opensuse.spec @@ -347,6 +347,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 +* Fri May 2 2014 Laurent Destailleur 3.5.3-0.3 +- Upstream release + * Fri Feb 14 2014 Laurent Destailleur 3.5.2-0.3 - Upstream release diff --git a/htdocs/filefunc.inc.php b/htdocs/filefunc.inc.php index 3a23aa79ad1..12c4bd8a0fc 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.5.2'); +if (! defined('DOL_VERSION')) define('DOL_VERSION','3.5.3'); if (! defined('EURO')) define('EURO',chr(128)); // Define syslog constants