ChangeLogTag:Tue Aug 23 19:01:44 CEST 2011 Johnny Willemsen <jwillemsen@remedy.nl>

46 files changed, 89 insertions, 73 deletions

diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index d669a7cb47d..c98faa74699 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,3 +1,7 @@
+Tue Aug 23 19:01:44 CEST 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ACE version 6.0.4 released.
+
 Thu Aug 18 01:31:48 UTC 2011  Phil Mesnier  <mesnier_p@ociweb.com>
 
         * ace/Message_Block.cpp:
diff --git a/ACE/PROBLEM-REPORT-FORM b/ACE/PROBLEM-REPORT-FORM
index 10075bfd34a..34c60219c5a 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.0.3
+    ACE VERSION: 6.0.4
 
     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 d745e62929c..54346d61e40 100644
--- a/ACE/VERSION
+++ b/ACE/VERSION
@@ -1,4 +1,4 @@
-This is ACE version 6.0.3, released Thu Jun 23 13:46:08 CEST 2011
+This is ACE version 6.0.4, released Tue Aug 23 19:01:44 CEST 2011
 
 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 962f27680ed..e48bb15ec9d 100644
--- a/ACE/ace/Version.h
+++ b/ACE/ace/Version.h
@@ -5,5 +5,5 @@
 
 #define ACE_MAJOR_VERSION 6
 #define ACE_MINOR_VERSION 0
-#define ACE_BETA_VERSION 3
-#define ACE_VERSION "6.0.3"
+#define ACE_BETA_VERSION 4
+#define ACE_VERSION "6.0.4"
diff --git a/ACE/debian/ace.dsc b/ACE/debian/ace.dsc
index 10194ba7561..0075a4bf87a 100644
--- a/ACE/debian/ace.dsc
+++ b/ACE/debian/ace.dsc
@@ -1,10 +1,10 @@
 Format: 1.0
-Source: ACE+TAO+CIAO-src-6.0.3
-Version: 2.0.3
+Source: ACE+TAO+CIAO-src-6.0.4
+Version: 2.0.4
 Binary: ace
 Maintainer: Johnny Willemsen  <jwillemsen@remedy.nl>
 Architecture: any
 Build-Depends: gcc, make, g++, debhelper (>= 5), 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 (>= 8.4.7), zlib1g-dev, docbook-to-man, bzip2, autoconf, automake, libtool, autotools-dev, doxygen, graphviz
 Files:
- 65b34001c9605f056713a7e146b052d1 46346654 ACE+TAO+CIAO-src-6.0.3.tar.gz
+ 65b34001c9605f056713a7e146b052d1 46346654 ACE+TAO+CIAO-src-6.0.4.tar.gz
 
diff --git a/ACE/debian/debian.control b/ACE/debian/debian.control
index b60def9e4c6..2f7d45f0abb 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.0.3
+Package: libace-6.0.4
 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.0.3 (= ${binary:Version}), ${misc:Depends}
+Depends: libace-6.0.4 (= ${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.0.3
+Package: libace-ssl-6.0.4
 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.0.3 (= ${binary:Version}), libace-dev (= ${binary:Version}), libssl-dev (>= 0.9.7d), ${misc:Depends}
+Depends: libace-ssl-6.0.3 (= ${binary:Version}), libace-dev (= ${binary:Version}), libssl-dev (>= 6.0.4d), ${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.0.3
+Package: libace-rmcast-6.0.4
 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.0.3 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libace-rmcast-6.0.4 (= ${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.0.3
+Package: libace-tmcast-6.0.4
 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.0.3 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libace-tmcast-6.0.4 (= ${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.0.3
+Package: libace-htbp-6.0.4
 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.0.3 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libace-htbp-6.0.4 (= ${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.0.3
+Package: libace-inet-6.0.4
 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.0.3 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libace-inet-6.0.4 (= ${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.0.3
+Package: libace-inet-ssl-6.0.4
 Architecture: any
 Section: libs
-Depends: libace-inet-6.0.3, libace-ssl-6.0.3, ${shlibs:Depends}, ${misc:Depends}
+Depends: libace-inet-6.0.3, libace-ssl-6.0.4, ${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.0.3 (= ${binary:Version}), libace-inet-dev (= ${binary:Version}), libace-ssl-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libace-inet-ssl-6.0.4 (= ${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.
@@ -188,7 +188,7 @@ Description: ACE perfect hash function generator (transitional package)
  .
  It can be safely removed after installation.
 
-Package: libacexml-6.0.3
+Package: libacexml-6.0.4
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -204,16 +204,16 @@ Package: libacexml-dev
 Architecture: any
 Section: libdevel
 Replaces: libace-dev (<< 5.7.7-4)
-Depends: libacexml-6.0.3 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libacexml-6.0.4 (= ${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: libkokyu-6.0.3
+Package: libkokyu-6.0.4
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Suggests: libtao-2.0.3, libtao-orbsvcs-2.0.3
+Suggests: libtao-2.0.3, libtao-orbsvcs-2.0.4
 Description: ACE scheduling and dispatching library
  Kokyu is a library designed to provide flexible scheduling and
  dispatching services.
@@ -224,12 +224,12 @@ Description: ACE scheduling and dispatching library
 Package: libkokyu-dev
 Architecture: any
 Section: libdevel
-Depends: libkokyu-6.0.3 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libkokyu-6.0.4 (= ${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.0.3
+Package: libace-qtreactor-6.0.4
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -248,12 +248,12 @@ Description: ACE-GUI reactor integration for Qt
 Package: libace-qtreactor-dev
 Architecture: any
 Section: libdevel
-Depends: libace-qtreactor-6.0.3 (= ${binary:Version}), libace-dev (= ${binary:Version}), libqt4-dev, ${misc:Depends}
+Depends: libace-qtreactor-6.0.4 (= ${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.0.3
+Package: libace-xtreactor-6.0.4
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -271,12 +271,12 @@ Description: ACE-GUI reactor integration for Xt
 Package: libace-xtreactor-dev
 Architecture: any
 Section: libdevel
-Depends: libace-xtreactor-6.0.3 (= ${binary:Version}), libace-dev (= ${binary:Version}), libxt-dev (>= 4.3.0), ${misc:Depends}
+Depends: libace-xtreactor-6.0.3 (= ${binary:Version}), libace-dev (= ${binary:Version}), libxt-dev (>= 6.0.4), ${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.0.3
+Package: libace-tkreactor-6.0.4
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -295,12 +295,12 @@ Description: ACE-GUI reactor integration for Tk
 Package: libace-tkreactor-dev
 Architecture: any
 Section: libdevel
-Depends: libace-tkreactor-6.0.3 (= ${binary:Version}), libace-dev (= ${binary:Version}), tk-dev (>= 8.5), ${misc:Depends}
+Depends: libace-tkreactor-6.0.4 (= ${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.0.3
+Package: libace-flreactor-6.0.4
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -318,12 +318,12 @@ Description: ACE-GUI reactor integration for Fl
 Package: libace-flreactor-dev
 Architecture: any
 Section: libdevel
-Depends: libace-flreactor-6.0.3 (= ${binary:Version}), libace-dev (= ${binary:Version}), libfltk1.1-dev (>= 1.1.4), ${misc:Depends}
+Depends: libace-flreactor-6.0.3 (= ${binary:Version}), libace-dev (= ${binary:Version}), libfltk1.1-dev (>= 6.0.4), ${misc:Depends}
 Description: ACE-GUI reactor integration for Fl - development files
  This package contains header files and static library for the ACE-Fl
  reactor integration.
 
-Package: libace-foxreactor-6.0.3
+Package: libace-foxreactor-6.0.4
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -340,12 +340,12 @@ Description: ACE-GUI reactor integration for FOX
 Package: libace-foxreactor-dev
 Architecture: any
 Section: libdevel
-Depends: libace-foxreactor-6.0.3 (= ${binary:Version}), libace-dev (= ${binary:Version}), libfox-1.6-dev, ${misc:Depends}
+Depends: libace-foxreactor-6.0.4 (= ${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.0.3
+Package: libtao-2.0.4
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -360,7 +360,7 @@ Package: libtao-dev
 Architecture: any
 Section: libdevel
 Replaces: libtao-orbsvcs-dev (<< 5.7.7-4)
-Depends: libtao-2.0.3 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libtao-2.0.4 (= ${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
@@ -376,7 +376,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.0.3
+Package: libtao-orbsvcs-2.0.4
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -387,14 +387,14 @@ Package: libtao-orbsvcs-dev
 Architecture: any
 Section: libdevel
 Replaces: libtao-dev (<< 5.7.7-4)
-Depends: libtao-orbsvcs-2.0.3 (= ${binary:Version}), libtao-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libtao-orbsvcs-2.0.4 (= ${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.0.3
+Package: libtao-qtresource-2.0.4
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -405,12 +405,12 @@ Description: TAO-GUI reactor integration for Qt
 Package: libtao-qtresource-dev
 Architecture: any
 Section: libdevel
-Depends: libtao-qtresource-2.0.3 (= ${binary:Version}), libace-qtreactor-dev (= ${binary:Version}), libtao-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libtao-qtresource-2.0.4 (= ${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.0.3
+Package: libtao-xtresource-2.0.4
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -421,12 +421,12 @@ Description: TAO-GUI reactor integration for Xt
 Package: libtao-xtresource-dev
 Architecture: any
 Section: libdevel
-Depends: libtao-xtresource-2.0.3 (= ${binary:Version}), libace-xtreactor-dev (= ${binary:Version}), libtao-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libtao-xtresource-2.0.4 (= ${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.0.3
+Package: libtao-flresource-2.0.4
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -437,12 +437,12 @@ Description: TAO-GUI reactor integration for Fl
 Package: libtao-flresource-dev
 Architecture: any
 Section: libdevel
-Depends: libtao-flresource-2.0.3 (= ${binary:Version}), libace-flreactor-dev (= ${binary:Version}), libtao-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libtao-flresource-2.0.4 (= ${binary:Version}), libace-flreactor-dev (= ${binary:Version}), libtao-dev (= ${binary:Version}), ${misc:Depends}
 Description: TAO-GUI reactor integration for Fl - development files
  This package contains header files and static library for the TAO-Fl
  reactor integration.
 
-Package: libtao-tkresource-2.0.3
+Package: libtao-tkresource-2.0.4
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -453,12 +453,12 @@ Description: TAO-GUI reactor integration for Tk
 Package: libtao-tkresource-dev
 Architecture: any
 Section: libdevel
-Depends: libtao-tkresource-2.0.3 (= ${binary:Version}), libace-tkreactor-dev (= ${binary:Version}), libtao-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libtao-tkresource-2.0.4 (= ${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.0.3
+Package: libtao-foxresource-2.0.4
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -469,14 +469,14 @@ Description: TAO-GUI reactor integration for FOX
 Package: libtao-foxresource-dev
 Architecture: any
 Section: libdevel
-Depends: libtao-foxresource-2.0.3 (= ${binary:Version}), libace-foxreactor-dev (= ${binary:Version}), libtao-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libtao-foxresource-2.0.4 (= ${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.0.3 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Depends: g++, libtao-2.0.4 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
 Description: TAO IDL to C++ compiler
  This package provides an Interface Definition Language (IDL) to C++
  compiler.
@@ -486,7 +486,7 @@ Description: TAO IDL to C++ compiler
 
 Package: tao-ifr
 Architecture: any
-Depends: g++, libtao-2.0.3 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Depends: g++, libtao-2.0.4 (= ${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.0.3.docs b/ACE/debian/libace-6.0.4.docs
index 3bdab5b0089..3bdab5b0089 100644
--- a/ACE/debian/libace-6.0.3.docs
+++ b/ACE/debian/libace-6.0.4.docs
diff --git a/ACE/debian/libace-6.0.3.install b/ACE/debian/libace-6.0.4.install
index d9afda38c12..d9afda38c12 100644
--- a/ACE/debian/libace-6.0.3.install
+++ b/ACE/debian/libace-6.0.4.install
diff --git a/ACE/debian/libace-flreactor-6.0.3.install b/ACE/debian/libace-flreactor-6.0.4.install
index 528836aacee..528836aacee 100644
--- a/ACE/debian/libace-flreactor-6.0.3.install
+++ b/ACE/debian/libace-flreactor-6.0.4.install
diff --git a/ACE/debian/libace-foxreactor-6.0.3.install b/ACE/debian/libace-foxreactor-6.0.4.install
index e360f29f5af..e360f29f5af 100644
--- a/ACE/debian/libace-foxreactor-6.0.3.install
+++ b/ACE/debian/libace-foxreactor-6.0.4.install
diff --git a/ACE/debian/libace-htbp-6.0.3.install b/ACE/debian/libace-htbp-6.0.4.install
index 08103fd5cad..08103fd5cad 100644
--- a/ACE/debian/libace-htbp-6.0.3.install
+++ b/ACE/debian/libace-htbp-6.0.4.install
diff --git a/ACE/debian/libace-inet-6.0.3.install b/ACE/debian/libace-inet-6.0.4.install
index 59a73a509d0..59a73a509d0 100644
--- a/ACE/debian/libace-inet-6.0.3.install
+++ b/ACE/debian/libace-inet-6.0.4.install
diff --git a/ACE/debian/libace-inet-ssl-6.0.3.install b/ACE/debian/libace-inet-ssl-6.0.4.install
index b9b8b9045f7..b9b8b9045f7 100644
--- a/ACE/debian/libace-inet-ssl-6.0.3.install
+++ b/ACE/debian/libace-inet-ssl-6.0.4.install
diff --git a/ACE/debian/libace-qtreactor-6.0.3.install b/ACE/debian/libace-qtreactor-6.0.4.install
index 1d371e1e571..1d371e1e571 100644
--- a/ACE/debian/libace-qtreactor-6.0.3.install
+++ b/ACE/debian/libace-qtreactor-6.0.4.install
diff --git a/ACE/debian/libace-rmcast-6.0.3.install b/ACE/debian/libace-rmcast-6.0.4.install
index 86e78259853..86e78259853 100644
--- a/ACE/debian/libace-rmcast-6.0.3.install
+++ b/ACE/debian/libace-rmcast-6.0.4.install
diff --git a/ACE/debian/libace-ssl-6.0.3.NEWS b/ACE/debian/libace-ssl-6.0.4.NEWS
index e5bd0e4aa10..e5bd0e4aa10 100644
--- a/ACE/debian/libace-ssl-6.0.3.NEWS
+++ b/ACE/debian/libace-ssl-6.0.4.NEWS
diff --git a/ACE/debian/libace-ssl-6.0.3.install b/ACE/debian/libace-ssl-6.0.4.install
index 8df45a6d55f..8df45a6d55f 100644
--- a/ACE/debian/libace-ssl-6.0.3.install
+++ b/ACE/debian/libace-ssl-6.0.4.install
diff --git a/ACE/debian/libace-tkreactor-6.0.3.install b/ACE/debian/libace-tkreactor-6.0.4.install
index 12ab35062d2..12ab35062d2 100644
--- a/ACE/debian/libace-tkreactor-6.0.3.install
+++ b/ACE/debian/libace-tkreactor-6.0.4.install
diff --git a/ACE/debian/libace-tmcast-6.0.3.install b/ACE/debian/libace-tmcast-6.0.4.install
index e066131dea0..e066131dea0 100644
--- a/ACE/debian/libace-tmcast-6.0.3.install
+++ b/ACE/debian/libace-tmcast-6.0.4.install
diff --git a/ACE/debian/libace-xtreactor-6.0.3.install b/ACE/debian/libace-xtreactor-6.0.4.install
index c53614c7208..c53614c7208 100644
--- a/ACE/debian/libace-xtreactor-6.0.3.install
+++ b/ACE/debian/libace-xtreactor-6.0.4.install
diff --git a/ACE/debian/libacexml-6.0.3.docs b/ACE/debian/libacexml-6.0.4.docs
index 002855d7915..002855d7915 100644
--- a/ACE/debian/libacexml-6.0.3.docs
+++ b/ACE/debian/libacexml-6.0.4.docs
diff --git a/ACE/debian/libacexml-6.0.3.install b/ACE/debian/libacexml-6.0.4.install
index d3e912ffa51..d3e912ffa51 100644
--- a/ACE/debian/libacexml-6.0.3.install
+++ b/ACE/debian/libacexml-6.0.4.install
diff --git a/ACE/debian/libkokyu-6.0.3.docs b/ACE/debian/libkokyu-6.0.4.docs
index e8869c513b2..e8869c513b2 100644
--- a/ACE/debian/libkokyu-6.0.3.docs
+++ b/ACE/debian/libkokyu-6.0.4.docs
diff --git a/ACE/debian/libkokyu-6.0.3.install b/ACE/debian/libkokyu-6.0.4.install
index 62854308f96..62854308f96 100644
--- a/ACE/debian/libkokyu-6.0.3.install
+++ b/ACE/debian/libkokyu-6.0.4.install
diff --git a/ACE/debian/libtao-2.0.3.docs b/ACE/debian/libtao-2.0.4.docs
index 6ed40bf21ea..6ed40bf21ea 100644
--- a/ACE/debian/libtao-2.0.3.docs
+++ b/ACE/debian/libtao-2.0.4.docs
diff --git a/ACE/debian/libtao-2.0.3.install b/ACE/debian/libtao-2.0.4.install
index 65d040bd469..65d040bd469 100644
--- a/ACE/debian/libtao-2.0.3.install
+++ b/ACE/debian/libtao-2.0.4.install
diff --git a/ACE/debian/libtao-flresource-2.0.3.install b/ACE/debian/libtao-flresource-2.0.4.install
index 5d4ee6ce57a..5d4ee6ce57a 100644
--- a/ACE/debian/libtao-flresource-2.0.3.install
+++ b/ACE/debian/libtao-flresource-2.0.4.install
diff --git a/ACE/debian/libtao-foxresource-2.0.3.install b/ACE/debian/libtao-foxresource-2.0.4.install
index 6ceb47601aa..6ceb47601aa 100644
--- a/ACE/debian/libtao-foxresource-2.0.3.install
+++ b/ACE/debian/libtao-foxresource-2.0.4.install
diff --git a/ACE/debian/libtao-orbsvcs-2.0.3.NEWS b/ACE/debian/libtao-orbsvcs-2.0.4.NEWS
index ea0759e0ade..ea0759e0ade 100644
--- a/ACE/debian/libtao-orbsvcs-2.0.3.NEWS
+++ b/ACE/debian/libtao-orbsvcs-2.0.4.NEWS
diff --git a/ACE/debian/libtao-orbsvcs-2.0.3.install b/ACE/debian/libtao-orbsvcs-2.0.4.install
index e0e491e9095..e0e491e9095 100644
--- a/ACE/debian/libtao-orbsvcs-2.0.3.install
+++ b/ACE/debian/libtao-orbsvcs-2.0.4.install
diff --git a/ACE/debian/libtao-qtresource-2.0.3.install b/ACE/debian/libtao-qtresource-2.0.4.install
index 172f4c45db8..172f4c45db8 100644
--- a/ACE/debian/libtao-qtresource-2.0.3.install
+++ b/ACE/debian/libtao-qtresource-2.0.4.install
diff --git a/ACE/debian/libtao-tkresource-2.0.3.install b/ACE/debian/libtao-tkresource-2.0.4.install
index 7f543154b5b..7f543154b5b 100644
--- a/ACE/debian/libtao-tkresource-2.0.3.install
+++ b/ACE/debian/libtao-tkresource-2.0.4.install
diff --git a/ACE/debian/libtao-xtresource-2.0.3.install b/ACE/debian/libtao-xtresource-2.0.4.install
index ab5151ed073..ab5151ed073 100644
--- a/ACE/debian/libtao-xtresource-2.0.3.install
+++ b/ACE/debian/libtao-xtresource-2.0.4.install
diff --git a/ACE/rpmbuild/ace-tao.spec b/ACE/rpmbuild/ace-tao.spec
index efab5d8df1b..91d45d1b150 100644
--- a/ACE/rpmbuild/ace-tao.spec
+++ b/ACE/rpmbuild/ace-tao.spec
@@ -1,7 +1,7 @@
 # Set the version number here.
-%define ACEVER  6.0.3
-%define TAOVER  2.0.3
-%define CIAOVER 1.0.3
+%define ACEVER  6.0.4
+%define TAOVER  2.0.4
+%define CIAOVER 1.0.4
 
 # Conditional build
 # Default values are
diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog
index d239157f5a0..04ff50c4a8e 100644
--- a/CIAO/ChangeLog
+++ b/CIAO/ChangeLog
@@ -1,3 +1,7 @@
+Tue Aug 23 19:01:44 CEST 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * CIAO version 1.0.4 released.
+
 Sun Aug 14 10:32:36 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * connectors/dds4ccm/impl/ndds/DataReader_T.cpp:
diff --git a/CIAO/PROBLEM-REPORT-FORM b/CIAO/PROBLEM-REPORT-FORM
index 20fa0abaf8a..c81425ebe56 100644
--- a/CIAO/PROBLEM-REPORT-FORM
+++ b/CIAO/PROBLEM-REPORT-FORM
@@ -41,9 +41,9 @@
 To: ciao-users@list.isis.vanderbilt.edu
 Subject: [area]: [synopsis]
 
-    CIAO VERSION: 1.0.3
-    TAO VERSION : 2.0.3
-    ACE VERSION : 6.0.3
+    CIAO VERSION: 1.0.4
+    TAO VERSION : 2.0.4
+    ACE VERSION : 6.0.4
 
     HOST MACHINE and OPERATING SYSTEM:
         If on Windows based OS's, which version of WINSOCK do you
diff --git a/CIAO/VERSION b/CIAO/VERSION
index 36fbe127cdf..3501fa9e096 100644
--- a/CIAO/VERSION
+++ b/CIAO/VERSION
@@ -1,4 +1,4 @@
-This is CIAO version 1.0.3, released Thu Jun 23 13:46:08 CEST 2011
+This is CIAO version 1.0.4, released Tue Aug 23 19:01:44 CEST 2011
 
 If you have any problems with or questions about CIAO, please send
 e-mail to the CIAO mailing list (ciao-users@list.isis.vanderbilt.edu),
diff --git a/CIAO/ciao/Version.h b/CIAO/ciao/Version.h
index e892686184b..6a55e19509b 100644
--- a/CIAO/ciao/Version.h
+++ b/CIAO/ciao/Version.h
@@ -5,5 +5,5 @@
 
 #define CIAO_MAJOR_VERSION 1
 #define CIAO_MINOR_VERSION 0
-#define CIAO_BETA_VERSION 3
-#define CIAO_VERSION "1.0.3"
+#define CIAO_BETA_VERSION 4
+#define CIAO_VERSION "1.0.4"
diff --git a/DAnCE/ChangeLog b/DAnCE/ChangeLog
index 74ed9515a5f..6e840ab96f5 100644
--- a/DAnCE/ChangeLog
+++ b/DAnCE/ChangeLog
@@ -1,3 +1,7 @@
+Tue Aug 23 19:01:44 CEST 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * DAnCE version 1.0.4 released.
+
 Fri Jul 29 14:18:54 UTC 2011  Phil Mesnier  <mesnier_p@ociweb.com>
 
         * dance/LocalityManager/Configuration/CPU_Affinity.cpp:
diff --git a/DAnCE/PROBLEM-REPORT-FORM b/DAnCE/PROBLEM-REPORT-FORM
index f46998f9045..a2d84471149 100644
--- a/DAnCE/PROBLEM-REPORT-FORM
+++ b/DAnCE/PROBLEM-REPORT-FORM
@@ -41,9 +41,9 @@
 To: ciao-users@list.isis.vanderbilt.edu
 Subject: [area]: [synopsis]
 
-    DAnCE VERSION: 1.0.3
-    TAO VERSION : 2.0.3
-    ACE VERSION : 6.0.3
+    DAnCE VERSION: 1.0.4
+    TAO VERSION : 2.0.4
+    ACE VERSION : 6.0.4
 
     HOST MACHINE and OPERATING SYSTEM:
         If on Windows based OS's, which version of WINSOCK do you
diff --git a/DAnCE/VERSION b/DAnCE/VERSION
index 767104f388d..6c6a21a71a9 100644
--- a/DAnCE/VERSION
+++ b/DAnCE/VERSION
@@ -1,4 +1,4 @@
-This is DAnCE version 1.0.3, released Thu Jun 23 13:46:08 CEST 2011
+This is DAnCE version 1.0.4, released Tue Aug 23 19:01:44 CEST 2011
 
 If you have any problems with or questions about DAnCE, please send
 e-mail to the CIAO mailing list (ciao-users@list.isis.vanderbilt.edu),
diff --git a/DAnCE/dance/Version.h b/DAnCE/dance/Version.h
index 0db5c428a31..ef4c0bec29a 100644
--- a/DAnCE/dance/Version.h
+++ b/DAnCE/dance/Version.h
@@ -5,5 +5,5 @@
 
 #define DAnCE_MAJOR_VERSION 1
 #define DAnCE_MINOR_VERSION 0
-#define DAnCE_BETA_VERSION 3
-#define DAnCE_VERSION "1.0.3"
+#define DAnCE_BETA_VERSION 4
+#define DAnCE_VERSION "1.0.4"
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index d149c323351..e30ca1b318b 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,7 @@
+Tue Aug 23 19:01:44 CEST 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * TAO version 2.0.4 released.
+
 Mon Aug 22 15:39:52 UTC 2011  Phil Mesnier  <mesnier_p@ociweb.com>
 
         * orbsvcs/tests/Security/BiDirectional/ssl/ca.pem:
diff --git a/TAO/PROBLEM-REPORT-FORM b/TAO/PROBLEM-REPORT-FORM
index 14fa8b51ec1..c3db0c35bc7 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.0.3
-    ACE VERSION: 6.0.3
+    TAO VERSION: 2.0.4
+    ACE VERSION: 6.0.4
 
     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 5abfee1ad52..4aed53847c3 100644
--- a/TAO/VERSION
+++ b/TAO/VERSION
@@ -1,4 +1,4 @@
-This is TAO version 2.0.3, released Thu Jun 23 13:46:08 CEST 2011
+This is TAO version 2.0.4, released Tue Aug 23 19:01:44 CEST 2011
 
 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 3cc92af8360..3830eda9bc1 100644
--- a/TAO/tao/Version.h
+++ b/TAO/tao/Version.h
@@ -5,5 +5,5 @@
 
 #define TAO_MAJOR_VERSION 2
 #define TAO_MINOR_VERSION 0
-#define TAO_BETA_VERSION 3
-#define TAO_VERSION "2.0.3"
+#define TAO_BETA_VERSION 4
+#define TAO_VERSION "2.0.4"