From bb77762950d8af8e60c7d79f82c4f70bb33954ef Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis@dolibarr.fr>
Date: Thu, 3 May 2012 12:08:57 +0200
Subject: [PATCH] Release 3.1.2
---
build/deb/changelog | 2 +-
build/doxygen/dolibarr-doxygen.doxyfile | 2 +-
build/doxygen/hudson-doxygen.doxyfile | 2 +-
build/exe/doliwamp/doliwamp.iss | 4 ++--
build/makepack-dolibarr.pl | 2 +-
build/pad/DoliWamp.pml | 2 +-
build/pad/Dolibarr.pml | 2 +-
build/pad/pad_dolibarr.xml | 2 +-
build/pad/pad_doliwamp.xml | 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 +-
17 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/build/deb/changelog b/build/deb/changelog
index bf60d2d9647..2c211296531 100644
--- a/build/deb/changelog
+++ b/build/deb/changelog
@@ -1,4 +1,4 @@
-dolibarr (3.1.1-1.1) unstable; urgency=low
+dolibarr (3.1.2-1.1) unstable; urgency=low
* Non-maintainer upload
* New upstream release.
diff --git a/build/doxygen/dolibarr-doxygen.doxyfile b/build/doxygen/dolibarr-doxygen.doxyfile
index 65605a4ad5c..1f617df0c1e 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.1
+PROJECT_NUMBER = 3.1.2
# 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 36b514d9c36..c5937faa407 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.1
+PROJECT_NUMBER = 3.1.2
# 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 9c893459f0d..283d7ee2607 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.1
+AppVerName=DoliWamp-3.1.2
; DoliWamp-x.x x or DoliWamp-x.x.x-dev or DoliWamp-x.x.x-beta
-OutputBaseFilename=DoliWamp-3.1.1
+OutputBaseFilename=DoliWamp-3.1.2
; 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 3b58e3d5698..954fbea2f5b 100755
--- a/build/makepack-dolibarr.pl
+++ b/build/makepack-dolibarr.pl
@@ -11,7 +11,7 @@ use Cwd;
$PROJECT="dolibarr";
$MAJOR="3";
$MINOR="1";
-$BUILD="1"; # Mettre x pour release, x-dev pour dev, x-beta pour beta, x-rc pour release candidate
+$BUILD="2"; # 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/pad/DoliWamp.pml b/build/pad/DoliWamp.pml
index c3b16726a85..64851c3cd9c 100644
--- a/build/pad/DoliWamp.pml
+++ b/build/pad/DoliWamp.pml
@@ -4,7 +4,7 @@
<CompanyName />
<Program_Info>
<Program_Name>DoliWamp</Program_Name>
- <Program_Version>3.1.0</Program_Version>
+ <Program_Version>3.1.2</Program_Version>
<Program_Release_Month>10</Program_Release_Month>
<Program_Release_Day>13</Program_Release_Day>
<Program_Release_Year>2011</Program_Release_Year>
diff --git a/build/pad/Dolibarr.pml b/build/pad/Dolibarr.pml
index 842ad3f1cfd..79a31e4f093 100644
--- a/build/pad/Dolibarr.pml
+++ b/build/pad/Dolibarr.pml
@@ -4,7 +4,7 @@
<CompanyName />
<Program_Info>
<Program_Name>Dolibarr</Program_Name>
- <Program_Version>3.1..0</Program_Version>
+ <Program_Version>3.1.2</Program_Version>
<Program_Release_Month>10</Program_Release_Month>
<Program_Release_Day>13</Program_Release_Day>
<Program_Release_Year>2011</Program_Release_Year>
diff --git a/build/pad/pad_dolibarr.xml b/build/pad/pad_dolibarr.xml
index 0f2b409639a..e6d9ef70a4d 100644
--- a/build/pad/pad_dolibarr.xml
+++ b/build/pad/pad_dolibarr.xml
@@ -34,7 +34,7 @@
</Company_Info>
<Program_Info>
<Program_Name>Dolibarr</Program_Name>
- <Program_Version>3.1..0</Program_Version>
+ <Program_Version>3.1.2</Program_Version>
<Program_Release_Month>10</Program_Release_Month>
<Program_Release_Day>13</Program_Release_Day>
<Program_Release_Year>2011</Program_Release_Year>
diff --git a/build/pad/pad_doliwamp.xml b/build/pad/pad_doliwamp.xml
index d5b7a50c043..12f780526d5 100644
--- a/build/pad/pad_doliwamp.xml
+++ b/build/pad/pad_doliwamp.xml
@@ -34,7 +34,7 @@
</Company_Info>
<Program_Info>
<Program_Name>DoliWamp</Program_Name>
- <Program_Version>3.1.0</Program_Version>
+ <Program_Version>3.1.2</Program_Version>
<Program_Release_Month>10</Program_Release_Month>
<Program_Release_Day>13</Program_Release_Day>
<Program_Release_Year>2011</Program_Release_Year>
diff --git a/build/perl/virtualmin/dolibarr.pl b/build/perl/virtualmin/dolibarr.pl
index b55f8a222da..2dfedbb7c8a 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.1" );
+return ( "3.1.2" );
}
sub script_dolibarr_category
diff --git a/build/rpm/dolibarr_fedora.spec b/build/rpm/dolibarr_fedora.spec
index 1b5df6dc9b4..14115cef516 100755
--- a/build/rpm/dolibarr_fedora.spec
+++ b/build/rpm/dolibarr_fedora.spec
@@ -232,5 +232,5 @@ fi
%changelog
-* Wed Jan 04 2012 Laurent Destailleur 3.1.1-0.0
+* Wed Jan 04 2012 Laurent Destailleur 3.1.2-0.0
- Initial version (#723326)
diff --git a/build/rpm/dolibarr_generic.spec b/build/rpm/dolibarr_generic.spec
index 46fd5dcb116..8c39e396a4c 100755
--- a/build/rpm/dolibarr_generic.spec
+++ b/build/rpm/dolibarr_generic.spec
@@ -312,5 +312,5 @@ fi
%changelog
-* Wed Jan 04 2012 Laurent Destailleur 3.1.1-0.0
+* Wed Jan 04 2012 Laurent Destailleur 3.1.2-0.0
- Initial version (#723326)
diff --git a/build/rpm/dolibarr_mandriva.spec b/build/rpm/dolibarr_mandriva.spec
index 9fc36a3a529..222053a1a12 100755
--- a/build/rpm/dolibarr_mandriva.spec
+++ b/build/rpm/dolibarr_mandriva.spec
@@ -221,5 +221,5 @@ fi
%changelog
-* Wed Jan 04 2012 Laurent Destailleur 3.1.1-0.0
+* Wed Jan 04 2012 Laurent Destailleur 3.1.2-0.0
- Initial version (#723326)
diff --git a/build/rpm/dolibarr_opensuse.spec b/build/rpm/dolibarr_opensuse.spec
index 82bab15d1f1..f6b52db2a68 100755
--- a/build/rpm/dolibarr_opensuse.spec
+++ b/build/rpm/dolibarr_opensuse.spec
@@ -226,5 +226,5 @@ fi
%changelog
-* Wed Jan 04 2012 Laurent Destailleur 3.1.1-0.0
+* Wed Jan 04 2012 Laurent Destailleur 3.1.2-0.0
- Initial version (#723326)
diff --git a/htdocs/filefunc.inc.php b/htdocs/filefunc.inc.php
index b582516cf9c..e8224c8fe7b 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.1'); // Also defined in htdocs/install/inc.php (Ex: x.y.z-alpha, x.y.z)
+define('DOL_VERSION','3.1.2'); // 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 e0ba1063d47..0e382049589 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.1'); // Also defined in htdocs/master.inc.php (Ex: x.y.z-alpha, x.y.z)
+define('DOL_VERSION','3.1.2'); // Also defined in htdocs/filefunc.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 699ecc6b6c8..e9074e6d007 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.1'); // Also defined in htdocs/master.inc.php
+define('DOL_VERSION','3.1.2'); // Also defined in htdocs/master.inc.php
require_once('../core/class/translate.class.php');
require_once('../lib/functions.lib.php');
--
GitLab