Fix: restore dolibarr version for this branch

This commit is contained in:
Regis Houssin 2012-04-11 08:11:27 +02:00
parent 06761d9753
commit 6ef98b3d46
12 changed files with 13 additions and 17 deletions

View File

@ -2,10 +2,6 @@
English Dolibarr ChangeLog
--------------------------------------------------------------
***** ChangeLog for 3.3 compared to 3.2 *****
***** ChangeLog for 3.2 compared to 3.1 *****
WARNING: PHP lower than 5.x are no more supported.
WARNING: Because of a major datastructure change onto supplier prices tables, be aware

View File

@ -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.3.0
PROJECT_NUMBER = 3.2.0
# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
# base path where the generated documentation will be put.

View File

@ -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.3.0-alpha
AppVerName=DoliWamp-3.2.0-beta
; DoliWamp-x.x x or DoliWamp-x.x.x-dev or DoliWamp-x.x.x-beta
OutputBaseFilename=DoliWamp-3.3.0-alpha
OutputBaseFilename=DoliWamp-3.2.0-beta
; 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

View File

@ -9,8 +9,8 @@ use Cwd;
$PROJECT="dolibarr";
$MAJOR="3";
$MINOR="3";
$BUILD="0-alpha"; # Mettre x pour release, x-dev pour dev, x-beta pour beta, x-rc pour release candidate
$MINOR="2";
$BUILD="0-beta"; # 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

View File

@ -30,7 +30,7 @@ return "Regis Houssin";
# script_dolibarr_versions()
sub script_dolibarr_versions
{
return ( "3.3.0", "3.2.0", "3.1.0", "3.0.1", "2.9.0" );
return ( "3.2.0", "3.1.0", "3.0.1", "2.9.0" );
}
sub script_dolibarr_category

View File

@ -292,5 +292,5 @@ fi
%changelog
* Wed Mar 4 2012 Laurent Destailleur 3.3.0-0.1.a
* Wed Mar 4 2012 Laurent Destailleur 3.2.0-0.1.a
- Initial version (#723326)

View File

@ -348,5 +348,5 @@ fi
%changelog
* Wed Mar 4 2012 Laurent Destailleur 3.3.0-0.1.a
* Wed Mar 4 2012 Laurent Destailleur 3.2.0-0.1.a
- Initial version (#723326)

View File

@ -281,5 +281,5 @@ fi
%changelog
* Wed Mar 4 2012 Laurent Destailleur 3.3.0-0.1.a
* Wed Mar 4 2012 Laurent Destailleur 3.2.0-0.1.a
- Initial version (#723326)

View File

@ -286,5 +286,5 @@ fi
%changelog
* Wed Mar 4 2012 Laurent Destailleur 3.3.0-0.1.a
* Wed Mar 4 2012 Laurent Destailleur 3.2.0-0.1.a
- Initial version (#723326)

View File

@ -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.3.0-alpha'); // Also defined in htdocs/install/inc.php (Ex: x.y.z-alpha, x.y.z)
if (! defined('DOL_VERSION')) define('DOL_VERSION','3.2.0-beta'); // 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

View File

@ -24,7 +24,7 @@
* \brief File that define environment for support pages
*/
define('DOL_VERSION','3.3.0-alpha'); // Also defined in htdocs/master.inc.php (Ex: x.y.z-alpha, x.y.z)
define('DOL_VERSION','3.2.0-beta'); // 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', '..');

View File

@ -24,7 +24,7 @@
* \brief File that define environment for support pages
*/
define('DOL_VERSION','3.3.0-alpha'); // Also defined in htdocs/master.inc.php
define('DOL_VERSION','3.2.0-beta'); // 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', '..');