From 0de1fe893a6fc4ff7272c62cbf14c06a596fd1c4 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 7 Jul 2013 13:30:30 +0200
Subject: [PATCH] Prepare 3.4

---
 build/exe/doliwamp/doliwamp.iss  | 4 ++--
 build/makepack-dolibarr.pl       | 2 +-
 build/rpm/dolibarr_fedora.spec   | 4 ++--
 build/rpm/dolibarr_generic.spec  | 3 ++-
 build/rpm/dolibarr_mandriva.spec | 4 ++--
 build/rpm/dolibarr_opensuse.spec | 3 ++-
 htdocs/filefunc.inc.php          | 2 +-
 7 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/build/exe/doliwamp/doliwamp.iss b/build/exe/doliwamp/doliwamp.iss
index 41e860e5927..7510ff88152 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.4.0-beta
+AppVerName=DoliWamp-3.4.0
 ; 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.4.0-beta
+OutputBaseFilename=DoliWamp-3.4.0
 ; Define full path from wich all relative path are defined
 ; You must modify this to put here your dolibarr root directory
 ;SourceDir=Z:\home\ldestailleur\git\dolibarrxxx
diff --git a/build/makepack-dolibarr.pl b/build/makepack-dolibarr.pl
index c6bb2a1f174..dd348af17a6 100755
--- a/build/makepack-dolibarr.pl
+++ b/build/makepack-dolibarr.pl
@@ -10,7 +10,7 @@ use Cwd;
 $PROJECT="dolibarr";
 $MAJOR="3";
 $MINOR="4";
-$BUILD="0-beta";		# Mettre x pour release, x-dev pour dev, x-beta pour beta, x-rc pour release candidate
+$BUILD="0";		# 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/rpm/dolibarr_fedora.spec b/build/rpm/dolibarr_fedora.spec
index b4ced0c5088..1479a5bf023 100755
--- a/build/rpm/dolibarr_fedora.spec
+++ b/build/rpm/dolibarr_fedora.spec
@@ -320,7 +320,7 @@ then
 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
-* Sun Feb 17 2013 Laurent Destailleur 3.4.0-0.1.b
+* Sun Feb 17 2013 Laurent Destailleur 3.4.0-0.3
 - Initial version (#723326)
diff --git a/build/rpm/dolibarr_generic.spec b/build/rpm/dolibarr_generic.spec
index cdc0ce0714a..76cd214359e 100755
--- a/build/rpm/dolibarr_generic.spec
+++ b/build/rpm/dolibarr_generic.spec
@@ -538,6 +538,7 @@ 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
-* Sun Feb 17 2013 Laurent Destailleur 3.4.0-0.1.b
+* Sun Feb 17 2013 Laurent Destailleur 3.4.0-0.3
 - Initial version (#723326)
diff --git a/build/rpm/dolibarr_mandriva.spec b/build/rpm/dolibarr_mandriva.spec
index 51d911148eb..e93c6ad87a9 100755
--- a/build/rpm/dolibarr_mandriva.spec
+++ b/build/rpm/dolibarr_mandriva.spec
@@ -321,7 +321,7 @@ then
 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
-* Sun Feb 17 2013 Laurent Destailleur 3.4.0-0.1.b
+* Sun Feb 17 2013 Laurent Destailleur 3.4.0-0.3
 - Initial version (#723326)
diff --git a/build/rpm/dolibarr_opensuse.spec b/build/rpm/dolibarr_opensuse.spec
index 7744c43695b..9d35c70b419 100755
--- a/build/rpm/dolibarr_opensuse.spec
+++ b/build/rpm/dolibarr_opensuse.spec
@@ -333,6 +333,7 @@ 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
-* Sun Feb 17 2013 Laurent Destailleur 3.4.0-0.1.b
+* Sun Feb 17 2013 Laurent Destailleur 3.4.0-0.3
 - Initial version (#723326)
diff --git a/htdocs/filefunc.inc.php b/htdocs/filefunc.inc.php
index 545a0254eed..5462c1fda7f 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.4.0-beta');
+if (! defined('DOL_VERSION')) define('DOL_VERSION','3.4.0');
 if (! defined('EURO')) define('EURO',chr(128));
 
 // Define syslog constants