From 9701a5a461dcc1aa4b1e2b5d2343d9addb3ab221 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 4 Jan 2012 13:34:04 +0100 Subject: [PATCH] Prepare 3.1.1 dev --- build/doxygen/dolibarr-doxygen.doxyfile | 2 +- build/doxygen/hudson-doxygen.doxyfile | 2 +- build/exe/doliwamp/doliwamp.iss | 4 ++-- build/makepack-dolibarr.pl | 2 +- build/perl/virtualmin/dolibarr.pl | 2 +- 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 +- 12 files changed, 13 insertions(+), 13 deletions(-) diff --git a/build/doxygen/dolibarr-doxygen.doxyfile b/build/doxygen/dolibarr-doxygen.doxyfile index 889180da73d..65605a4ad5c 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.1.0 +PROJECT_NUMBER = 3.1.1 # 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/doxygen/hudson-doxygen.doxyfile b/build/doxygen/hudson-doxygen.doxyfile index 56950225a15..36b514d9c36 100644 --- a/build/doxygen/hudson-doxygen.doxyfile +++ b/build/doxygen/hudson-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.1.0 +PROJECT_NUMBER = 3.1.1 # 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 528778e9763..9c893459f0d 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-dev or DoliWamp-x.x.x-beta -AppVerName=DoliWamp-3.1.0 +AppVerName=DoliWamp-3.1.1 ; DoliWamp-x.x x or DoliWamp-x.x.x-dev or DoliWamp-x.x.x-beta -OutputBaseFilename=DoliWamp-3.1.0 +OutputBaseFilename=DoliWamp-3.1.1 ; 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 diff --git a/build/makepack-dolibarr.pl b/build/makepack-dolibarr.pl index 9acb2bb6aa2..b652bd69e64 100755 --- a/build/makepack-dolibarr.pl +++ b/build/makepack-dolibarr.pl @@ -11,7 +11,7 @@ use Cwd; $PROJECT="dolibarr"; $MAJOR="3"; $MINOR="1"; -$BUILD="0"; # Mettre x pour release, x-dev pour dev, x-beta pour beta, x-rc pour release candidate +$BUILD="1"; # 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/perl/virtualmin/dolibarr.pl b/build/perl/virtualmin/dolibarr.pl index 6d9c923c88a..b55f8a222da 100644 --- a/build/perl/virtualmin/dolibarr.pl +++ b/build/perl/virtualmin/dolibarr.pl @@ -31,7 +31,7 @@ return "Regis Houssin"; # script_dolibarr_versions() sub script_dolibarr_versions { -return ( "3.1.0" ); +return ( "3.1.1" ); } sub script_dolibarr_category diff --git a/build/rpm/dolibarr_fedora.spec b/build/rpm/dolibarr_fedora.spec index 6931be00f69..1f4266edd48 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.1.0-0.3 +* Wed January 04 2012 Laurent Destailleur 3.1.1-0.0 - Initial version (#723326) diff --git a/build/rpm/dolibarr_generic.spec b/build/rpm/dolibarr_generic.spec index 7620fbcbf36..b9829bf8eba 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.1.0-0.3 +* Wed January 04 2012 Laurent Destailleur 3.1.1-0.0 - Initial version (#723326) diff --git a/build/rpm/dolibarr_mandriva.spec b/build/rpm/dolibarr_mandriva.spec index 76dadfeaab5..680fccdc640 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.1.0-0.3 +* Wed January 04 2012 Laurent Destailleur 3.1.1-0.0 - Initial version (#723326) diff --git a/build/rpm/dolibarr_opensuse.spec b/build/rpm/dolibarr_opensuse.spec index fb0e7513a88..90d7cf0b039 100755 --- a/build/rpm/dolibarr_opensuse.spec +++ b/build/rpm/dolibarr_opensuse.spec @@ -226,5 +226,5 @@ fi %changelog -* Wed Jul 31 2011 Laurent Destailleur 3.1.0-0.3 +* Wed January 04 2012 Laurent Destailleur 3.1.1-0.0 - Initial version (#723326) diff --git a/htdocs/filefunc.inc.php b/htdocs/filefunc.inc.php index dd8556f93cc..b582516cf9c 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'); // Also defined in htdocs/install/inc.php (Ex: x.y.z-alpha, x.y.z) +define('DOL_VERSION','3.1.1'); // 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 537a7ca3704..e0ba1063d47 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'); // Also defined in htdocs/master.inc.php (Ex: x.y.z-alpha, x.y.z) +define('DOL_VERSION','3.1.1'); // 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 2e17f5bceae..699ecc6b6c8 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','3.1.0'); // Also defined in htdocs/master.inc.php +define('DOL_VERSION','3.1.1'); // Also defined in htdocs/master.inc.php require_once('../core/class/translate.class.php'); require_once('../lib/functions.lib.php');