summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ACE/ChangeLogs/ACE-6_5_1149
-rw-r--r--ACE/PROBLEM-REPORT-FORM2
-rw-r--r--ACE/VERSION2
-rw-r--r--ACE/ace/Version.h8
-rw-r--r--ACE/debian/control62
-rw-r--r--ACE/debian/libace-6.5.0.lintian-overrides6
-rw-r--r--ACE/debian/libace-6.5.1.docs (renamed from ACE/debian/libace-6.5.0.docs)0
-rw-r--r--ACE/debian/libace-6.5.1.install (renamed from ACE/debian/libace-6.5.0.install)0
-rw-r--r--ACE/debian/libace-6.5.1.lintian-overrides6
-rw-r--r--ACE/debian/libace-flreactor-6.5.0.lintian-overrides1
-rw-r--r--ACE/debian/libace-flreactor-6.5.1.install (renamed from ACE/debian/libace-flreactor-6.5.0.install)0
-rw-r--r--ACE/debian/libace-flreactor-6.5.1.lintian-overrides1
-rw-r--r--ACE/debian/libace-foxreactor-6.5.0.lintian-overrides1
-rw-r--r--ACE/debian/libace-foxreactor-6.5.1.install (renamed from ACE/debian/libace-foxreactor-6.5.0.install)0
-rw-r--r--ACE/debian/libace-foxreactor-6.5.1.lintian-overrides1
-rw-r--r--ACE/debian/libace-htbp-6.5.0.lintian-overrides1
-rw-r--r--ACE/debian/libace-htbp-6.5.1.install (renamed from ACE/debian/libace-htbp-6.5.0.install)0
-rw-r--r--ACE/debian/libace-htbp-6.5.1.lintian-overrides1
-rw-r--r--ACE/debian/libace-inet-6.5.0.lintian-overrides2
-rw-r--r--ACE/debian/libace-inet-6.5.1.install (renamed from ACE/debian/libace-inet-6.5.0.install)0
-rw-r--r--ACE/debian/libace-inet-6.5.1.lintian-overrides2
-rw-r--r--ACE/debian/libace-inet-ssl-6.5.0.lintian-overrides4
-rw-r--r--ACE/debian/libace-inet-ssl-6.5.1.install (renamed from ACE/debian/libace-inet-ssl-6.5.0.install)0
-rw-r--r--ACE/debian/libace-inet-ssl-6.5.1.lintian-overrides4
-rw-r--r--ACE/debian/libace-rmcast-6.5.0.lintian-overrides1
-rw-r--r--ACE/debian/libace-rmcast-6.5.1.install (renamed from ACE/debian/libace-rmcast-6.5.0.install)0
-rw-r--r--ACE/debian/libace-rmcast-6.5.1.lintian-overrides1
-rw-r--r--ACE/debian/libace-ssl-6.5.0.lintian-overrides5
-rw-r--r--ACE/debian/libace-ssl-6.5.1.NEWS (renamed from ACE/debian/libace-ssl-6.5.0.NEWS)0
-rw-r--r--ACE/debian/libace-ssl-6.5.1.install (renamed from ACE/debian/libace-ssl-6.5.0.install)0
-rw-r--r--ACE/debian/libace-ssl-6.5.1.lintian-overrides5
-rw-r--r--ACE/debian/libace-tkreactor-6.5.0.lintian-overrides1
-rw-r--r--ACE/debian/libace-tkreactor-6.5.1.install (renamed from ACE/debian/libace-tkreactor-6.5.0.install)0
-rw-r--r--ACE/debian/libace-tkreactor-6.5.1.lintian-overrides1
-rw-r--r--ACE/debian/libace-tmcast-6.5.0.lintian-overrides1
-rw-r--r--ACE/debian/libace-tmcast-6.5.1.install (renamed from ACE/debian/libace-tmcast-6.5.0.install)0
-rw-r--r--ACE/debian/libace-tmcast-6.5.1.lintian-overrides1
-rw-r--r--ACE/debian/libace-xml-utils-6.5.0.lintian-overrides1
-rw-r--r--ACE/debian/libace-xml-utils-6.5.1.install (renamed from ACE/debian/libace-xml-utils-6.5.0.install)0
-rw-r--r--ACE/debian/libace-xml-utils-6.5.1.lintian-overrides1
-rw-r--r--ACE/debian/libace-xtreactor-6.5.0.lintian-overrides1
-rw-r--r--ACE/debian/libace-xtreactor-6.5.1.install (renamed from ACE/debian/libace-xtreactor-6.5.0.install)0
-rw-r--r--ACE/debian/libace-xtreactor-6.5.1.lintian-overrides1
-rw-r--r--ACE/debian/libacexml-6.5.0.lintian-overrides3
-rw-r--r--ACE/debian/libacexml-6.5.1.docs (renamed from ACE/debian/libacexml-6.5.0.docs)0
-rw-r--r--ACE/debian/libacexml-6.5.1.install (renamed from ACE/debian/libacexml-6.5.0.install)0
-rw-r--r--ACE/debian/libacexml-6.5.1.lintian-overrides3
-rw-r--r--ACE/debian/libkokyu-6.5.0.lintian-overrides1
-rw-r--r--ACE/debian/libkokyu-6.5.1.docs (renamed from ACE/debian/libkokyu-6.5.0.docs)0
-rw-r--r--ACE/debian/libkokyu-6.5.1.install (renamed from ACE/debian/libkokyu-6.5.0.install)0
-rw-r--r--ACE/debian/libkokyu-6.5.1.lintian-overrides1
-rw-r--r--ACE/debian/libnetsvcs-6.5.0.lintian-overrides1
-rw-r--r--ACE/debian/libnetsvcs-6.5.1.docs (renamed from ACE/debian/libnetsvcs-6.5.0.docs)0
-rw-r--r--ACE/debian/libnetsvcs-6.5.1.install (renamed from ACE/debian/libnetsvcs-6.5.0.install)0
-rw-r--r--ACE/debian/libnetsvcs-6.5.1.lintian-overrides1
-rw-r--r--ACE/rpmbuild/ace-tao.spec4
-rw-r--r--TAO/ChangeLogs/TAO-2_5_1293
-rw-r--r--TAO/PROBLEM-REPORT-FORM4
-rw-r--r--TAO/VERSION2
-rw-r--r--TAO/tao/Version.h8
60 files changed, 518 insertions, 76 deletions
diff --git a/ACE/ChangeLogs/ACE-6_5_1 b/ACE/ChangeLogs/ACE-6_5_1
new file mode 100644
index 00000000000..08ed12f3efe
--- /dev/null
+++ b/ACE/ChangeLogs/ACE-6_5_1
@@ -0,0 +1,149 @@
+commit ae3cee721637d0481cdec3c52e1b379eb65a55c0
+Merge: 2103902aeee 1cc8fd38cd7
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Mon Aug 6 13:13:43 2018 +0200
+
+ Merge pull request #660 from jwillemsen/master
+
+ Changed deprecated_declarations to no_deprecated so that we have the …
+
+commit 1cc8fd38cd74c92035478504088aaf6e9fff533f
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Mon Aug 6 11:25:13 2018 +0200
+
+ Changed deprecated_declarations to no_deprecated so that we have the same setting with clang and gcc
+
+ * ACE/include/makeinclude/platform_linux_clang.GNU:
+
+commit 2103902aeee31d66e515ee7d885acb445e0161ad
+Merge: 2864135a422 0a3568b650e
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Mon Aug 6 09:59:20 2018 +0200
+
+ Merge pull request #659 from jwillemsen/master
+
+ List important changes for the upcoming release
+
+commit 0a3568b650ee1d8cdbd66f5e521b5f4bd0b96680
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Mon Aug 6 09:58:51 2018 +0200
+
+ Updated changes
+
+ * ACE/NEWS:
+
+commit d6b268e7eee10aabaa775065f72e283e2ce053f0
+Merge: 15c371e5493 c7571f5ff80
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Mon Aug 6 09:42:41 2018 +0200
+
+ Merge branch 'master' of https://github.com/DOCGroup/ACE_TAO
+
+commit 15c371e5493f0d727cd0bd395fe218b064bc4f16
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Mon Aug 6 09:41:29 2018 +0200
+
+ List important changes for the upcoming release
+
+ * ACE/NEWS:
+ * TAO/NEWS:
+
+commit d4de87431e6ac1856460ea9dd829378a36037ff0
+Author: Martin Corino <mcorino@remedy.nl>
+Date: Mon Aug 6 07:40:43 2018 +0200
+
+ added explicit include of <string> to fix older MSVC compile errors
+
+ * ACE/ace/CDR_Stream.h:
+
+commit 4a09b0b10cbea1fdcb16161583ee22f7d151784b
+Author: Martin Corino <mcorino@remedy.nl>
+Date: Fri Aug 3 14:15:38 2018 +0200
+
+ add full support for streaming std::(w)string
+
+ (optimized for C++11 and onwards)
+ added tests for optimized std::(w)string support
+ extend character translators with std::(w)string support also
+
+commit 8a9912c18c61fcb3141d661a6536370091a6fc67
+Author: Adam Mitz <mitza@ociweb.com>
+Date: Mon Jul 9 10:08:30 2018 -0500
+
+ Removed duplicated project files (MPC issue 50)
+
+commit b54eb818519dfd0d592ffc21580704b6347510da
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Fri Jun 29 09:16:18 2018 +0200
+
+ Removed not used member
+
+ * ACE/ace/Timer_Wheel_T.cpp:
+
+commit d3bb3163e9380bc55a4a8b7877949fdca5326571
+Author: Steve Huston <shuston@riverace.com>
+Date: Tue Jun 26 18:01:38 2018 -0400
+
+ Fix memory leak in schedule; replace broken next-count logic in generate_timer_id
+
+commit 515ec9ad5cb7d0361b499a31c13a7cb6c83f435a
+Author: Steve Huston <shuston@riverace.com>
+Date: Tue Jun 26 18:00:48 2018 -0400
+
+ Remove unused member variable max_per_spoke_
+
+commit ded09ee554a5fb49fb246f9177c697fbea8c2719
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Fri Jun 22 13:45:53 2018 +0200
+
+ When we have C++11 we are using std::unique_ptr instead of std::auto_ptr
+
+ * ACE/ace/Auto_Ptr.cpp:
+ * ACE/ace/WFMO_Reactor.cpp:
+
+commit 720ab6a2f37514830b7fce2aba179a1cf67016e9
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Fri Jun 22 13:31:29 2018 +0200
+
+ When using Visual Studio 2017 we can enable C++14 and C++17 compliance, with C++17 we don't have auto_ptr so shouldn't do a using
+
+ * ACE/ace/Auto_Ptr.h:
+ * ACE/ace/config-win32-msvc-141.h:
+
+commit cfa4831d01916c0835db5c52cb3a99bf1c4ad067
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Fri Jun 15 08:59:00 2018 +0200
+
+ Document API change
+
+ * ACE/NEWS:
+
+commit 1cc3c03e2d52b02c9270238d9297acadc00dad69
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Thu Jun 14 20:32:01 2018 +0200
+
+ When we have C++11 ACE_Strong_Bound_Ptr doesn't provide std::auto_ptr support, that is deprecated
+
+ * ACE/ace/Bound_Ptr.h:
+ * ACE/ace/Bound_Ptr.inl:
+ * ACE/tests/Bound_Ptr_Test.cpp:
+
+commit 3a2f66fd31d78518857fd95790e02c46b0c099fb
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Tue Jun 12 10:05:28 2018 +0200
+
+ When making a new minor also update micro/beta tags
+
+ * ACE/bin/make_release.py:
+
+commit 9f9cbdf71f7ef7c30c4b288de7f7b48f2a8c046e
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Tue Jun 12 10:04:59 2018 +0200
+
+ Make x.5.0 public
+
+ * ACE/NEWS:
+ * ACE/bin/diff-builds-and-group-fixed-tests-only.sh:
+ * ACE/docs/Download.html:
+ * ACE/etc/index.html:
+ * TAO/NEWS:
diff --git a/ACE/PROBLEM-REPORT-FORM b/ACE/PROBLEM-REPORT-FORM
index b7b201936c2..a1914366bfc 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.5.0
+ ACE VERSION: 6.5.1
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 75a0a3c0df2..c702e5d6dbb 100644
--- a/ACE/VERSION
+++ b/ACE/VERSION
@@ -1,4 +1,4 @@
-This is ACE version 6.5.0, released Tue Jun 12 08:27:49 CEST 2018
+This is ACE version 6.5.1, released Thu Aug 09 10:43:17 CEST 2018
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 5e0d58ccd2f..cfa043cfcdd 100644
--- a/ACE/ace/Version.h
+++ b/ACE/ace/Version.h
@@ -4,9 +4,9 @@
#define ACE_MAJOR_VERSION 6
#define ACE_MINOR_VERSION 5
-#define ACE_MICRO_VERSION 0
-#define ACE_BETA_VERSION 0
-#define ACE_VERSION "6.5.0"
-#define ACE_VERSION_CODE 394496
+#define ACE_MICRO_VERSION 1
+#define ACE_BETA_VERSION 1
+#define ACE_VERSION "6.5.1"
+#define ACE_VERSION_CODE 394497
#define ACE_MAKE_VERSION_CODE(a,b,c) (((a) << 16) + ((b) << 8) + (c))
diff --git a/ACE/debian/control b/ACE/debian/control
index cd8bb3361d2..6d125c0b7a3 100644
--- a/ACE/debian/control
+++ b/ACE/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.5.0
+Package: libace-6.5.1
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.5.0 (= ${binary:Version}), ${misc:Depends}
+Depends: libace-6.5.1 (= ${binary:Version}), ${misc:Depends}
Suggests: libace-doc, 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.5.0
+Package: libace-ssl-6.5.1
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.5.0 (= ${binary:Version}), libace-dev (= ${binary:Version}), libssl-dev, ${misc:Depends}
+Depends: libace-ssl-6.5.1 (= ${binary:Version}), libace-dev (= ${binary:Version}), libssl-dev, ${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.5.0
+Package: libace-rmcast-6.5.1
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.5.0 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libace-rmcast-6.5.1 (= ${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.5.0
+Package: libace-tmcast-6.5.1
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.5.0 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libace-tmcast-6.5.1 (= ${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.5.0
+Package: libace-htbp-6.5.1
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.5.0 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libace-htbp-6.5.1 (= ${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.5.0
+Package: libace-inet-6.5.1
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.5.0 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libace-inet-6.5.1 (= ${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.5.0
+Package: libace-inet-ssl-6.5.1
Architecture: any
Section: libs
-Depends: libace-inet-6.5.0, libace-ssl-6.5.0, ${shlibs:Depends}, ${misc:Depends}
+Depends: libace-inet-6.5.1, libace-ssl-6.5.1, ${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.5.0 (= ${binary:Version}), libace-inet-dev (= ${binary:Version}), libace-ssl-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libace-inet-ssl-6.5.1 (= ${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.
@@ -180,7 +180,7 @@ Description: ACE perfect hash function generator
basically the same options and functionality. ace_gperf simply takes
advantage of some of the features provided by the ACE library.
-Package: libacexml-6.5.0
+Package: libacexml-6.5.1
Architecture: any
Section: libs
Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -196,12 +196,12 @@ Package: libacexml-dev
Architecture: any
Section: libdevel
Replaces: libace-dev (<< 5.7.7-4)
-Depends: libacexml-6.5.0 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libacexml-6.5.1 (= ${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.5.0
+Package: libace-xml-utils-6.5.1
Architecture: any
Section: libs
Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -215,12 +215,12 @@ Package: libace-xml-utils-dev
Architecture: any
Section: libdevel
Replaces: libace-dev (<< 5.7.7-4)
-Depends: libace-xml-utils-6.5.0 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}, libxerces-c-dev
+Depends: libace-xml-utils-6.5.1 (= ${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.5.0
+Package: libkokyu-6.5.1
Architecture: any
Section: libs
Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -234,12 +234,12 @@ Description: ACE scheduling and dispatching library
Package: libkokyu-dev
Architecture: any
Section: libdevel
-Depends: libkokyu-6.5.0 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libkokyu-6.5.1 (= ${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-xtreactor-6.5.0
+Package: libace-xtreactor-6.5.1
Architecture: any
Section: libs
Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -257,12 +257,12 @@ Description: ACE-GUI reactor integration for Xt
Package: libace-xtreactor-dev
Architecture: any
Section: libdevel
-Depends: libace-xtreactor-6.5.0 (= ${binary:Version}), libace-dev (= ${binary:Version}), libxt-dev (>= 4.3.0), ${misc:Depends}
+Depends: libace-xtreactor-6.5.1 (= ${binary:Version}), libace-dev (= ${binary:Version}), libxt-dev (>= 4.3.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.5.0
+Package: libace-tkreactor-6.5.1
Architecture: any
Section: libs
Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -281,12 +281,12 @@ Description: ACE-GUI reactor integration for Tk
Package: libace-tkreactor-dev
Architecture: any
Section: libdevel
-Depends: libace-tkreactor-6.5.0 (= ${binary:Version}), libace-dev (= ${binary:Version}), tk-dev (>= 8.5), ${misc:Depends}
+Depends: libace-tkreactor-6.5.1 (= ${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.5.0
+Package: libace-flreactor-6.5.1
Architecture: any
Section: libs
Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -304,12 +304,12 @@ Description: ACE-GUI reactor integration for FLTK
Package: libace-flreactor-dev
Architecture: any
Section: libdevel
-Depends: libace-flreactor-6.5.0 (= ${binary:Version}), libace-dev (= ${binary:Version}), libfltk1.1-dev (>= 1.1.4), ${misc:Depends}
+Depends: libace-flreactor-6.5.1 (= ${binary:Version}), libace-dev (= ${binary:Version}), libfltk1.1-dev (>= 1.1.4), ${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.5.0
+Package: libace-foxreactor-6.5.1
Architecture: any
Section: libs
Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -326,7 +326,7 @@ Description: ACE-GUI reactor integration for FOX
Package: libace-foxreactor-dev
Architecture: any
Section: libdevel
-Depends: libace-foxreactor-6.5.0 (= ${binary:Version}), libace-dev (= ${binary:Version}), libfox-1.6-dev, ${misc:Depends}
+Depends: libace-foxreactor-6.5.1 (= ${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.
@@ -343,7 +343,7 @@ Description: ACE network service implementations
files to link the various ACE network services together, either
statically or dynamically, and form complete server programs.
-Package: libnetsvcs-6.5.0
+Package: libnetsvcs-6.5.1
Architecture: any
Section: libs
Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -357,7 +357,7 @@ Description: ACE network service implementations - libraries
Package: libnetsvcs-dev
Architecture: any
Section: libdevel
-Depends: libnetsvcs-6.5.0 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libnetsvcs-6.5.1 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
Description: ACE network service implementations - development files
ACE network services provide reusable components for common
distributed system tasks such as logging, naming, locking, and time
diff --git a/ACE/debian/libace-6.5.0.lintian-overrides b/ACE/debian/libace-6.5.0.lintian-overrides
deleted file mode 100644
index 304cd5f2a0f..00000000000
--- a/ACE/debian/libace-6.5.0.lintian-overrides
+++ /dev/null
@@ -1,6 +0,0 @@
-libace-6.5.0: no-symbols-control-file usr/lib/libACE-6.5.0.so
-libace-6.5.0: no-symbols-control-file usr/lib/libACE_ETCL_Parser-6.5.0.so
-libace-6.5.0: no-symbols-control-file usr/lib/libACE_Monitor_Control-6.5.0.so
-libace-6.5.0: no-symbols-control-file usr/lib/libACE_ETCL-6.5.0.so
-libace-6.5.0: no-symbols-control-file usr/lib/libACE_RLECompression-6.5.0.so
-libace-6.5.0: no-symbols-control-file usr/lib/libACE_Compression-6.5.0.so
diff --git a/ACE/debian/libace-6.5.0.docs b/ACE/debian/libace-6.5.1.docs
index 3bdab5b0089..3bdab5b0089 100644
--- a/ACE/debian/libace-6.5.0.docs
+++ b/ACE/debian/libace-6.5.1.docs
diff --git a/ACE/debian/libace-6.5.0.install b/ACE/debian/libace-6.5.1.install
index 182a5eda411..182a5eda411 100644
--- a/ACE/debian/libace-6.5.0.install
+++ b/ACE/debian/libace-6.5.1.install
diff --git a/ACE/debian/libace-6.5.1.lintian-overrides b/ACE/debian/libace-6.5.1.lintian-overrides
new file mode 100644
index 00000000000..2714f19d6c7
--- /dev/null
+++ b/ACE/debian/libace-6.5.1.lintian-overrides
@@ -0,0 +1,6 @@
+libace-6.5.1: no-symbols-control-file usr/lib/libACE-6.5.1.so
+libace-6.5.1: no-symbols-control-file usr/lib/libACE_ETCL_Parser-6.5.1.so
+libace-6.5.1: no-symbols-control-file usr/lib/libACE_Monitor_Control-6.5.1.so
+libace-6.5.1: no-symbols-control-file usr/lib/libACE_ETCL-6.5.1.so
+libace-6.5.1: no-symbols-control-file usr/lib/libACE_RLECompression-6.5.1.so
+libace-6.5.1: no-symbols-control-file usr/lib/libACE_Compression-6.5.1.so
diff --git a/ACE/debian/libace-flreactor-6.5.0.lintian-overrides b/ACE/debian/libace-flreactor-6.5.0.lintian-overrides
deleted file mode 100644
index fbe6d8c8d6f..00000000000
--- a/ACE/debian/libace-flreactor-6.5.0.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-libace-flreactor-6.5.0: no-symbols-control-file usr/lib/libACE_FlReactor-6.5.0.so
diff --git a/ACE/debian/libace-flreactor-6.5.0.install b/ACE/debian/libace-flreactor-6.5.1.install
index 528836aacee..528836aacee 100644
--- a/ACE/debian/libace-flreactor-6.5.0.install
+++ b/ACE/debian/libace-flreactor-6.5.1.install
diff --git a/ACE/debian/libace-flreactor-6.5.1.lintian-overrides b/ACE/debian/libace-flreactor-6.5.1.lintian-overrides
new file mode 100644
index 00000000000..dac21a0e023
--- /dev/null
+++ b/ACE/debian/libace-flreactor-6.5.1.lintian-overrides
@@ -0,0 +1 @@
+libace-flreactor-6.5.1: no-symbols-control-file usr/lib/libACE_FlReactor-6.5.1.so
diff --git a/ACE/debian/libace-foxreactor-6.5.0.lintian-overrides b/ACE/debian/libace-foxreactor-6.5.0.lintian-overrides
deleted file mode 100644
index 21b2dcf6093..00000000000
--- a/ACE/debian/libace-foxreactor-6.5.0.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-libace-foxreactor-6.5.0: no-symbols-control-file usr/lib/libACE_FoxReactor-6.5.0.so
diff --git a/ACE/debian/libace-foxreactor-6.5.0.install b/ACE/debian/libace-foxreactor-6.5.1.install
index e360f29f5af..e360f29f5af 100644
--- a/ACE/debian/libace-foxreactor-6.5.0.install
+++ b/ACE/debian/libace-foxreactor-6.5.1.install
diff --git a/ACE/debian/libace-foxreactor-6.5.1.lintian-overrides b/ACE/debian/libace-foxreactor-6.5.1.lintian-overrides
new file mode 100644
index 00000000000..10f4c23d0dd
--- /dev/null
+++ b/ACE/debian/libace-foxreactor-6.5.1.lintian-overrides
@@ -0,0 +1 @@
+libace-foxreactor-6.5.1: no-symbols-control-file usr/lib/libACE_FoxReactor-6.5.1.so
diff --git a/ACE/debian/libace-htbp-6.5.0.lintian-overrides b/ACE/debian/libace-htbp-6.5.0.lintian-overrides
deleted file mode 100644
index f70a4e5096b..00000000000
--- a/ACE/debian/libace-htbp-6.5.0.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-libace-htbp-6.5.0: no-symbols-control-file usr/lib/libACE_HTBP-6.5.0.so
diff --git a/ACE/debian/libace-htbp-6.5.0.install b/ACE/debian/libace-htbp-6.5.1.install
index 08103fd5cad..08103fd5cad 100644
--- a/ACE/debian/libace-htbp-6.5.0.install
+++ b/ACE/debian/libace-htbp-6.5.1.install
diff --git a/ACE/debian/libace-htbp-6.5.1.lintian-overrides b/ACE/debian/libace-htbp-6.5.1.lintian-overrides
new file mode 100644
index 00000000000..15f2dbee773
--- /dev/null
+++ b/ACE/debian/libace-htbp-6.5.1.lintian-overrides
@@ -0,0 +1 @@
+libace-htbp-6.5.1: no-symbols-control-file usr/lib/libACE_HTBP-6.5.1.so
diff --git a/ACE/debian/libace-inet-6.5.0.lintian-overrides b/ACE/debian/libace-inet-6.5.0.lintian-overrides
deleted file mode 100644
index c1d53191e88..00000000000
--- a/ACE/debian/libace-inet-6.5.0.lintian-overrides
+++ /dev/null
@@ -1,2 +0,0 @@
-libace-inet-6.5.0: extended-description-is-probably-too-short
-libace-inet-6.5.0: no-symbols-control-file usr/lib/libACE_INet-6.5.0.so
diff --git a/ACE/debian/libace-inet-6.5.0.install b/ACE/debian/libace-inet-6.5.1.install
index 59a73a509d0..59a73a509d0 100644
--- a/ACE/debian/libace-inet-6.5.0.install
+++ b/ACE/debian/libace-inet-6.5.1.install
diff --git a/ACE/debian/libace-inet-6.5.1.lintian-overrides b/ACE/debian/libace-inet-6.5.1.lintian-overrides
new file mode 100644
index 00000000000..eb9027827ae
--- /dev/null
+++ b/ACE/debian/libace-inet-6.5.1.lintian-overrides
@@ -0,0 +1,2 @@
+libace-inet-6.5.1: extended-description-is-probably-too-short
+libace-inet-6.5.1: no-symbols-control-file usr/lib/libACE_INet-6.5.1.so
diff --git a/ACE/debian/libace-inet-ssl-6.5.0.lintian-overrides b/ACE/debian/libace-inet-ssl-6.5.0.lintian-overrides
deleted file mode 100644
index 7b64def9a35..00000000000
--- a/ACE/debian/libace-inet-ssl-6.5.0.lintian-overrides
+++ /dev/null
@@ -1,4 +0,0 @@
-libace-inet-ssl-6.5.0: no-symbols-control-file usr/lib/libACE_INet_SSL-6.5.0.so
-
-# It's Bison-generate code covered by the GNU Bison GPL-exception
-libace-inet-ssl-6.5.0: possible-gpl-code-linked-with-openssl
diff --git a/ACE/debian/libace-inet-ssl-6.5.0.install b/ACE/debian/libace-inet-ssl-6.5.1.install
index b9b8b9045f7..b9b8b9045f7 100644
--- a/ACE/debian/libace-inet-ssl-6.5.0.install
+++ b/ACE/debian/libace-inet-ssl-6.5.1.install
diff --git a/ACE/debian/libace-inet-ssl-6.5.1.lintian-overrides b/ACE/debian/libace-inet-ssl-6.5.1.lintian-overrides
new file mode 100644
index 00000000000..5409d9a19d0
--- /dev/null
+++ b/ACE/debian/libace-inet-ssl-6.5.1.lintian-overrides
@@ -0,0 +1,4 @@
+libace-inet-ssl-6.5.1: no-symbols-control-file usr/lib/libACE_INet_SSL-6.5.1.so
+
+# It's Bison-generate code covered by the GNU Bison GPL-exception
+libace-inet-ssl-6.5.1: possible-gpl-code-linked-with-openssl
diff --git a/ACE/debian/libace-rmcast-6.5.0.lintian-overrides b/ACE/debian/libace-rmcast-6.5.0.lintian-overrides
deleted file mode 100644
index 75b12caae6c..00000000000
--- a/ACE/debian/libace-rmcast-6.5.0.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-libace-rmcast-6.5.0: no-symbols-control-file usr/lib/libACE_RMCast-6.5.0.so
diff --git a/ACE/debian/libace-rmcast-6.5.0.install b/ACE/debian/libace-rmcast-6.5.1.install
index 86e78259853..86e78259853 100644
--- a/ACE/debian/libace-rmcast-6.5.0.install
+++ b/ACE/debian/libace-rmcast-6.5.1.install
diff --git a/ACE/debian/libace-rmcast-6.5.1.lintian-overrides b/ACE/debian/libace-rmcast-6.5.1.lintian-overrides
new file mode 100644
index 00000000000..b279a07f4e7
--- /dev/null
+++ b/ACE/debian/libace-rmcast-6.5.1.lintian-overrides
@@ -0,0 +1 @@
+libace-rmcast-6.5.1: no-symbols-control-file usr/lib/libACE_RMCast-6.5.1.so
diff --git a/ACE/debian/libace-ssl-6.5.0.lintian-overrides b/ACE/debian/libace-ssl-6.5.0.lintian-overrides
deleted file mode 100644
index 4535ada60ef..00000000000
--- a/ACE/debian/libace-ssl-6.5.0.lintian-overrides
+++ /dev/null
@@ -1,5 +0,0 @@
-libace-ssl-6.5.0: extended-description-is-probably-too-short
-libace-ssl-6.5.0: no-symbols-control-file usr/lib/libACE_SSL-6.5.0.so
-
-# It's Bison-generate code covered by the GNU Bison GPL-exception
-libace-ssl-6.5.0: possible-gpl-code-linked-with-openssl
diff --git a/ACE/debian/libace-ssl-6.5.0.NEWS b/ACE/debian/libace-ssl-6.5.1.NEWS
index e5bd0e4aa10..e5bd0e4aa10 100644
--- a/ACE/debian/libace-ssl-6.5.0.NEWS
+++ b/ACE/debian/libace-ssl-6.5.1.NEWS
diff --git a/ACE/debian/libace-ssl-6.5.0.install b/ACE/debian/libace-ssl-6.5.1.install
index 8df45a6d55f..8df45a6d55f 100644
--- a/ACE/debian/libace-ssl-6.5.0.install
+++ b/ACE/debian/libace-ssl-6.5.1.install
diff --git a/ACE/debian/libace-ssl-6.5.1.lintian-overrides b/ACE/debian/libace-ssl-6.5.1.lintian-overrides
new file mode 100644
index 00000000000..268215ac1c2
--- /dev/null
+++ b/ACE/debian/libace-ssl-6.5.1.lintian-overrides
@@ -0,0 +1,5 @@
+libace-ssl-6.5.1: extended-description-is-probably-too-short
+libace-ssl-6.5.1: no-symbols-control-file usr/lib/libACE_SSL-6.5.1.so
+
+# It's Bison-generate code covered by the GNU Bison GPL-exception
+libace-ssl-6.5.1: possible-gpl-code-linked-with-openssl
diff --git a/ACE/debian/libace-tkreactor-6.5.0.lintian-overrides b/ACE/debian/libace-tkreactor-6.5.0.lintian-overrides
deleted file mode 100644
index ed3936e9c39..00000000000
--- a/ACE/debian/libace-tkreactor-6.5.0.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-libace-tkreactor-6.5.0: no-symbols-control-file usr/lib/libACE_TkReactor-6.5.0.so
diff --git a/ACE/debian/libace-tkreactor-6.5.0.install b/ACE/debian/libace-tkreactor-6.5.1.install
index 12ab35062d2..12ab35062d2 100644
--- a/ACE/debian/libace-tkreactor-6.5.0.install
+++ b/ACE/debian/libace-tkreactor-6.5.1.install
diff --git a/ACE/debian/libace-tkreactor-6.5.1.lintian-overrides b/ACE/debian/libace-tkreactor-6.5.1.lintian-overrides
new file mode 100644
index 00000000000..a9ab81aa82a
--- /dev/null
+++ b/ACE/debian/libace-tkreactor-6.5.1.lintian-overrides
@@ -0,0 +1 @@
+libace-tkreactor-6.5.1: no-symbols-control-file usr/lib/libACE_TkReactor-6.5.1.so
diff --git a/ACE/debian/libace-tmcast-6.5.0.lintian-overrides b/ACE/debian/libace-tmcast-6.5.0.lintian-overrides
deleted file mode 100644
index 2f2a5f4f23d..00000000000
--- a/ACE/debian/libace-tmcast-6.5.0.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-libace-tmcast-6.5.0: no-symbols-control-file usr/lib/libACE_TMCast-6.5.0.so
diff --git a/ACE/debian/libace-tmcast-6.5.0.install b/ACE/debian/libace-tmcast-6.5.1.install
index e066131dea0..e066131dea0 100644
--- a/ACE/debian/libace-tmcast-6.5.0.install
+++ b/ACE/debian/libace-tmcast-6.5.1.install
diff --git a/ACE/debian/libace-tmcast-6.5.1.lintian-overrides b/ACE/debian/libace-tmcast-6.5.1.lintian-overrides
new file mode 100644
index 00000000000..ba6f5d444b5
--- /dev/null
+++ b/ACE/debian/libace-tmcast-6.5.1.lintian-overrides
@@ -0,0 +1 @@
+libace-tmcast-6.5.1: no-symbols-control-file usr/lib/libACE_TMCast-6.5.1.so
diff --git a/ACE/debian/libace-xml-utils-6.5.0.lintian-overrides b/ACE/debian/libace-xml-utils-6.5.0.lintian-overrides
deleted file mode 100644
index f75a280799a..00000000000
--- a/ACE/debian/libace-xml-utils-6.5.0.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-libace-xml-utils-6.5.0: no-symbols-control-file usr/lib/libACE_XML_Utils-6.5.0.so
diff --git a/ACE/debian/libace-xml-utils-6.5.0.install b/ACE/debian/libace-xml-utils-6.5.1.install
index 2428ec9f109..2428ec9f109 100644
--- a/ACE/debian/libace-xml-utils-6.5.0.install
+++ b/ACE/debian/libace-xml-utils-6.5.1.install
diff --git a/ACE/debian/libace-xml-utils-6.5.1.lintian-overrides b/ACE/debian/libace-xml-utils-6.5.1.lintian-overrides
new file mode 100644
index 00000000000..92e739e7e78
--- /dev/null
+++ b/ACE/debian/libace-xml-utils-6.5.1.lintian-overrides
@@ -0,0 +1 @@
+libace-xml-utils-6.5.1: no-symbols-control-file usr/lib/libACE_XML_Utils-6.5.1.so
diff --git a/ACE/debian/libace-xtreactor-6.5.0.lintian-overrides b/ACE/debian/libace-xtreactor-6.5.0.lintian-overrides
deleted file mode 100644
index b6051b04ae2..00000000000
--- a/ACE/debian/libace-xtreactor-6.5.0.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-libace-xtreactor-6.5.0: no-symbols-control-file usr/lib/libACE_XtReactor-6.5.0.so
diff --git a/ACE/debian/libace-xtreactor-6.5.0.install b/ACE/debian/libace-xtreactor-6.5.1.install
index c53614c7208..c53614c7208 100644
--- a/ACE/debian/libace-xtreactor-6.5.0.install
+++ b/ACE/debian/libace-xtreactor-6.5.1.install
diff --git a/ACE/debian/libace-xtreactor-6.5.1.lintian-overrides b/ACE/debian/libace-xtreactor-6.5.1.lintian-overrides
new file mode 100644
index 00000000000..e8634b20f6f
--- /dev/null
+++ b/ACE/debian/libace-xtreactor-6.5.1.lintian-overrides
@@ -0,0 +1 @@
+libace-xtreactor-6.5.1: no-symbols-control-file usr/lib/libACE_XtReactor-6.5.1.so
diff --git a/ACE/debian/libacexml-6.5.0.lintian-overrides b/ACE/debian/libacexml-6.5.0.lintian-overrides
deleted file mode 100644
index fdd3bfbdbb8..00000000000
--- a/ACE/debian/libacexml-6.5.0.lintian-overrides
+++ /dev/null
@@ -1,3 +0,0 @@
-libacexml-6.5.0: no-symbols-control-file usr/lib/libACEXML_Parser-6.5.0.so
-libacexml-6.5.0: no-symbols-control-file usr/lib/libACEXML_XML_Svc_Conf_Parser-6.5.0.so
-libacexml-6.5.0: no-symbols-control-file usr/lib/libACEXML-6.5.0.so
diff --git a/ACE/debian/libacexml-6.5.0.docs b/ACE/debian/libacexml-6.5.1.docs
index 002855d7915..002855d7915 100644
--- a/ACE/debian/libacexml-6.5.0.docs
+++ b/ACE/debian/libacexml-6.5.1.docs
diff --git a/ACE/debian/libacexml-6.5.0.install b/ACE/debian/libacexml-6.5.1.install
index d3e912ffa51..d3e912ffa51 100644
--- a/ACE/debian/libacexml-6.5.0.install
+++ b/ACE/debian/libacexml-6.5.1.install
diff --git a/ACE/debian/libacexml-6.5.1.lintian-overrides b/ACE/debian/libacexml-6.5.1.lintian-overrides
new file mode 100644
index 00000000000..fe225835640
--- /dev/null
+++ b/ACE/debian/libacexml-6.5.1.lintian-overrides
@@ -0,0 +1,3 @@
+libacexml-6.5.1: no-symbols-control-file usr/lib/libACEXML_Parser-6.5.1.so
+libacexml-6.5.1: no-symbols-control-file usr/lib/libACEXML_XML_Svc_Conf_Parser-6.5.1.so
+libacexml-6.5.1: no-symbols-control-file usr/lib/libACEXML-6.5.1.so
diff --git a/ACE/debian/libkokyu-6.5.0.lintian-overrides b/ACE/debian/libkokyu-6.5.0.lintian-overrides
deleted file mode 100644
index 0c93cd792e7..00000000000
--- a/ACE/debian/libkokyu-6.5.0.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-libkokyu-6.5.0: no-symbols-control-file usr/lib/libKokyu-6.5.0.so
diff --git a/ACE/debian/libkokyu-6.5.0.docs b/ACE/debian/libkokyu-6.5.1.docs
index e8869c513b2..e8869c513b2 100644
--- a/ACE/debian/libkokyu-6.5.0.docs
+++ b/ACE/debian/libkokyu-6.5.1.docs
diff --git a/ACE/debian/libkokyu-6.5.0.install b/ACE/debian/libkokyu-6.5.1.install
index 62854308f96..62854308f96 100644
--- a/ACE/debian/libkokyu-6.5.0.install
+++ b/ACE/debian/libkokyu-6.5.1.install
diff --git a/ACE/debian/libkokyu-6.5.1.lintian-overrides b/ACE/debian/libkokyu-6.5.1.lintian-overrides
new file mode 100644
index 00000000000..cd0ad5a1687
--- /dev/null
+++ b/ACE/debian/libkokyu-6.5.1.lintian-overrides
@@ -0,0 +1 @@
+libkokyu-6.5.1: no-symbols-control-file usr/lib/libKokyu-6.5.1.so
diff --git a/ACE/debian/libnetsvcs-6.5.0.lintian-overrides b/ACE/debian/libnetsvcs-6.5.0.lintian-overrides
deleted file mode 100644
index e15cde2607d..00000000000
--- a/ACE/debian/libnetsvcs-6.5.0.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-libnetsvcs-6.5.0: no-symbols-control-file usr/lib/libnetsvcs-6.5.0.so
diff --git a/ACE/debian/libnetsvcs-6.5.0.docs b/ACE/debian/libnetsvcs-6.5.1.docs
index 0b03c55b91f..0b03c55b91f 100644
--- a/ACE/debian/libnetsvcs-6.5.0.docs
+++ b/ACE/debian/libnetsvcs-6.5.1.docs
diff --git a/ACE/debian/libnetsvcs-6.5.0.install b/ACE/debian/libnetsvcs-6.5.1.install
index c7a04b16213..c7a04b16213 100644
--- a/ACE/debian/libnetsvcs-6.5.0.install
+++ b/ACE/debian/libnetsvcs-6.5.1.install
diff --git a/ACE/debian/libnetsvcs-6.5.1.lintian-overrides b/ACE/debian/libnetsvcs-6.5.1.lintian-overrides
new file mode 100644
index 00000000000..acbc604bd48
--- /dev/null
+++ b/ACE/debian/libnetsvcs-6.5.1.lintian-overrides
@@ -0,0 +1 @@
+libnetsvcs-6.5.1: no-symbols-control-file usr/lib/libnetsvcs-6.5.1.so
diff --git a/ACE/rpmbuild/ace-tao.spec b/ACE/rpmbuild/ace-tao.spec
index ea073ceb74f..176d2098bec 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.5.0
-%define TAOVER 2.5.0
+%define ACEVER 6.5.1
+%define TAOVER 2.5.1
# Conditional build
# Default values are
diff --git a/TAO/ChangeLogs/TAO-2_5_1 b/TAO/ChangeLogs/TAO-2_5_1
new file mode 100644
index 00000000000..ed7eaf9d92c
--- /dev/null
+++ b/TAO/ChangeLogs/TAO-2_5_1
@@ -0,0 +1,293 @@
+commit d6b268e7eee10aabaa775065f72e283e2ce053f0
+Merge: 15c371e5493 c7571f5ff80
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Mon Aug 6 09:42:41 2018 +0200
+
+ Merge branch 'master' of https://github.com/DOCGroup/ACE_TAO
+
+commit 15c371e5493f0d727cd0bd395fe218b064bc4f16
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Mon Aug 6 09:41:29 2018 +0200
+
+ List important changes for the upcoming release
+
+ * ACE/NEWS:
+ * TAO/NEWS:
+
+commit c7571f5ff80763484bf073f37dabfed0cb7983cc
+Merge: f475da3f322 4a09b0b10cb
+Author: mcorino <mcorino@remedy.nl>
+Date: Sun Aug 5 17:45:31 2018 +0200
+
+ Merge pull request #656 from mcorino/mco-feature-4310-string-cdr-optimize
+
+ add full support for streaming std::(w)string
+
+commit f475da3f3220f507ce3d9b21793819a1aee65a48
+Merge: 81d3d81c4cf 36ea9ed6bdd
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Sun Aug 5 13:03:33 2018 +0200
+
+ Merge pull request #657 from jwillemsen/master
+
+ When we log that there is a new ORB add the TAO version number and some unicode logging fixes
+
+commit 00889d546822fd839b75a1259c66f92be16ac5a4
+Merge: 36ea9ed6bdd 81d3d81c4cf
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Sun Aug 5 11:38:04 2018 +0200
+
+ Merge branch 'master' of https://github.com/DOCGroup/ACE_TAO
+
+commit 36ea9ed6bdd8cccc357464284673f3c3088245d2
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Sun Aug 5 11:37:12 2018 +0200
+
+ Unicode logging fixes
+
+ * TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ReplicaController.cpp:
+
+commit 87a6798992b9a811f0cc18518eb67d1ad2eacdb9
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Sun Aug 5 11:36:54 2018 +0200
+
+ When logging that we are a new ORB add the TAO version number so that we can easily determine what TAO version is being used
+
+ * TAO/tao/TAO_Internal.cpp:
+
+commit 4a09b0b10cbea1fdcb16161583ee22f7d151784b
+Author: Martin Corino <mcorino@remedy.nl>
+Date: Fri Aug 3 14:15:38 2018 +0200
+
+ add full support for streaming std::(w)string
+
+ (optimized for C++11 and onwards)
+ added tests for optimized std::(w)string support
+ extend character translators with std::(w)string support also
+
+commit 81d3d81c4cf0904cd8d5b4c0872cd1821b5d874e
+Merge: 7dc5afd1290 4fd91ecdac2
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Fri Jul 27 10:42:13 2018 +0200
+
+ Merge pull request #653 from jwillemsen/master
+
+ Documentation enhancements
+
+commit 4fd91ecdac261befa4210db0f40512e33a02b0a5
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Fri Jul 27 09:15:34 2018 +0200
+
+ Removed references to CIDLC
+
+commit 217c6a22c82831e68367cce43967610a5fb2c9e3
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Fri Jul 27 09:10:18 2018 +0200
+
+ Document -GX flag
+
+ * TAO/TAO_IDL/be/be_util.cpp:
+
+commit 8a9912c18c61fcb3141d661a6536370091a6fc67
+Author: Adam Mitz <mitza@ociweb.com>
+Date: Mon Jul 9 10:08:30 2018 -0500
+
+ Removed duplicated project files (MPC issue 50)
+
+commit 99c9779877f85f1201b50b1d4e1e49cd552ad9aa
+Merge: d271d46ebb2 29b0969b1ca
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Wed Jun 27 21:35:29 2018 +0200
+
+ Merge pull request #649 from jwillemsen/jwi-catchbyref
+
+ Catch exceptions by reference, not by value
+
+commit 29b0969b1ca474cc83e8499faabafd0d9d162ec0
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Wed Jun 27 19:48:34 2018 +0200
+
+ Catch exceptions by reference, not by value
+
+ * TAO/orbsvcs/tests/Bug_3215_Regression/client.cpp:
+ * TAO/orbsvcs/tests/FT_Naming/stress_storable/client.cpp:
+ * TAO/orbsvcs/tests/Notify/Bug_1884_Regression/consumer.cpp:
+ * TAO/orbsvcs/tests/Notify/Bug_1884_Regression/filter.cpp:
+ * TAO/orbsvcs/tests/Notify/Bug_1884_Regression/supplier.cpp:
+ * TAO/orbsvcs/tests/Notify/Bug_3688_Regression/consumer.cpp:
+ * TAO/orbsvcs/tests/Notify/Bug_3688_Regression/supplier.cpp:
+ * TAO/tests/Bug_2241_Regression/Client_Task.cpp:
+ * TAO/tests/Collocated_ThruP_Sp/Client_Task.cpp:
+ * TAO/tests/Collocated_ThruP_Sp_Gd/Client_Task.cpp:
+ * TAO/tests/UNKNOWN_Exception/client.cpp:
+
+commit 7165c10ea6079dd7a01d5e490a4399d40d6f26f7
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Wed Jun 27 08:44:05 2018 +0200
+
+ Moved location of new define
+
+ * TAO/tao/Object.h:
+
+commit 5cbcb4433ea1a1d193c4d9febc8f368473c15f49
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Wed Jun 27 08:43:48 2018 +0200
+
+ Set a new define when we use atomic refcount so that we can use that in OpenDDS
+
+ * TAO/tao/Object.h:
+
+commit 1a4ad4bce2baf938893b004b267dd2a9740bf05c
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Tue Jun 26 08:17:36 2018 +0200
+
+ Revert rename of ref_count_ to refcount_
+
+ * TAO/tao/PortableServer/Servant_Base.cpp:
+ * TAO/tao/PortableServer/Servant_Base.h:
+
+commit 5bcb4583a4d36e392cf41c6b47ccdb04fd55d504
+Merge: 15917ee2583 e1d2dd92025
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Mon Jun 25 18:27:03 2018 +0200
+
+ Merge pull request #643 from jwillemsen/jwi-atomicservantrefcount
+
+ Make use of std::atomic for the refcount when we have C++11 enabled
+
+commit 15917ee25836f6704604a49e2aa76f8fb1423734
+Merge: 1e957f1a2ec c970fefc424
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Mon Jun 25 18:26:29 2018 +0200
+
+ Merge pull request #644 from jwillemsen/jwi-incorrectportablserverlogging
+
+ Fixed incorrect ascii logging
+
+commit c970fefc4240a16c613ac35abd99f533c2fb8256
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Mon Jun 25 16:48:06 2018 +0200
+
+ Layout change
+
+ * TAO/tao/PortableServer/IdUniquenessStrategyUnique.h:
+
+commit 5c09ab8d5f38438847a7a490a579840eea07d58a
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Mon Jun 25 16:46:47 2018 +0200
+
+ Fixed incorrect logging of ascii strings in portableserver
+
+ * TAO/tao/PortableServer/IdAssignmentStrategyFactoryImpl.cpp:
+ * TAO/tao/PortableServer/ImplicitActivationStrategyFactoryImpl.cpp:
+ * TAO/tao/PortableServer/LifespanStrategyFactoryImpl.cpp:
+ * TAO/tao/PortableServer/ServantRetentionStrategyFactoryImpl.cpp:
+
+commit e1d2dd92025037f1fac37a85a6bf465238e5c296
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Mon Jun 25 10:00:23 2018 +0200
+
+ Fixed another refcount issue where the ec event count was intended
+
+ * TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.cpp:
+
+commit 65a1833f81bf3f84d4bd33d3944a9733f37aae94
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Mon Jun 25 09:14:51 2018 +0200
+
+ Fixed compile errors due to rename in the base, make clear that ec has its own refcount
+
+ * TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.cpp:
+ * TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.h:
+ * TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching_Task.cpp:
+ * TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxyConsumer.cpp:
+ * TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.cpp:
+
+commit 36d7aee1a214c14b1621bf773e9aae82c9971af5
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Sun Jun 24 19:23:50 2018 +0200
+
+ Make use of std::atomic when C++11 has been enabled
+
+ * TAO/tao/AnyTypeCode/Any_Impl.cpp:
+ * TAO/tao/AnyTypeCode/Any_Impl.h:
+ * TAO/tao/AnyTypeCode/NVList.h:
+ * TAO/tao/AnyTypeCode/True_RefCount_Policy.h:
+ * TAO/tao/DynamicInterface/Context.cpp:
+ * TAO/tao/DynamicInterface/Context.h:
+ * TAO/tao/DynamicInterface/ExceptionList.cpp:
+ * TAO/tao/DynamicInterface/ExceptionList.h:
+ * TAO/tao/DynamicInterface/ExceptionList.inl:
+ * TAO/tao/DynamicInterface/Request.h:
+ * TAO/tao/DynamicInterface/Server_Request.h:
+ * TAO/tao/Intrusive_Ref_Count_Base_T.h:
+ * TAO/tao/Intrusive_Ref_Count_Base_T.inl:
+ * TAO/tao/ORB.h:
+ * TAO/tao/ORB.inl:
+ * TAO/tao/ORB_Core.h:
+ * TAO/tao/ORB_Core.inl:
+ * TAO/tao/Object.cpp:
+ * TAO/tao/Object.h:
+ * TAO/tao/PortableServer/Servant_Base.cpp:
+ * TAO/tao/PortableServer/Servant_Base.h:
+ * TAO/tao/Principal.h:
+ * TAO/tao/Profile.h:
+ * TAO/tao/Refcounted_ObjectKey.cpp:
+ * TAO/tao/Refcounted_ObjectKey.h:
+ * TAO/tao/Refcounted_ObjectKey.inl:
+ * TAO/tao/Reply_Dispatcher.cpp:
+ * TAO/tao/Reply_Dispatcher.h:
+ * TAO/tao/Stub.h:
+ * TAO/tao/Valuetype/AbstractBase.h:
+ * TAO/tao/Valuetype/ValueBase.cpp:
+ * TAO/tao/Valuetype/ValueBase.h:
+ * TAO/tao/Valuetype/ValueFactory.cpp:
+ * TAO/tao/Valuetype/ValueFactory.h:
+
+commit 9d5ca158661004ec2ecabc64f2ff8297c4c2e1b4
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Sat Jun 23 21:21:17 2018 +0200
+
+ MacOSX doesn't have a std::atomic_uint32_t
+
+ * TAO/tao/Intrusive_Ref_Count_Base_T.h:
+ * TAO/tao/PortableServer/Servant_Base.h:
+ * TAO/tao/Profile.h:
+ * TAO/tao/Stub.h:
+
+commit 2aeaf51d0efe793cf67281262260b906a5b0f21c
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Sat Jun 23 11:41:51 2018 +0200
+
+ Make use of std::atomic for the refcount when we have C++11 enabled
+
+ * TAO/tao/PortableServer/Servant_Base.cpp:
+ * TAO/tao/PortableServer/Servant_Base.h:
+
+commit 89543cbe78f86834c54e053cd2d87516b50df585
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Fri Jun 22 12:51:09 2018 +0200
+
+ List empty PIDL_Files section to not generate DynamicANy.pidl twice
+
+ * TAO/tao/DynamicAny/DynamicAny.mpc:
+
+commit 86fc71497323f80410c9fe0afe5d82fffb044c20
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Fri Jun 15 08:37:26 2018 +0200
+
+ Add missing include of ace/Auto_Ptr.h
+
+ * TAO/orbsvcs/orbsvcs/Notify/ThreadPool_Task.h:
+
+commit 9f9cbdf71f7ef7c30c4b288de7f7b48f2a8c046e
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Tue Jun 12 10:04:59 2018 +0200
+
+ Make x.5.0 public
+
+ * ACE/NEWS:
+ * ACE/bin/diff-builds-and-group-fixed-tests-only.sh:
+ * ACE/docs/Download.html:
+ * ACE/etc/index.html:
+ * TAO/NEWS:
diff --git a/TAO/PROBLEM-REPORT-FORM b/TAO/PROBLEM-REPORT-FORM
index faaaaee409b..ac8c2c3c60c 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.5.0
- ACE VERSION: 6.5.0
+ TAO VERSION: 2.5.1
+ ACE VERSION: 6.5.1
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 6c08a230c9c..e0ce3c8617c 100644
--- a/TAO/VERSION
+++ b/TAO/VERSION
@@ -1,4 +1,4 @@
-This is TAO version 2.5.0, released Tue Jun 12 08:27:49 CEST 2018
+This is TAO version 2.5.1, released Thu Aug 09 10:43:17 CEST 2018
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 8b07464f6b4..49d8c7ce557 100644
--- a/TAO/tao/Version.h
+++ b/TAO/tao/Version.h
@@ -4,9 +4,9 @@
#define TAO_MAJOR_VERSION 2
#define TAO_MINOR_VERSION 5
-#define TAO_MICRO_VERSION 0
-#define TAO_BETA_VERSION 0
-#define TAO_VERSION "2.5.0"
-#define TAO_VERSION_CODE 132352
+#define TAO_MICRO_VERSION 1
+#define TAO_BETA_VERSION 1
+#define TAO_VERSION "2.5.1"
+#define TAO_VERSION_CODE 132353
#define TAO_MAKE_VERSION_CODE(a,b,c) (((a) << 16) + ((b) << 8) + (c))