From ec52ea9c639cd4e7453e9594e731ca00db715c65 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 29 Nov 2009 22:02:35 +0000 Subject: [PATCH] Prepare 2.7 release --- build/doap/doap_dolibarr.rdf | 4 ++-- build/exe/doliwamp/doliwamp.iss | 4 ++-- build/makepack-dolibarr.pl | 2 +- htdocs/install/inc.php | 2 +- htdocs/master.inc.php | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/build/doap/doap_dolibarr.rdf b/build/doap/doap_dolibarr.rdf index 262b61320dd..17d4c9caad1 100644 --- a/build/doap/doap_dolibarr.rdf +++ b/build/doap/doap_dolibarr.rdf @@ -48,8 +48,8 @@ stable - 2009-04-25 - 2.6 + 2009-10-20 + 2.7 diff --git a/build/exe/doliwamp/doliwamp.iss b/build/exe/doliwamp/doliwamp.iss index 285c677b5d4..f599b6e8ab0 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-2.7.0-beta +AppVerName=DoliWamp-2.7.0 ; DoliWamp-x.x x or DoliWamp-x.x.x-dev or DoliWamp-x.x.x-beta -OutputBaseFilename=DoliWamp-2.7.0-beta +OutputBaseFilename=DoliWamp-2.7.0 ; Define full path from wich all relative path are defined ; You must modify this to put here your dolibarr root directory SourceDir=C:\Work\Data\Workspace\dolibarr diff --git a/build/makepack-dolibarr.pl b/build/makepack-dolibarr.pl index 6b5b2efab05..9b4ef17d7a4 100644 --- a/build/makepack-dolibarr.pl +++ b/build/makepack-dolibarr.pl @@ -11,7 +11,7 @@ use Cwd; $PROJECT="dolibarr"; $MAJOR="2"; $MINOR="7"; -$BUILD="0-beta"; # Mettre x pour release, x-beta pour beta, x-rc pour release candidate +$BUILD="0"; # Mettre x pour release, x-beta pour beta, x-rc pour release candidate $RPMSUBVERSION="1"; # A incrementer au moment de la release @LISTETARGET=("TGZ","ZIP","RPM","DEB","EXE","EXEDOLIWAMP","SNAPSHOT"); # Possible packages diff --git a/htdocs/install/inc.php b/htdocs/install/inc.php index 44974268072..4ff4b47f2a0 100644 --- a/htdocs/install/inc.php +++ b/htdocs/install/inc.php @@ -25,7 +25,7 @@ * \version $Id$ */ -define('DOL_VERSION','2.7.0-beta'); // Also defined in htdocs/master.inc.php +define('DOL_VERSION','2.7.0'); // Also defined in htdocs/master.inc.php require_once('../translate.class.php'); require_once('../lib/functions.lib.php'); diff --git a/htdocs/master.inc.php b/htdocs/master.inc.php index 0420a6e5c37..0dfb3e1fbc4 100644 --- a/htdocs/master.inc.php +++ b/htdocs/master.inc.php @@ -31,7 +31,7 @@ * \version $Id$ */ -define('DOL_VERSION','2.7.0-beta'); // Also defined in htdocs/install/inc.php +define('DOL_VERSION','2.7.0'); // Also defined in htdocs/install/inc.php define('EURO',chr(128)); // Definition des constantes syslog