ChangeLogTag:Tue Dec 14 13:13:17 CET 2010 Johnny Willemsen <jwillemsen@remedy.nl>

43 files changed, 76 insertions, 60 deletions

diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index ade827403e1..77783c3fc2f 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,3 +1,7 @@
+Tue Dec 14 13:13:17 CET 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ACE version 6.0.0 released.
+
 Wed Dec  8 09:36:00 UTC 2010  Martin Corino <mcorino@remedy.nl>
 
         * ace/Configuration.cpp:
diff --git a/ACE/PROBLEM-REPORT-FORM b/ACE/PROBLEM-REPORT-FORM
index c1f90fae2e6..ddb5938bc8c 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: 5.8.3
+    ACE VERSION: 6.0.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 594af04e592..ef81c8acd04 100644
--- a/ACE/VERSION
+++ b/ACE/VERSION
@@ -1,4 +1,4 @@
-This is ACE version 5.8.3, released Wed Oct 27 12:01:05 CEST 2010
+This is ACE version 6.0.0, released Tue Dec 14 13:13:17 CET 2010
 
 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 47de8c20e35..3503856e8a0 100644
--- a/ACE/ace/Version.h
+++ b/ACE/ace/Version.h
@@ -3,7 +3,7 @@
 // $Id$
 // This is file was automatically generated by \$ACE_ROOT/bin/make_release.py
 
-#define ACE_MAJOR_VERSION 5
-#define ACE_MINOR_VERSION 8
-#define ACE_BETA_VERSION 3
-#define ACE_VERSION "5.8.3"
+#define ACE_MAJOR_VERSION 6
+#define ACE_MINOR_VERSION 0
+#define ACE_BETA_VERSION 0
+#define ACE_VERSION "6.0.0"
diff --git a/ACE/debian/ace.dsc b/ACE/debian/ace.dsc
index 606558b499c..23f25c4c63b 100644
--- a/ACE/debian/ace.dsc
+++ b/ACE/debian/ace.dsc
@@ -1,10 +1,10 @@
-# Format: 1.0
-Source: ACE+TAO+CIAO-src-5.8.3
-Version: 1.8.3
+Format: 1.0
+Source: ACE+TAO+CIAO-src-6.0.0
+Version: 2.0.0
 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:
- 4134710026ea1aec5debdf24ab0f0364 43752510 ACE+TAO+CIAO-src-5.8.3.tar.gz
+ 65b34001c9605f056713a7e146b052d1 46346654 ACE+TAO+CIAO-src-6.0.0.tar.gz
 
diff --git a/ACE/debian/debian.control b/ACE/debian/debian.control
index d005af195fa..3653225c2b7 100644
--- a/ACE/debian/debian.control
+++ b/ACE/debian/debian.control
@@ -26,7 +26,7 @@ Description: makefile, project and workspace creator
   * mpc-ace, generating project files for a single target
   * mwc-ace, generating workspace files for a set of projects
 
-Package: libace-5.8.3
+Package: libace-6.0.0
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -52,7 +52,7 @@ Description: C++ network programming framework
 Package: libace-dev
 Architecture: any
 Section: libdevel
-Depends: libace-5.8.3 (= ${binary:Version}), ${misc:Depends}
+Depends: libace-6.0.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
@@ -67,7 +67,7 @@ Description: C++ network programming framework documentation
  This package contains the ACE overview documentation, tutorials,
  examples, and information regarding upstream development.
 
-Package: libace-ssl-5.8.3
+Package: libace-ssl-6.0.0
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -78,12 +78,12 @@ Description: ACE secure socket layer library
 Package: libace-ssl-dev
 Architecture: any
 Section: libdevel
-Depends: libace-ssl-5.8.3 (= ${binary:Version}), libace-dev (= ${binary:Version}), libssl-dev (>= 5.8d), ${misc:Depends}
+Depends: libace-ssl-6.0.0 (= ${binary:Version}), libace-dev (= ${binary:Version}), libssl-dev (>= 5.8d), ${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-5.8.3
+Package: libace-rmcast-6.0.0
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -97,12 +97,12 @@ Description: ACE reliable multicast library
 Package: libace-rmcast-dev
 Architecture: any
 Section: libdevel
-Depends: libace-rmcast-5.8.3 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libace-rmcast-6.0.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-5.8.3
+Package: libace-tmcast-6.0.0
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -115,12 +115,12 @@ Description: ACE transactional multicast library
 Package: libace-tmcast-dev
 Architecture: any
 Section: libdevel
-Depends: libace-tmcast-5.8.3 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libace-tmcast-6.0.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-5.8.3
+Package: libace-htbp-6.0.0
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -134,7 +134,7 @@ Description: ACE protocol over HTTP tunneling library
 Package: libace-htbp-dev
 Architecture: any
 Section: libdevel
-Depends: libace-htbp-5.8.3 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libace-htbp-6.0.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.
@@ -149,7 +149,7 @@ Description: ACE perfect hash function generator
  basically the same options and functionality. ace_gperf simply takes
  advantage of the some of the features provided by the ACE library.
 
-Package: libacexml-5.8.3
+Package: libacexml-6.0.0
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -164,7 +164,7 @@ Description: ACE SAX based XML parsing library
 Package: libacexml-dev
 Architecture: any
 Section: libdevel
-Depends: libacexml-5.8.3 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libacexml-6.0.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.
@@ -173,7 +173,7 @@ Package: libkokyu-5.8
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Suggests: libtao-1.8.1, libtao-orbsvcs-1.8.3
+Suggests: libtao-1.8.1, libtao-orbsvcs-2.0.0
 Description: ACE scheduling and dispatching library
  Kokyu is a library designed to provide flexible scheduling and
  dispatching services.
@@ -184,12 +184,12 @@ Description: ACE scheduling and dispatching library
 Package: libkokyu-dev
 Architecture: any
 Section: libdevel
-Depends: libkokyu-5.8.3 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libkokyu-6.0.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-5.8.3
+Package: libace-qtreactor-6.0.0
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -208,12 +208,12 @@ Description: ACE-GUI reactor integration for Qt
 Package: libace-qtreactor-dev
 Architecture: any
 Section: libdevel
-Depends: libace-qtreactor-5.8.3 (= ${binary:Version}), libace-dev (= ${binary:Version}), libqt4-dev, ${misc:Depends}
+Depends: libace-qtreactor-6.0.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-5.8.3
+Package: libace-xtreactor-6.0.0
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -231,12 +231,12 @@ Description: ACE-GUI reactor integration for Xt
 Package: libace-xtreactor-dev
 Architecture: any
 Section: libdevel
-Depends: libace-xtreactor-5.8.3 (= ${binary:Version}), libace-dev (= ${binary:Version}), libxt-dev (>= 5.8), ${misc:Depends}
+Depends: libace-xtreactor-6.0.0 (= ${binary:Version}), libace-dev (= ${binary:Version}), libxt-dev (>= 5.8), ${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-5.8.3
+Package: libace-tkreactor-6.0.0
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -254,12 +254,12 @@ Description: ACE-GUI reactor integration for Tk
 Package: libace-tkreactor-dev
 Architecture: any
 Section: libdevel
-Depends: libace-tkreactor-5.8.3 (= ${binary:Version}), libace-dev (= ${binary:Version}), tk-dev (>= 5.8), ${misc:Depends}
+Depends: libace-tkreactor-6.0.0 (= ${binary:Version}), libace-dev (= ${binary:Version}), tk-dev (>= 5.8), ${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-5.8.3
+Package: libace-flreactor-6.0.0
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -276,12 +276,12 @@ Description: ACE-GUI reactor integration for Fl
 Package: libace-flreactor-dev
 Architecture: any
 Section: libdevel
-Depends: libace-flreactor-5.8.3 (= ${binary:Version}), libace-dev (= ${binary:Version}), libfltk1.1-dev (>= 5.8), ${misc:Depends}
+Depends: libace-flreactor-6.0.0 (= ${binary:Version}), libace-dev (= ${binary:Version}), libfltk1.1-dev (>= 5.8), ${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-5.8.3
+Package: libace-foxreactor-6.0.0
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -298,7 +298,7 @@ Description: ACE-GUI reactor integration for FOX
 Package: libace-foxreactor-dev
 Architecture: any
 Section: libdevel
-Depends: libace-foxreactor-5.8.3 (= ${binary:Version}), libace-dev (= ${binary:Version}), libfox-1.6-dev, ${misc:Depends}
+Depends: libace-foxreactor-6.0.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.
diff --git a/ACE/debian/libace-5.8.3.docs b/ACE/debian/libace-6.0.0.docs
index 854866c7289..854866c7289 100644
--- a/ACE/debian/libace-5.8.3.docs
+++ b/ACE/debian/libace-6.0.0.docs
diff --git a/ACE/debian/libace-5.8.3.install b/ACE/debian/libace-6.0.0.install
index 0ce2ad9549f..0ce2ad9549f 100644
--- a/ACE/debian/libace-5.8.3.install
+++ b/ACE/debian/libace-6.0.0.install
diff --git a/ACE/debian/libace-flreactor-5.8.3.install b/ACE/debian/libace-flreactor-6.0.0.install
index cc5d0266057..cc5d0266057 100644
--- a/ACE/debian/libace-flreactor-5.8.3.install
+++ b/ACE/debian/libace-flreactor-6.0.0.install
diff --git a/ACE/debian/libace-foxreactor-5.8.3.install b/ACE/debian/libace-foxreactor-6.0.0.install
index a1ab4b6a52b..a1ab4b6a52b 100644
--- a/ACE/debian/libace-foxreactor-5.8.3.install
+++ b/ACE/debian/libace-foxreactor-6.0.0.install
diff --git a/ACE/debian/libace-htbp-5.8.3.install b/ACE/debian/libace-htbp-6.0.0.install
index bc70a1e2b6c..bc70a1e2b6c 100644
--- a/ACE/debian/libace-htbp-5.8.3.install
+++ b/ACE/debian/libace-htbp-6.0.0.install
diff --git a/ACE/debian/libace-qtreactor-5.8.3.install b/ACE/debian/libace-qtreactor-6.0.0.install
index c98ee7e33e4..c98ee7e33e4 100644
--- a/ACE/debian/libace-qtreactor-5.8.3.install
+++ b/ACE/debian/libace-qtreactor-6.0.0.install
diff --git a/ACE/debian/libace-rmcast-5.8.3.install b/ACE/debian/libace-rmcast-6.0.0.install
index faeb44041af..faeb44041af 100644
--- a/ACE/debian/libace-rmcast-5.8.3.install
+++ b/ACE/debian/libace-rmcast-6.0.0.install
diff --git a/ACE/debian/libace-ssl-5.8.3.install b/ACE/debian/libace-ssl-6.0.0.install
index 26c71c39a2a..26c71c39a2a 100644
--- a/ACE/debian/libace-ssl-5.8.3.install
+++ b/ACE/debian/libace-ssl-6.0.0.install
diff --git a/ACE/debian/libace-tkreactor-5.8.3.install b/ACE/debian/libace-tkreactor-6.0.0.install
index 883ec5c9678..883ec5c9678 100644
--- a/ACE/debian/libace-tkreactor-5.8.3.install
+++ b/ACE/debian/libace-tkreactor-6.0.0.install
diff --git a/ACE/debian/libace-tmcast-5.8.3.install b/ACE/debian/libace-tmcast-6.0.0.install
index 87463063a9b..87463063a9b 100644
--- a/ACE/debian/libace-tmcast-5.8.3.install
+++ b/ACE/debian/libace-tmcast-6.0.0.install
diff --git a/ACE/debian/libace-xtreactor-5.8.3.install b/ACE/debian/libace-xtreactor-6.0.0.install
index 2c6719943af..2c6719943af 100644
--- a/ACE/debian/libace-xtreactor-5.8.3.install
+++ b/ACE/debian/libace-xtreactor-6.0.0.install
diff --git a/ACE/debian/libacexml-5.8.3.docs b/ACE/debian/libacexml-6.0.0.docs
index 4ebd1c55c18..4ebd1c55c18 100644
--- a/ACE/debian/libacexml-5.8.3.docs
+++ b/ACE/debian/libacexml-6.0.0.docs
diff --git a/ACE/debian/libacexml-5.8.3.install b/ACE/debian/libacexml-6.0.0.install
index 5e60388244d..5e60388244d 100644
--- a/ACE/debian/libacexml-5.8.3.install
+++ b/ACE/debian/libacexml-6.0.0.install
diff --git a/ACE/debian/libkokyu-5.8.3.docs b/ACE/debian/libkokyu-6.0.0.docs
index 35ee2dbe99c..35ee2dbe99c 100644
--- a/ACE/debian/libkokyu-5.8.3.docs
+++ b/ACE/debian/libkokyu-6.0.0.docs
diff --git a/ACE/debian/libkokyu-5.8.3.install b/ACE/debian/libkokyu-6.0.0.install
index 81c58f1ba0d..81c58f1ba0d 100644
--- a/ACE/debian/libkokyu-5.8.3.install
+++ b/ACE/debian/libkokyu-6.0.0.install
diff --git a/ACE/debian/libtao-1.8.3.docs b/ACE/debian/libtao-2.0.0.docs
index a79beab3449..a79beab3449 100644
--- a/ACE/debian/libtao-1.8.3.docs
+++ b/ACE/debian/libtao-2.0.0.docs
diff --git a/ACE/debian/libtao-1.8.3.install b/ACE/debian/libtao-2.0.0.install
index 5d7048446f3..5d7048446f3 100644
--- a/ACE/debian/libtao-1.8.3.install
+++ b/ACE/debian/libtao-2.0.0.install
diff --git a/ACE/debian/libtao-flresource-1.8.3.install b/ACE/debian/libtao-flresource-2.0.0.install
index 47dfbd58ef8..47dfbd58ef8 100644
--- a/ACE/debian/libtao-flresource-1.8.3.install
+++ b/ACE/debian/libtao-flresource-2.0.0.install
diff --git a/ACE/debian/libtao-foxresource-1.8.3.install b/ACE/debian/libtao-foxresource-2.0.0.install
index 1187fe1a182..1187fe1a182 100644
--- a/ACE/debian/libtao-foxresource-1.8.3.install
+++ b/ACE/debian/libtao-foxresource-2.0.0.install
diff --git a/ACE/debian/libtao-orbsvcs-1.8.3.NEWS b/ACE/debian/libtao-orbsvcs-2.0.0.NEWS
index ea0759e0ade..ea0759e0ade 100644
--- a/ACE/debian/libtao-orbsvcs-1.8.3.NEWS
+++ b/ACE/debian/libtao-orbsvcs-2.0.0.NEWS
diff --git a/ACE/debian/libtao-orbsvcs-1.8.3.install b/ACE/debian/libtao-orbsvcs-2.0.0.install
index ff412d49a29..ff412d49a29 100644
--- a/ACE/debian/libtao-orbsvcs-1.8.3.install
+++ b/ACE/debian/libtao-orbsvcs-2.0.0.install
diff --git a/ACE/debian/libtao-qtresource-1.8.3.install b/ACE/debian/libtao-qtresource-2.0.0.install
index 84d4f97a06b..84d4f97a06b 100644
--- a/ACE/debian/libtao-qtresource-1.8.3.install
+++ b/ACE/debian/libtao-qtresource-2.0.0.install
diff --git a/ACE/debian/libtao-tkresource-1.8.3.install b/ACE/debian/libtao-tkresource-2.0.0.install
index 51ecfa59d2c..51ecfa59d2c 100644
--- a/ACE/debian/libtao-tkresource-1.8.3.install
+++ b/ACE/debian/libtao-tkresource-2.0.0.install
diff --git a/ACE/debian/libtao-xtresource-1.8.3.install b/ACE/debian/libtao-xtresource-2.0.0.install
index 11588ae9088..11588ae9088 100644
--- a/ACE/debian/libtao-xtresource-1.8.3.install
+++ b/ACE/debian/libtao-xtresource-2.0.0.install
diff --git a/ACE/rpmbuild/ace-tao.spec b/ACE/rpmbuild/ace-tao.spec
index e648f412b52..e6ffe34ac94 100644
--- a/ACE/rpmbuild/ace-tao.spec
+++ b/ACE/rpmbuild/ace-tao.spec
@@ -1,7 +1,7 @@
 # Set the version number here.
-%define ACEVER  5.8.3
-%define TAOVER  1.8.3
-%define CIAOVER 0.8.3
+%define ACEVER  6.0.0
+%define TAOVER  2.0.0
+%define CIAOVER 1.0.0
 
 # Conditional build
 # Default values are
diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog
index a6691d0e748..e8145895560 100644
--- a/CIAO/ChangeLog
+++ b/CIAO/ChangeLog
@@ -1,3 +1,7 @@
+Tue Dec 14 13:13:17 CET 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * CIAO version 1.0.0 released.
+
 Fri Dec 10 12:03:52 UTC 2010  Vladimir Zykov  <vladimir.zykov@prismtech.com>
 
         * ciao/Base/CIAO_Base.mpc:
diff --git a/CIAO/PROBLEM-REPORT-FORM b/CIAO/PROBLEM-REPORT-FORM
index a9b82a9f836..e6ff79a53ad 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: 0.8.3
-    TAO VERSION : 1.8.3
-    ACE VERSION : 5.8.3
+    CIAO VERSION: 1.0.0
+    TAO VERSION : 2.0.0
+    ACE VERSION : 6.0.0
 
     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 b844b6d92e0..3eeeca89842 100644
--- a/CIAO/VERSION
+++ b/CIAO/VERSION
@@ -1,4 +1,4 @@
-This is CIAO version 0.8.3, released Wed Oct 27 12:01:05 CEST 2010
+This is CIAO version 1.0.0, released Tue Dec 14 13:13:17 CET 2010
 
 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 164504c86ff..22eab0ea347 100644
--- a/CIAO/ciao/Version.h
+++ b/CIAO/ciao/Version.h
@@ -3,7 +3,7 @@
 // $Id$
 // This is file was automatically generated by \$ACE_ROOT/bin/make_release.py
 
-#define CIAO_MAJOR_VERSION 0
-#define CIAO_MINOR_VERSION 8
-#define CIAO_BETA_VERSION 3
-#define CIAO_VERSION "0.8.3"
+#define CIAO_MAJOR_VERSION 1
+#define CIAO_MINOR_VERSION 0
+#define CIAO_BETA_VERSION 0
+#define CIAO_VERSION "1.0.0"
diff --git a/DAnCE/ChangeLog b/DAnCE/ChangeLog
index 025d18ab363..8d9acd02c43 100644
--- a/DAnCE/ChangeLog
+++ b/DAnCE/ChangeLog
@@ -1,3 +1,7 @@
+Tue Dec 14 13:13:17 CET 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * DAnCE version 1.0.0 released.
+
 Mon Nov 22 12:46:14 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * dance/DAnCE_Utility.cpp:
diff --git a/DAnCE/PROBLEM-REPORT-FORM b/DAnCE/PROBLEM-REPORT-FORM
index f6686aabca4..da2f4330195 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: 0.8.3
-    TAO VERSION : 1.8.3
-    ACE VERSION : 5.8.3
+    DAnCE VERSION: 1.0.0
+    TAO VERSION : 2.0.0
+    ACE VERSION : 6.0.0
 
     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 7cc7e5d6674..6ca3e476f7e 100644
--- a/DAnCE/VERSION
+++ b/DAnCE/VERSION
@@ -1,4 +1,4 @@
-This is DAnCE version 0.8.3, released Wed Oct 27 12:01:05 CEST 2010
+This is DAnCE version 1.0.0, released Tue Dec 14 13:13:17 CET 2010
 
 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 bcd3c9ac5ac..a1711e3d754 100644
--- a/DAnCE/dance/Version.h
+++ b/DAnCE/dance/Version.h
@@ -3,7 +3,7 @@
 // $Id$
 // This is file was automatically generated by \$ACE_ROOT/bin/make_release.py
 
-#define DANCE_MAJOR_VERSION 0
-#define DANCE_MINOR_VERSION 8
-#define DANCE_BETA_VERSION 3
-#define DANCE_VERSION "0.8.3"
+#define DAnCE_MAJOR_VERSION 1
+#define DAnCE_MINOR_VERSION 0
+#define DAnCE_BETA_VERSION 0
+#define DAnCE_VERSION "1.0.0"
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 500caf0f20b..2d0d506881a 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,7 @@
+Tue Dec 14 13:13:17 CET 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * TAO version 2.0.0 released.
+
 Wed Dec  8 15:20:26 UTC 2010  Jeff Parsons <j.parsons@vanderbilt.edu>
 
         * TAO_IDL/ast/ast_module.cpp:
diff --git a/TAO/PROBLEM-REPORT-FORM b/TAO/PROBLEM-REPORT-FORM
index 739a7934b8f..b07e2d2f3b7 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: 1.8.3
-    ACE VERSION: 5.8.3
+    TAO VERSION: 2.0.0
+    ACE VERSION: 6.0.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 bd8c752223a..22d4bd818f3 100644
--- a/TAO/VERSION
+++ b/TAO/VERSION
@@ -1,4 +1,4 @@
-This is TAO version 1.8.3, released Wed Oct 27 12:01:05 CEST 2010
+This is TAO version 2.0.0, released Tue Dec 14 13:13:17 CET 2010
 
 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 ab63cb69a07..d6903de9950 100644
--- a/TAO/tao/Version.h
+++ b/TAO/tao/Version.h
@@ -3,7 +3,7 @@
 // $Id$
 // This is file was automatically generated by \$ACE_ROOT/bin/make_release.py
 
-#define TAO_MAJOR_VERSION 1
-#define TAO_MINOR_VERSION 8
-#define TAO_BETA_VERSION 3
-#define TAO_VERSION "1.8.3"
+#define TAO_MAJOR_VERSION 2
+#define TAO_MINOR_VERSION 0
+#define TAO_BETA_VERSION 0
+#define TAO_VERSION "2.0.0"