ACE+TAO-6_4_0

61 files changed, 302 insertions, 70 deletions

diff --git a/ACE/ChangeLogs/ACE-6_4_0 b/ACE/ChangeLogs/ACE-6_4_0
new file mode 100644
index 00000000000..4289b197947
--- /dev/null
+++ b/ACE/ChangeLogs/ACE-6_4_0
@@ -0,0 +1,155 @@
+commit 21d9aeb246af54f23f9054b938e2d4af3dd24e31
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Sun Jul 3 10:05:55 2016 +0200
+
+    Added reduced include of ace/Auto_Ptr.h
+        * ACE/NEWS:
+
+commit 8e3f34f5f3cf09f3e5ac9d35b03cc110959cdc31
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Fri Jul 1 16:43:46 2016 +0200
+
+    Updated for next release
+        * ACE/NEWS:
+        * TAO/NEWS:
+
+commit bbae1c3cd833396912cb6931dcab3edde94fd0f6
+Merge: 14f0e5a 9cf2554
+Author: Johnny Willemsen <jwillemsen@users.noreply.github.com>
+Date:   Fri Jul 1 08:55:18 2016 +0200
+
+    Merge pull request #268 from jwillemsen/master
+    
+    Improved documentation
+
+commit 9cf255458ea0917547b6e77c3d2f62f35aab3958
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Fri Jul 1 08:54:41 2016 +0200
+
+    Improved documentiton
+        * ACE/ACE-INSTALL.html:
+
+commit 14f0e5a70e352cd833e9b71fc41bb1c4eb232510
+Merge: 8bed7fd 9f2aca3
+Author: Johnny Willemsen <jwillemsen@users.noreply.github.com>
+Date:   Fri Jul 1 08:47:19 2016 +0200
+
+    Merge pull request #267 from jwillemsen/master
+    
+    Documentation changes
+
+commit d50ed137e96ef69e1bf1491e97989e02737c0144
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Fri Jul 1 08:46:06 2016 +0200
+
+    Cleanup and refer to ACE-INSTALL.html within the package
+        * ACE/README:
+
+commit 5a1bb1428f05ebae1f9a616253024fc237d63398
+Author: Adam Mitz <mitza@ociweb.com>
+Date:   Fri Jun 17 14:51:34 2016 -0500
+
+    Auto_Ptr.h fixup for ACE netsvcs
+
+commit 7767d0dd86da1d81ebe619f02e5716cac1ea4987
+Author: Adam Mitz <mitza@ociweb.com>
+Date:   Fri Jun 17 09:16:49 2016 -0500
+
+    Removed include of ace/Auto_Ptr.h where not needed
+    
+    GCC 6.1 by default issues warnings when seeing std::auto_ptr
+
+commit b985fa97c91e3f1846f5a5e43ce72bf6df6aa277
+Merge: 4309a39 cdcb9de
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Tue Jun 14 10:02:31 2016 +0200
+
+    Merge pull request #256 from likema/feature/cross-aarch64-mips64el
+    
+    feature/cross-aarch64-mips64el
+
+commit e8814092903b46280c792835e1497aa6cf5acaec
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Tue May 17 12:23:40 2016 +0200
+
+    Invoke new operation
+        * ACE/tests/OS_Test.cpp:
+
+commit 83330bfd1fefd26347c2c1c2773953ad9f3c7f70
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Tue May 17 12:23:09 2016 +0200
+
+    gai_strerror is defined as gai_strerrorA or gai_strerrorW on Windows dependent on Unicode settings. Adapt ACE_OS::gai_strerror for this and invoke this operation as part of a test to make sure we compile this inline code
+        * ACE/ace/OS_NS_netdb.inl:
+        * ACE/ace/ace_wchar.h:
+        * ACE/tests/OS_Test.cpp:
+
+commit dc9d4e9be26a38d42f4f5fc5245a04a5dcea6a04
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Tue May 17 09:00:50 2016 +0200
+
+    Fixed version
+
+commit 9e9ae3e3533bd44c7e75804528a23a5154c87892
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Mon May 16 15:14:54 2016 +0200
+
+    Small fix
+        * ACE/bin/make_release.py:
+
+commit d2a7d20741730f9b2d98a415df0cffb2ed502b51
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Mon May 16 10:51:12 2016 +0200
+
+    We already have micro releases for years, so introduce a MICRO version number which we use instead of the BETA number which is kept for backwards compliance
+
+commit c7413893facd6208ccd3dec05c802f641aec5f1f
+Author: Olli Savia <ops@iki.fi>
+Date:   Sat May 14 20:18:29 2016 +0300
+
+    Added ACE_TEXT() to string constants
+
+commit a11d43ae6c40b99fdf8ced5f70bbfa84ad2a20e8
+Author: Olli Savia <ops@iki.fi>
+Date:   Sat May 14 18:12:38 2016 +0300
+
+    Added helper macros to compare ACE/TAO versions
+
+commit cdcb9de8490f47d7d6c8449fbd3892c90fd7cf8f
+Author: Like Ma <likemartinma@gmail.com>
+Date:   Mon Apr 27 16:27:26 2015 +0800
+
+    Fix format specifiers of UINT64, ssize_t, size_t in Ubuntu 12.04/14.04 aarch64.
+
+commit 686af5dbc1444d3d4834acd27db92f8ef8b3fefa
+Author: Like Ma <likemartinma@gmail.com>
+Date:   Fri Jan 25 22:44:02 2013 +0800
+
+    Fix format specifiers of UINT64, ssize_t, size_t in neokylin 6.0 loongson 64 (mips64el).
+
+commit 3eebc64c2c55a7a946d5d6c76b84dc3ae5197fa1
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Fri May 6 13:00:50 2016 +0200
+
+    In kfreebasd atop is a macro which we need to undefine
+        * ACE/ace/config-kfreebsd.h:
+
+commit 11aa52c3d6e17d42853d67568100544e70187a2a
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Tue May 3 19:54:48 2016 +0200
+
+    Fixed may be used uninitialized warning
+        * ACE/ace/OS_NS_netdb.cpp:
+
+commit ce7b17aa7e482180d5eabc852060855775e08dac
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Mon May 2 10:43:24 2016 +0200
+
+    Make x.3.4 public and prepare for x.3.5
+        * ACE/NEWS:
+        * ACE/bin/diff-builds-and-group-fixed-tests-only.sh:
+        * ACE/bin/make_release.py:
+        * ACE/docs/Download.html:
+        * ACE/docs/bczar/bczar.html:
+        * ACE/etc/index.html:
+        * TAO/NEWS:
diff --git a/ACE/PROBLEM-REPORT-FORM b/ACE/PROBLEM-REPORT-FORM
index 4436188512e..8eb9c59169e 100644
--- a/ACE/PROBLEM-REPORT-FORM
+++ b/ACE/PROBLEM-REPORT-FORM
@@ -40,7 +40,7 @@
 To: ace-bugs@list.isis.vanderbilt.edu
 Subject: [area]: [synopsis]
 
-    ACE VERSION: 6.3.4
+    ACE VERSION: 6.4.0
 
     HOST MACHINE and OPERATING SYSTEM:
         If on Windows based OS's, which version of WINSOCK do you
diff --git a/ACE/VERSION b/ACE/VERSION
index 202f4f8ae30..c369d605ae4 100644
--- a/ACE/VERSION
+++ b/ACE/VERSION
@@ -1,4 +1,4 @@
-This is ACE version 6.3.4, released Mon May 02 09:57:17 CEST 2016
+This is ACE version 6.4.0, released Mon Jul 04 08:47:38 CEST 2016
 
 If you have any problems with or questions about ACE, please send
 e-mail to the ACE mailing list (ace-bugs@list.isis.vanderbilt.edu),
diff --git a/ACE/ace/Version.h b/ACE/ace/Version.h
index 1a428baa434..64ff78ae92a 100644
--- a/ACE/ace/Version.h
+++ b/ACE/ace/Version.h
@@ -1,11 +1,12 @@
 
 // -*- C++ -*-
-// This is file was automatically generated by \$ACE_ROOT/bin/make_release.py
+// This is file was automatically generated by $ACE_ROOT/bin/make_release.py
 
 #define ACE_MAJOR_VERSION 6
-#define ACE_MINOR_VERSION 3
-#define ACE_MICRO_VERSION 4
-#define ACE_BETA_VERSION 4
-#define ACE_VERSION "6.3.4"
-#define ACE_VERSION_CODE 393988
+#define ACE_MINOR_VERSION 4
+#define ACE_MICRO_VERSION 0
+#define ACE_BETA_VERSION 0
+#define ACE_VERSION "6.4.0"
+#define ACE_VERSION_CODE 394240
 #define ACE_MAKE_VERSION_CODE(a,b,c) (((a) << 16) + ((b) << 8) + (c))
+
diff --git a/ACE/debian/ace.dsc b/ACE/debian/ace.dsc
index d40e9c5f6cf..13703a5419d 100644
--- a/ACE/debian/ace.dsc
+++ b/ACE/debian/ace.dsc
@@ -1,10 +1,10 @@
 Format: 1.0
-Source: ACE+TAO-src-6.3.4
-Version: 2.3.4
+Source: ACE+TAO-src-6.4.0
+Version: 2.4.0
 Binary: ace
 Maintainer: Johnny Willemsen  <jwillemsen@remedy.nl>
 Architecture: any
 Build-Depends: gcc, make, g++, debhelper (>= 5), dpkg-dev, libssl-dev (>= 0.9.7d), dpatch (>= 2.0.10), libxt-dev (>= 4.3.0), libfltk1.1-dev (>= 1.1.4), libqt4-dev (>= 4.4~rc1-4), tk-dev, zlib1g-dev, docbook-to-man, bzip2, autoconf, automake, libtool, autotools-dev, doxygen, graphviz, libfox-1.6-dev, libzzip-dev, libbz2-dev
 Files:
- 65b34001c9605f056713a7e146b052d1 46346654 ACE+TAO-src-6.3.4.tar.gz
+ 65b34001c9605f056713a7e146b052d1 46346654 ACE+TAO-src-6.4.0.tar.gz
 
diff --git a/ACE/debian/debian.control b/ACE/debian/debian.control
index 2312754ffe1..0b4be51f87a 100644
--- a/ACE/debian/debian.control
+++ b/ACE/debian/debian.control
@@ -27,7 +27,7 @@ Description: makefile, project, and workspace creator
   * mpc-ace: generates project files for a single target
   * mwc-ace: generates workspace files for a set of projects
 
-Package: libace-6.3.4
+Package: libace-6.4.0
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -45,7 +45,7 @@ Description: C++ network programming framework
 Package: libace-dev
 Architecture: any
 Section: libdevel
-Depends: libace-6.3.4 (= ${binary:Version}), ${misc:Depends}
+Depends: libace-6.4.0 (= ${binary:Version}), ${misc:Depends}
 Suggests: libace-doc, libtao-dev, pkg-config
 Replaces: mpc-ace (<< 5.6.3-4)
 Description: C++ network programming framework - development files
@@ -62,7 +62,7 @@ Description: C++ network programming framework - documentation
  This package contains the ACE overview documentation, tutorials,
  examples, and information regarding upstream development.
 
-Package: libace-ssl-6.3.4
+Package: libace-ssl-6.4.0
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -73,12 +73,12 @@ Description: ACE secure socket layer library
 Package: libace-ssl-dev
 Architecture: any
 Section: libdevel
-Depends: libace-ssl-6.3.3 (= ${binary:Version}), libace-dev (= ${binary:Version}), libssl-dev (>= 6.3.4d), ${misc:Depends}
+Depends: libace-ssl-6.3.3 (= ${binary:Version}), libace-dev (= ${binary:Version}), libssl-dev (>= 6.4.0d), ${misc:Depends}
 Description: ACE secure socket layer library - development files
  This package contains the header files and static library for the ACE
  SSL library.
 
-Package: libace-rmcast-6.3.4
+Package: libace-rmcast-6.4.0
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -92,12 +92,12 @@ Description: ACE reliable multicast library
 Package: libace-rmcast-dev
 Architecture: any
 Section: libdevel
-Depends: libace-rmcast-6.3.4 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libace-rmcast-6.4.0 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
 Description: ACE reliable multicast library - development files
  This package contains the header files and static library for the ACE
  reliable multicast library.
 
-Package: libace-tmcast-6.3.4
+Package: libace-tmcast-6.4.0
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -111,12 +111,12 @@ Description: ACE transactional multicast library
 Package: libace-tmcast-dev
 Architecture: any
 Section: libdevel
-Depends: libace-tmcast-6.3.4 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libace-tmcast-6.4.0 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
 Description: ACE transactional multicast library - development files
  This package contains the header files and static library for the ACE
  transactional multicast library.
 
-Package: libace-htbp-6.3.4
+Package: libace-htbp-6.4.0
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -130,12 +130,12 @@ Description: ACE protocol over HTTP tunneling library
 Package: libace-htbp-dev
 Architecture: any
 Section: libdevel
-Depends: libace-htbp-6.3.4 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libace-htbp-6.4.0 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
 Description: ACE protocol over HTTP tunneling library - development files
  This package contains the header files and static library for the ACE
  HTBP library.
 
-Package: libace-inet-6.3.4
+Package: libace-inet-6.4.0
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -146,15 +146,15 @@ Description: ACE Inet protocol library
 Package: libace-inet-dev
 Architecture: any
 Section: libdevel
-Depends: libace-inet-6.3.4 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libace-inet-6.4.0 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
 Description: ACE Inet protocol library - development files
  This package contains the header files and static library for the ACE
  Inet protocol library.
 
-Package: libace-inet-ssl-6.3.4
+Package: libace-inet-ssl-6.4.0
 Architecture: any
 Section: libs
-Depends: libace-inet-6.3.3, libace-ssl-6.3.4, ${shlibs:Depends}, ${misc:Depends}
+Depends: libace-inet-6.3.3, libace-ssl-6.4.0, ${shlibs:Depends}, ${misc:Depends}
 Description: ACE SSL-enabled Inet protocol library
  This package provides an ACE addon library for clients (and possibly
  servers at some point) using Inet protocols which support SSL, such as
@@ -163,7 +163,7 @@ Description: ACE SSL-enabled Inet protocol library
 Package: libace-inet-ssl-dev
 Architecture: any
 Section: libdevel
-Depends: libace-inet-ssl-6.3.4 (= ${binary:Version}), libace-inet-dev (= ${binary:Version}), libace-ssl-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libace-inet-ssl-6.4.0 (= ${binary:Version}), libace-inet-dev (= ${binary:Version}), libace-ssl-dev (= ${binary:Version}), ${misc:Depends}
 Description: ACE SSL-enabled Inet protocol library - development files
  This package contains the header files and static library for the ACE
  SSL-enabled Inet protocol library.
@@ -190,7 +190,7 @@ Description: ACE perfect hash function generator (transitional package)
  .
  It can be safely removed after installation.
 
-Package: libacexml-6.3.4
+Package: libacexml-6.4.0
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -206,12 +206,12 @@ Package: libacexml-dev
 Architecture: any
 Section: libdevel
 Replaces: libace-dev (<< 5.7.7-4)
-Depends: libacexml-6.3.4 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libacexml-6.4.0 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
 Description: ACE SAX based XML parsing library - development files
  This package contains the header files and static library for the ACE
  XML parsing library.
 
-Package: libace-xml-utils-6.3.4
+Package: libace-xml-utils-6.4.0
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -225,16 +225,16 @@ Package: libace-xml-utils-dev
 Architecture: any
 Section: libdevel
 Replaces: libace-dev (<< 5.7.7-4)
-Depends: libace-xml-utils-6.3.4 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}, libxerces-c-dev
+Depends: libace-xml-utils-6.4.0 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}, libxerces-c-dev
 Description: ACE XML utility classes and methods - development files
  This package contains the header files and static library for the ACE XML
  Utils library
 
-Package: libkokyu-6.3.4
+Package: libkokyu-6.4.0
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Suggests: libtao-2.2.7, libtao-orbsvcs-2.3.4
+Suggests: libtao-2.2.7, libtao-orbsvcs-2.4.0
 Description: ACE scheduling and dispatching library
  Kokyu is a library designed to provide flexible scheduling and
  dispatching services.
@@ -245,12 +245,12 @@ Description: ACE scheduling and dispatching library
 Package: libkokyu-dev
 Architecture: any
 Section: libdevel
-Depends: libkokyu-6.3.4 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libkokyu-6.4.0 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
 Description: ACE scheduling and dispatching library - development files
  This package contains the header files and static library for the ACE
  scheduling and dispatching library.
 
-Package: libace-qtreactor-6.3.4
+Package: libace-qtreactor-6.4.0
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -269,12 +269,12 @@ Description: ACE-GUI reactor integration for Qt
 Package: libace-qtreactor-dev
 Architecture: any
 Section: libdevel
-Depends: libace-qtreactor-6.3.4 (= ${binary:Version}), libace-dev (= ${binary:Version}), libqt4-dev, ${misc:Depends}
+Depends: libace-qtreactor-6.4.0 (= ${binary:Version}), libace-dev (= ${binary:Version}), libqt4-dev, ${misc:Depends}
 Description: ACE-GUI reactor integration for Qt - development files
  This package contains header files and static library for the ACE-Qt
  reactor integration.
 
-Package: libace-xtreactor-6.3.4
+Package: libace-xtreactor-6.4.0
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -292,12 +292,12 @@ Description: ACE-GUI reactor integration for Xt
 Package: libace-xtreactor-dev
 Architecture: any
 Section: libdevel
-Depends: libace-xtreactor-6.3.3 (= ${binary:Version}), libace-dev (= ${binary:Version}), libxt-dev (>= 6.3.4), ${misc:Depends}
+Depends: libace-xtreactor-6.3.3 (= ${binary:Version}), libace-dev (= ${binary:Version}), libxt-dev (>= 6.4.0), ${misc:Depends}
 Description: ACE-GUI reactor integration for Xt - development files
  This package contains header files and static library for the ACE-Xt
  reactor integration.
 
-Package: libace-tkreactor-6.3.4
+Package: libace-tkreactor-6.4.0
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -316,12 +316,12 @@ Description: ACE-GUI reactor integration for Tk
 Package: libace-tkreactor-dev
 Architecture: any
 Section: libdevel
-Depends: libace-tkreactor-6.3.4 (= ${binary:Version}), libace-dev (= ${binary:Version}), tk-dev (>= 8.5), ${misc:Depends}
+Depends: libace-tkreactor-6.4.0 (= ${binary:Version}), libace-dev (= ${binary:Version}), tk-dev (>= 8.5), ${misc:Depends}
 Description: ACE-GUI reactor integration for Tk - development files
  This package contains header files and static library for the ACE-Tk
  reactor integration.
 
-Package: libace-flreactor-6.3.4
+Package: libace-flreactor-6.4.0
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -339,12 +339,12 @@ Description: ACE-GUI reactor integration for FLTK
 Package: libace-flreactor-dev
 Architecture: any
 Section: libdevel
-Depends: libace-flreactor-6.3.3 (= ${binary:Version}), libace-dev (= ${binary:Version}), libfltk1.1-dev (>= 6.3.4), ${misc:Depends}
+Depends: libace-flreactor-6.3.3 (= ${binary:Version}), libace-dev (= ${binary:Version}), libfltk1.1-dev (>= 6.4.0), ${misc:Depends}
 Description: ACE-GUI reactor integration for FLTK - development files
  This package contains header files and static library for the ACE-FLTK
  reactor integration.
 
-Package: libace-foxreactor-6.3.4
+Package: libace-foxreactor-6.4.0
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -361,12 +361,12 @@ Description: ACE-GUI reactor integration for FOX
 Package: libace-foxreactor-dev
 Architecture: any
 Section: libdevel
-Depends: libace-foxreactor-6.3.4 (= ${binary:Version}), libace-dev (= ${binary:Version}), libfox-1.6-dev, ${misc:Depends}
+Depends: libace-foxreactor-6.4.0 (= ${binary:Version}), libace-dev (= ${binary:Version}), libfox-1.6-dev, ${misc:Depends}
 Description: ACE-GUI reactor integration for FOX - development files
  This package contains header files and static library for the ACE-FOX
  reactor integration.
 
-Package: libtao-2.3.4
+Package: libtao-2.4.0
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -381,7 +381,7 @@ Package: libtao-dev
 Architecture: any
 Section: libdevel
 Replaces: libtao-orbsvcs-dev (<< 5.7.7-4)
-Depends: libtao-2.3.4 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libtao-2.4.0 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
 Suggests: libtao-doc, libtao-orbsvcs-dev
 Description: ACE based CORBA ORB core libraries - development files
  This package contains the header files for TAO. Due to the size of
@@ -397,7 +397,7 @@ Description: ACE based CORBA ORB core libraries - documentation
  This package contains the TAO overview documentation, tutorials,
  examples, and information regarding upstream development.
 
-Package: libtao-orbsvcs-2.3.4
+Package: libtao-orbsvcs-2.4.0
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -408,14 +408,14 @@ Package: libtao-orbsvcs-dev
 Architecture: any
 Section: libdevel
 Replaces: libtao-dev (<< 5.7.7-4)
-Depends: libtao-orbsvcs-2.3.4 (= ${binary:Version}), libtao-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libtao-orbsvcs-2.4.0 (= ${binary:Version}), libtao-dev (= ${binary:Version}), ${misc:Depends}
 Description: TAO CORBA services - development files
  This package contains the header files for the TAO CORBA services.
  .
  The examples and some documentation have been included as well, but the
  static libraries have been left out due to their size (over 400MB).
 
-Package: libtao-qtresource-2.3.4
+Package: libtao-qtresource-2.4.0
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -426,12 +426,12 @@ Description: TAO-GUI reactor integration for Qt
 Package: libtao-qtresource-dev
 Architecture: any
 Section: libdevel
-Depends: libtao-qtresource-2.3.4 (= ${binary:Version}), libace-qtreactor-dev (= ${binary:Version}), libtao-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libtao-qtresource-2.4.0 (= ${binary:Version}), libace-qtreactor-dev (= ${binary:Version}), libtao-dev (= ${binary:Version}), ${misc:Depends}
 Description: TAO-GUI reactor integration for Qt - development files
  This package contains header files and static library for the TAO-Qt
  reactor integration.
 
-Package: libtao-xtresource-2.3.4
+Package: libtao-xtresource-2.4.0
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -442,12 +442,12 @@ Description: TAO-GUI reactor integration for Xt
 Package: libtao-xtresource-dev
 Architecture: any
 Section: libdevel
-Depends: libtao-xtresource-2.3.4 (= ${binary:Version}), libace-xtreactor-dev (= ${binary:Version}), libtao-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libtao-xtresource-2.4.0 (= ${binary:Version}), libace-xtreactor-dev (= ${binary:Version}), libtao-dev (= ${binary:Version}), ${misc:Depends}
 Description: TAO-GUI reactor integration for Xt - development files
  This package contains header files and static library for the TAO-Xt
  reactor integration.
 
-Package: libtao-flresource-2.3.4
+Package: libtao-flresource-2.4.0
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -458,12 +458,12 @@ Description: TAO-GUI reactor integration for FLTK
 Package: libtao-flresource-dev
 Architecture: any
 Section: libdevel
-Depends: libtao-flresource-2.3.4 (= ${binary:Version}), libace-flreactor-dev (= ${binary:Version}), libtao-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libtao-flresource-2.4.0 (= ${binary:Version}), libace-flreactor-dev (= ${binary:Version}), libtao-dev (= ${binary:Version}), ${misc:Depends}
 Description: TAO-GUI reactor integration for FLTK - development files
  This package contains header files and static library for the TAO-FLTK
  reactor integration.
 
-Package: libtao-tkresource-2.3.4
+Package: libtao-tkresource-2.4.0
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -474,12 +474,12 @@ Description: TAO-GUI reactor integration for Tk
 Package: libtao-tkresource-dev
 Architecture: any
 Section: libdevel
-Depends: libtao-tkresource-2.3.4 (= ${binary:Version}), libace-tkreactor-dev (= ${binary:Version}), libtao-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libtao-tkresource-2.4.0 (= ${binary:Version}), libace-tkreactor-dev (= ${binary:Version}), libtao-dev (= ${binary:Version}), ${misc:Depends}
 Description: TAO-GUI reactor integration for Tk - development files
  This package contains header files and static library for the TAO-Tk
  reactor integration.
 
-Package: libtao-foxresource-2.3.4
+Package: libtao-foxresource-2.4.0
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -490,14 +490,14 @@ Description: TAO-GUI reactor integration for FOX
 Package: libtao-foxresource-dev
 Architecture: any
 Section: libdevel
-Depends: libtao-foxresource-2.3.4 (= ${binary:Version}), libace-foxreactor-dev (= ${binary:Version}), libtao-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libtao-foxresource-2.4.0 (= ${binary:Version}), libace-foxreactor-dev (= ${binary:Version}), libtao-dev (= ${binary:Version}), ${misc:Depends}
 Description: TAO-GUI reactor integration for FOX - development files
  This package contains header files and static library for the TAO-FOX
  reactor integration.
 
 Package: tao-idl
 Architecture: any
-Depends: g++, libtao-2.3.4 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Depends: g++, libtao-2.4.0 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
 Description: TAO IDL to C++ compiler
  This package provides an Interface Definition Language (IDL) to C++
  compiler.
@@ -507,7 +507,7 @@ Description: TAO IDL to C++ compiler
 
 Package: tao-ifr
 Architecture: any
-Depends: g++, libtao-2.3.4 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Depends: g++, libtao-2.4.0 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
 Description: TAO interface repository
  CORBA-aware programs can contact an interface repository to get
  objects' interfaces at run-time. Then they can use the Dynamic
diff --git a/ACE/debian/libace-6.3.4.docs b/ACE/debian/libace-6.4.0.docs
index 3bdab5b0089..3bdab5b0089 100644
--- a/ACE/debian/libace-6.3.4.docs
+++ b/ACE/debian/libace-6.4.0.docs
diff --git a/ACE/debian/libace-6.3.4.install b/ACE/debian/libace-6.4.0.install
index d9afda38c12..d9afda38c12 100644
--- a/ACE/debian/libace-6.3.4.install
+++ b/ACE/debian/libace-6.4.0.install
diff --git a/ACE/debian/libace-6.3.4.lintian-overrides b/ACE/debian/libace-6.4.0.lintian-overrides
index a734a623241..a734a623241 100644
--- a/ACE/debian/libace-6.3.4.lintian-overrides
+++ b/ACE/debian/libace-6.4.0.lintian-overrides
diff --git a/ACE/debian/libace-flreactor-6.3.4.install b/ACE/debian/libace-flreactor-6.4.0.install
index 528836aacee..528836aacee 100644
--- a/ACE/debian/libace-flreactor-6.3.4.install
+++ b/ACE/debian/libace-flreactor-6.4.0.install
diff --git a/ACE/debian/libace-flreactor-6.3.4.lintian-overrides b/ACE/debian/libace-flreactor-6.4.0.lintian-overrides
index 1b84bf197dc..1b84bf197dc 100644
--- a/ACE/debian/libace-flreactor-6.3.4.lintian-overrides
+++ b/ACE/debian/libace-flreactor-6.4.0.lintian-overrides
diff --git a/ACE/debian/libace-foxreactor-6.3.4.install b/ACE/debian/libace-foxreactor-6.4.0.install
index e360f29f5af..e360f29f5af 100644
--- a/ACE/debian/libace-foxreactor-6.3.4.install
+++ b/ACE/debian/libace-foxreactor-6.4.0.install
diff --git a/ACE/debian/libace-foxreactor-6.3.4.lintian-overrides b/ACE/debian/libace-foxreactor-6.4.0.lintian-overrides
index 7c835b9b8e0..7c835b9b8e0 100644
--- a/ACE/debian/libace-foxreactor-6.3.4.lintian-overrides
+++ b/ACE/debian/libace-foxreactor-6.4.0.lintian-overrides
diff --git a/ACE/debian/libace-htbp-6.3.4.install b/ACE/debian/libace-htbp-6.4.0.install
index 08103fd5cad..08103fd5cad 100644
--- a/ACE/debian/libace-htbp-6.3.4.install
+++ b/ACE/debian/libace-htbp-6.4.0.install
diff --git a/ACE/debian/libace-htbp-6.3.4.lintian-overrides b/ACE/debian/libace-htbp-6.4.0.lintian-overrides
index 63764ad81ee..63764ad81ee 100644
--- a/ACE/debian/libace-htbp-6.3.4.lintian-overrides
+++ b/ACE/debian/libace-htbp-6.4.0.lintian-overrides
diff --git a/ACE/debian/libace-inet-6.3.4.install b/ACE/debian/libace-inet-6.4.0.install
index 59a73a509d0..59a73a509d0 100644
--- a/ACE/debian/libace-inet-6.3.4.install
+++ b/ACE/debian/libace-inet-6.4.0.install
diff --git a/ACE/debian/libace-inet-6.3.4.lintian-overrides b/ACE/debian/libace-inet-6.4.0.lintian-overrides
index a801058e382..a801058e382 100644
--- a/ACE/debian/libace-inet-6.3.4.lintian-overrides
+++ b/ACE/debian/libace-inet-6.4.0.lintian-overrides
diff --git a/ACE/debian/libace-inet-ssl-6.3.4.install b/ACE/debian/libace-inet-ssl-6.4.0.install
index b9b8b9045f7..b9b8b9045f7 100644
--- a/ACE/debian/libace-inet-ssl-6.3.4.install
+++ b/ACE/debian/libace-inet-ssl-6.4.0.install
diff --git a/ACE/debian/libace-inet-ssl-6.3.4.lintian-overrides b/ACE/debian/libace-inet-ssl-6.4.0.lintian-overrides
index c105861e8c8..c105861e8c8 100644
--- a/ACE/debian/libace-inet-ssl-6.3.4.lintian-overrides
+++ b/ACE/debian/libace-inet-ssl-6.4.0.lintian-overrides
diff --git a/ACE/debian/libace-qtreactor-6.3.4.install b/ACE/debian/libace-qtreactor-6.4.0.install
index 1d371e1e571..1d371e1e571 100644
--- a/ACE/debian/libace-qtreactor-6.3.4.install
+++ b/ACE/debian/libace-qtreactor-6.4.0.install
diff --git a/ACE/debian/libace-qtreactor-6.3.4.lintian-overrides b/ACE/debian/libace-qtreactor-6.4.0.lintian-overrides
index 08d9151dbd6..08d9151dbd6 100644
--- a/ACE/debian/libace-qtreactor-6.3.4.lintian-overrides
+++ b/ACE/debian/libace-qtreactor-6.4.0.lintian-overrides
diff --git a/ACE/debian/libace-rmcast-6.3.4.install b/ACE/debian/libace-rmcast-6.4.0.install
index 86e78259853..86e78259853 100644
--- a/ACE/debian/libace-rmcast-6.3.4.install
+++ b/ACE/debian/libace-rmcast-6.4.0.install
diff --git a/ACE/debian/libace-rmcast-6.3.4.lintian-overrides b/ACE/debian/libace-rmcast-6.4.0.lintian-overrides
index 9644f06518a..9644f06518a 100644
--- a/ACE/debian/libace-rmcast-6.3.4.lintian-overrides
+++ b/ACE/debian/libace-rmcast-6.4.0.lintian-overrides
diff --git a/ACE/debian/libace-ssl-6.3.4.NEWS b/ACE/debian/libace-ssl-6.4.0.NEWS
index e5bd0e4aa10..e5bd0e4aa10 100644
--- a/ACE/debian/libace-ssl-6.3.4.NEWS
+++ b/ACE/debian/libace-ssl-6.4.0.NEWS
diff --git a/ACE/debian/libace-ssl-6.3.4.install b/ACE/debian/libace-ssl-6.4.0.install
index 8df45a6d55f..8df45a6d55f 100644
--- a/ACE/debian/libace-ssl-6.3.4.install
+++ b/ACE/debian/libace-ssl-6.4.0.install
diff --git a/ACE/debian/libace-ssl-6.3.4.lintian-overrides b/ACE/debian/libace-ssl-6.4.0.lintian-overrides
index e8ea7ddcf34..e8ea7ddcf34 100644
--- a/ACE/debian/libace-ssl-6.3.4.lintian-overrides
+++ b/ACE/debian/libace-ssl-6.4.0.lintian-overrides
diff --git a/ACE/debian/libace-tkreactor-6.3.4.install b/ACE/debian/libace-tkreactor-6.4.0.install
index 12ab35062d2..12ab35062d2 100644
--- a/ACE/debian/libace-tkreactor-6.3.4.install
+++ b/ACE/debian/libace-tkreactor-6.4.0.install
diff --git a/ACE/debian/libace-tkreactor-6.3.4.lintian-overrides b/ACE/debian/libace-tkreactor-6.4.0.lintian-overrides
index 0be73cb750c..0be73cb750c 100644
--- a/ACE/debian/libace-tkreactor-6.3.4.lintian-overrides
+++ b/ACE/debian/libace-tkreactor-6.4.0.lintian-overrides
diff --git a/ACE/debian/libace-tmcast-6.3.4.install b/ACE/debian/libace-tmcast-6.4.0.install
index e066131dea0..e066131dea0 100644
--- a/ACE/debian/libace-tmcast-6.3.4.install
+++ b/ACE/debian/libace-tmcast-6.4.0.install
diff --git a/ACE/debian/libace-tmcast-6.3.4.lintian-overrides b/ACE/debian/libace-tmcast-6.4.0.lintian-overrides
index 42c1086a791..42c1086a791 100644
--- a/ACE/debian/libace-tmcast-6.3.4.lintian-overrides
+++ b/ACE/debian/libace-tmcast-6.4.0.lintian-overrides
diff --git a/ACE/debian/libace-xml-utils-6.3.4.install b/ACE/debian/libace-xml-utils-6.4.0.install
index 2428ec9f109..2428ec9f109 100644
--- a/ACE/debian/libace-xml-utils-6.3.4.install
+++ b/ACE/debian/libace-xml-utils-6.4.0.install
diff --git a/ACE/debian/libace-xml-utils-6.3.4.lintian-overrides b/ACE/debian/libace-xml-utils-6.4.0.lintian-overrides
index c6d67613a41..c6d67613a41 100644
--- a/ACE/debian/libace-xml-utils-6.3.4.lintian-overrides
+++ b/ACE/debian/libace-xml-utils-6.4.0.lintian-overrides
diff --git a/ACE/debian/libace-xtreactor-6.3.4.install b/ACE/debian/libace-xtreactor-6.4.0.install
index c53614c7208..c53614c7208 100644
--- a/ACE/debian/libace-xtreactor-6.3.4.install
+++ b/ACE/debian/libace-xtreactor-6.4.0.install
diff --git a/ACE/debian/libace-xtreactor-6.3.4.lintian-overrides b/ACE/debian/libace-xtreactor-6.4.0.lintian-overrides
index 3bb1f71096e..3bb1f71096e 100644
--- a/ACE/debian/libace-xtreactor-6.3.4.lintian-overrides
+++ b/ACE/debian/libace-xtreactor-6.4.0.lintian-overrides
diff --git a/ACE/debian/libacexml-6.3.4.docs b/ACE/debian/libacexml-6.4.0.docs
index 002855d7915..002855d7915 100644
--- a/ACE/debian/libacexml-6.3.4.docs
+++ b/ACE/debian/libacexml-6.4.0.docs
diff --git a/ACE/debian/libacexml-6.3.4.install b/ACE/debian/libacexml-6.4.0.install
index d3e912ffa51..d3e912ffa51 100644
--- a/ACE/debian/libacexml-6.3.4.install
+++ b/ACE/debian/libacexml-6.4.0.install
diff --git a/ACE/debian/libacexml-6.3.4.lintian-overrides b/ACE/debian/libacexml-6.4.0.lintian-overrides
index 90f4b3eb86c..90f4b3eb86c 100644
--- a/ACE/debian/libacexml-6.3.4.lintian-overrides
+++ b/ACE/debian/libacexml-6.4.0.lintian-overrides
diff --git a/ACE/debian/libkokyu-6.3.4.docs b/ACE/debian/libkokyu-6.4.0.docs
index e8869c513b2..e8869c513b2 100644
--- a/ACE/debian/libkokyu-6.3.4.docs
+++ b/ACE/debian/libkokyu-6.4.0.docs
diff --git a/ACE/debian/libkokyu-6.3.4.install b/ACE/debian/libkokyu-6.4.0.install
index 62854308f96..62854308f96 100644
--- a/ACE/debian/libkokyu-6.3.4.install
+++ b/ACE/debian/libkokyu-6.4.0.install
diff --git a/ACE/debian/libkokyu-6.3.4.lintian-overrides b/ACE/debian/libkokyu-6.4.0.lintian-overrides
index b01f2e10dfd..b01f2e10dfd 100644
--- a/ACE/debian/libkokyu-6.3.4.lintian-overrides
+++ b/ACE/debian/libkokyu-6.4.0.lintian-overrides
diff --git a/ACE/debian/libtao-2.3.4.docs b/ACE/debian/libtao-2.4.0.docs
index 803353aba72..803353aba72 100644
--- a/ACE/debian/libtao-2.3.4.docs
+++ b/ACE/debian/libtao-2.4.0.docs
diff --git a/ACE/debian/libtao-2.3.4.install b/ACE/debian/libtao-2.4.0.install
index a9643d351fb..a9643d351fb 100644
--- a/ACE/debian/libtao-2.3.4.install
+++ b/ACE/debian/libtao-2.4.0.install
diff --git a/ACE/debian/libtao-2.3.4.lintian-overrides b/ACE/debian/libtao-2.4.0.lintian-overrides
index 77cc51ec2ff..77cc51ec2ff 100644
--- a/ACE/debian/libtao-2.3.4.lintian-overrides
+++ b/ACE/debian/libtao-2.4.0.lintian-overrides
diff --git a/ACE/debian/libtao-flresource-2.3.4.install b/ACE/debian/libtao-flresource-2.4.0.install
index 5d4ee6ce57a..5d4ee6ce57a 100644
--- a/ACE/debian/libtao-flresource-2.3.4.install
+++ b/ACE/debian/libtao-flresource-2.4.0.install
diff --git a/ACE/debian/libtao-flresource-2.3.4.lintian-overrides b/ACE/debian/libtao-flresource-2.4.0.lintian-overrides
index 28b7907f70b..28b7907f70b 100644
--- a/ACE/debian/libtao-flresource-2.3.4.lintian-overrides
+++ b/ACE/debian/libtao-flresource-2.4.0.lintian-overrides
diff --git a/ACE/debian/libtao-foxresource-2.3.4.install b/ACE/debian/libtao-foxresource-2.4.0.install
index 6ceb47601aa..6ceb47601aa 100644
--- a/ACE/debian/libtao-foxresource-2.3.4.install
+++ b/ACE/debian/libtao-foxresource-2.4.0.install
diff --git a/ACE/debian/libtao-foxresource-2.3.4.lintian-overrides b/ACE/debian/libtao-foxresource-2.4.0.lintian-overrides
index 0e291526088..0e291526088 100644
--- a/ACE/debian/libtao-foxresource-2.3.4.lintian-overrides
+++ b/ACE/debian/libtao-foxresource-2.4.0.lintian-overrides
diff --git a/ACE/debian/libtao-orbsvcs-2.3.4.NEWS b/ACE/debian/libtao-orbsvcs-2.4.0.NEWS
index ea0759e0ade..ea0759e0ade 100644
--- a/ACE/debian/libtao-orbsvcs-2.3.4.NEWS
+++ b/ACE/debian/libtao-orbsvcs-2.4.0.NEWS
diff --git a/ACE/debian/libtao-orbsvcs-2.3.4.install b/ACE/debian/libtao-orbsvcs-2.4.0.install
index 270eb6a9174..270eb6a9174 100644
--- a/ACE/debian/libtao-orbsvcs-2.3.4.install
+++ b/ACE/debian/libtao-orbsvcs-2.4.0.install
diff --git a/ACE/debian/libtao-orbsvcs-2.3.4.lintian-overrides b/ACE/debian/libtao-orbsvcs-2.4.0.lintian-overrides
index 8f357d027bf..8f357d027bf 100644
--- a/ACE/debian/libtao-orbsvcs-2.3.4.lintian-overrides
+++ b/ACE/debian/libtao-orbsvcs-2.4.0.lintian-overrides
diff --git a/ACE/debian/libtao-qtresource-2.3.4.install b/ACE/debian/libtao-qtresource-2.4.0.install
index 172f4c45db8..172f4c45db8 100644
--- a/ACE/debian/libtao-qtresource-2.3.4.install
+++ b/ACE/debian/libtao-qtresource-2.4.0.install
diff --git a/ACE/debian/libtao-qtresource-2.3.4.lintian-overrides b/ACE/debian/libtao-qtresource-2.4.0.lintian-overrides
index d7c2f9dac9f..d7c2f9dac9f 100644
--- a/ACE/debian/libtao-qtresource-2.3.4.lintian-overrides
+++ b/ACE/debian/libtao-qtresource-2.4.0.lintian-overrides
diff --git a/ACE/debian/libtao-tkresource-2.3.4.install b/ACE/debian/libtao-tkresource-2.4.0.install
index 7f543154b5b..7f543154b5b 100644
--- a/ACE/debian/libtao-tkresource-2.3.4.install
+++ b/ACE/debian/libtao-tkresource-2.4.0.install
diff --git a/ACE/debian/libtao-tkresource-2.3.4.lintian-overrides b/ACE/debian/libtao-tkresource-2.4.0.lintian-overrides
index 94627217c4e..94627217c4e 100644
--- a/ACE/debian/libtao-tkresource-2.3.4.lintian-overrides
+++ b/ACE/debian/libtao-tkresource-2.4.0.lintian-overrides
diff --git a/ACE/debian/libtao-xtresource-2.3.4.install b/ACE/debian/libtao-xtresource-2.4.0.install
index ab5151ed073..ab5151ed073 100644
--- a/ACE/debian/libtao-xtresource-2.3.4.install
+++ b/ACE/debian/libtao-xtresource-2.4.0.install
diff --git a/ACE/debian/libtao-xtresource-2.3.4.lintian-overrides b/ACE/debian/libtao-xtresource-2.4.0.lintian-overrides
index 3b0d1808c3c..3b0d1808c3c 100644
--- a/ACE/debian/libtao-xtresource-2.3.4.lintian-overrides
+++ b/ACE/debian/libtao-xtresource-2.4.0.lintian-overrides
diff --git a/ACE/rpmbuild/ace-tao.spec b/ACE/rpmbuild/ace-tao.spec
index 967e707aa48..0d4c163cb9f 100644
--- a/ACE/rpmbuild/ace-tao.spec
+++ b/ACE/rpmbuild/ace-tao.spec
@@ -1,6 +1,6 @@
 # Set the version number here.
-%define ACEVER  6.3.4
-%define TAOVER  2.3.4
+%define ACEVER  6.4.0
+%define TAOVER  2.4.0
 
 # Conditional build
 # Default values are
diff --git a/TAO/ChangeLogs/TAO-2_4_0 b/TAO/ChangeLogs/TAO-2_4_0
new file mode 100644
index 00000000000..43444dd6766
--- /dev/null
+++ b/TAO/ChangeLogs/TAO-2_4_0
@@ -0,0 +1,75 @@
+commit 8e3f34f5f3cf09f3e5ac9d35b03cc110959cdc31
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Fri Jul 1 16:43:46 2016 +0200
+
+    Updated for next release
+        * ACE/NEWS:
+        * TAO/NEWS:
+
+commit 14f0e5a70e352cd833e9b71fc41bb1c4eb232510
+Merge: 8bed7fd 9f2aca3
+Author: Johnny Willemsen <jwillemsen@users.noreply.github.com>
+Date:   Fri Jul 1 08:47:19 2016 +0200
+
+    Merge pull request #267 from jwillemsen/master
+    
+    Documentation changes
+
+commit 9f2aca309b7c9a8e43b611c6b3f269e10720b7f1
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Fri Jul 1 08:46:26 2016 +0200
+
+    Zapped some old empty comment headers
+        * TAO/orbsvcs/orbsvcs/CosLifeCycle.idl:
+
+commit 85c486146bc456ab33887f2157aca52a61dec9ff
+Author: Adam Mitz <mitza@ociweb.com>
+Date:   Fri Jun 17 14:09:28 2016 -0500
+
+    Updates to work with previous commit
+
+commit 7767d0dd86da1d81ebe619f02e5716cac1ea4987
+Author: Adam Mitz <mitza@ociweb.com>
+Date:   Fri Jun 17 09:16:49 2016 -0500
+
+    Removed include of ace/Auto_Ptr.h where not needed
+    
+    GCC 6.1 by default issues warnings when seeing std::auto_ptr
+
+commit 5abacc1d2a7f54d9e26320d90dcc36622454eac9
+Author: makke4ever <maarten_vanhout@msn.com>
+Date:   Tue May 24 14:29:00 2016 +0200
+
+    The test didn't fail when the startup of server3 was successful, because SpawnWaitKill not only returns -1 when the server couldn't start, but also when the server's still running after the wait.
+
+commit d2a7d20741730f9b2d98a415df0cffb2ed502b51
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Mon May 16 10:51:12 2016 +0200
+
+    We already have micro releases for years, so introduce a MICRO version number which we use instead of the BETA number which is kept for backwards compliance
+
+commit a11d43ae6c40b99fdf8ced5f70bbfa84ad2a20e8
+Author: Olli Savia <ops@iki.fi>
+Date:   Sat May 14 18:12:38 2016 +0300
+
+    Added helper macros to compare ACE/TAO versions
+
+commit d659c0f56eb90e38d3bdaf59bc52ed36ae0294d2
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Mon May 2 11:00:48 2016 +0200
+
+    Fixed typo
+        * TAO/NEWS:
+
+commit ce7b17aa7e482180d5eabc852060855775e08dac
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Mon May 2 10:43:24 2016 +0200
+
+    Make x.3.4 public and prepare for x.3.5
+        * ACE/NEWS:
+        * ACE/bin/diff-builds-and-group-fixed-tests-only.sh:
+        * ACE/bin/make_release.py:
+        * ACE/docs/Download.html:
+        * ACE/docs/bczar/bczar.html:
+        * ACE/etc/index.html:
+        * TAO/NEWS:
diff --git a/TAO/PROBLEM-REPORT-FORM b/TAO/PROBLEM-REPORT-FORM
index 3bdfbdaa3a4..3dfcb5081b9 100644
--- a/TAO/PROBLEM-REPORT-FORM
+++ b/TAO/PROBLEM-REPORT-FORM
@@ -40,8 +40,8 @@
 To: tao-bugs@list.isis.vanderbilt.edu
 Subject: [area]: [synopsis]
 
-    TAO VERSION: 2.3.4
-    ACE VERSION: 6.3.4
+    TAO VERSION: 2.4.0
+    ACE VERSION: 6.4.0
 
     HOST MACHINE and OPERATING SYSTEM:
         If on Windows based OS's, which version of WINSOCK do you
diff --git a/TAO/VERSION b/TAO/VERSION
index 9a826421294..414d9712c3b 100644
--- a/TAO/VERSION
+++ b/TAO/VERSION
@@ -1,4 +1,4 @@
-This is TAO version 2.3.4, released Mon May 02 09:57:17 CEST 2016
+This is TAO version 2.4.0, released Mon Jul 04 08:47:38 CEST 2016
 
 If you have any problems with or questions about TAO, please send
 e-mail to the TAO mailing list (tao-bugs@list.isis.vanderbilt.edu),
diff --git a/TAO/tao/Version.h b/TAO/tao/Version.h
index c0794d551bd..5366141b2d1 100644
--- a/TAO/tao/Version.h
+++ b/TAO/tao/Version.h
@@ -1,11 +1,12 @@
 
 // -*- C++ -*-
-// This is file was automatically generated by \$ACE_ROOT/bin/make_release.py
+// This is file was automatically generated by $ACE_ROOT/bin/make_release.py
 
 #define TAO_MAJOR_VERSION 2
-#define TAO_MINOR_VERSION 3
-#define TAO_MICRO_VERSION 4
-#define TAO_BETA_VERSION 4
-#define TAO_VERSION "2.3.4"
-#define TAO_VERSION_CODE 131844
+#define TAO_MINOR_VERSION 4
+#define TAO_MICRO_VERSION 0
+#define TAO_BETA_VERSION 0
+#define TAO_VERSION "2.4.0"
+#define TAO_VERSION_CODE 132096
 #define TAO_MAKE_VERSION_CODE(a,b,c) (((a) << 16) + ((b) << 8) + (c))
+