From 9e1b0d1abceeaebd96cfeac2c623dd16cec10eeb Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 4 Dec 2014 15:09:47 +0100
Subject: [PATCH] Prepare 3.5.6
---
ChangeLog | 8 ++++++++
build/debian/changelog | 7 +++++++
build/exe/doliwamp/doliwamp.iss | 4 ++--
build/makepack-howto.txt | 1 -
build/rpm/dolibarr_fedora.spec | 3 +++
build/rpm/dolibarr_generic.spec | 3 +++
build/rpm/dolibarr_mandriva.spec | 3 +++
build/rpm/dolibarr_opensuse.spec | 3 +++
htdocs/filefunc.inc.php | 2 +-
9 files changed, 30 insertions(+), 4 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index bab2b804a5c..7a65eef7fc9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,14 @@ English Dolibarr ChangeLog
***** ChangeLog for 3.5.6 compared to 3.5.5 *****
Fix: Avoid missing class error for fetch_thirdparty method #1973
+Fix: Can't update phone_pro from web service
+Fix: Some security holes.
+Fix: copy extrafields when creating order from proposal.
+Fix: report on action was not filtering by environment.
+Fix: Avoid missing class error.
+Fix: Add function dolEscapeXML.
+Fix: Bad days and month reported by function.
+Fix: Bad margin calculation.
***** ChangeLog for 3.5.5 compared to 3.5.4 *****
Fix: Holiday module was broken. Initializaion of amount of holidays failed.
diff --git a/build/debian/changelog b/build/debian/changelog
index aeba0dfa190..e1f40514d9a 100644
--- a/build/debian/changelog
+++ b/build/debian/changelog
@@ -1,3 +1,10 @@
+dolibarr (3.5.6-3) unstable; urgency=low
+
+ [ Laurent Destailleur (eldy) ]
+ * New upstream release.
+
+ -- Laurent Destailleur (eldy) <eldy@users.sourceforge.net> Tue, 2 Dec 2014 12:00:00 +0100
+
dolibarr (3.5.5-3) unstable; urgency=low
[ Laurent Destailleur (eldy) ]
diff --git a/build/exe/doliwamp/doliwamp.iss b/build/exe/doliwamp/doliwamp.iss
index 5ff4e7770b0..f06ec591712 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.5.5
+AppVerName=DoliWamp-3.5.6
; 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.5.5
+OutputBaseFilename=DoliWamp-3.5.6
; ----- End of change
;OutputManifestFile=build\doliwampbuild.log
; Define full path from which all relative path are defined
diff --git a/build/makepack-howto.txt b/build/makepack-howto.txt
index 7ab0da72138..24e5f809185 100644
--- a/build/makepack-howto.txt
+++ b/build/makepack-howto.txt
@@ -13,7 +13,6 @@ beta version of Dolibarr, step by step.
- Update version number with x.y.z-w in build/debian/changelog
- Update version number with x.y.z-w in build/exe/doliwamp/doliwamp.iss
- Update version number with x.y.z-w in build/rpm/*.spec
-- Update version number with x.y in build/doxygen/dolibarr-doxygen.doxyfile
- Commit all changes.
- Add a Tag (x.y.betaz_YYYYMMDD) and push it: git push --tags
- Create a branch (x.y).
diff --git a/build/rpm/dolibarr_fedora.spec b/build/rpm/dolibarr_fedora.spec
index 92b097801b4..242d19239a5 100755
--- a/build/rpm/dolibarr_fedora.spec
+++ b/build/rpm/dolibarr_fedora.spec
@@ -331,6 +331,9 @@ 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
+* Tue Dec 2 2014 Laurent Destailleur 3.5.6-0.3
+- Upstream release
+
* Tue Jul 8 2014 Laurent Destailleur 3.5.5-0.3
- Upstream release
diff --git a/build/rpm/dolibarr_generic.spec b/build/rpm/dolibarr_generic.spec
index b2b7e745b34..d8e8349f9fb 100755
--- a/build/rpm/dolibarr_generic.spec
+++ b/build/rpm/dolibarr_generic.spec
@@ -567,6 +567,9 @@ 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
+* Tue Dec 2 2014 Laurent Destailleur 3.5.6-0.3
+- Upstream release
+
* Tue Jul 8 2014 Laurent Destailleur 3.5.5-0.3
- Upstream release
diff --git a/build/rpm/dolibarr_mandriva.spec b/build/rpm/dolibarr_mandriva.spec
index 658601980f7..9238530a308 100755
--- a/build/rpm/dolibarr_mandriva.spec
+++ b/build/rpm/dolibarr_mandriva.spec
@@ -336,6 +336,9 @@ 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
+* Tue Dec 2 2014 Laurent Destailleur 3.5.6-0.3
+- Upstream release
+
* Tue Jul 8 2014 Laurent Destailleur 3.5.5-0.3
- Upstream release
diff --git a/build/rpm/dolibarr_opensuse.spec b/build/rpm/dolibarr_opensuse.spec
index d11630c3bb9..94ce0e7e549 100755
--- a/build/rpm/dolibarr_opensuse.spec
+++ b/build/rpm/dolibarr_opensuse.spec
@@ -347,6 +347,9 @@ 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
+* Tue Dec 2 2014 Laurent Destailleur 3.5.6-0.3
+- Upstream release
+
* Tue Jul 8 2014 Laurent Destailleur 3.5.5-0.3
- Upstream release
diff --git a/htdocs/filefunc.inc.php b/htdocs/filefunc.inc.php
index 95916901c6d..9705eee2028 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.5.5');
+if (! defined('DOL_VERSION')) define('DOL_VERSION','3.5.6');
if (! defined('EURO')) define('EURO',chr(128));
// Define syslog constants
--
GitLab