summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2014-07-03 10:57:43 +0000
committerJohnny Willemsen <jwillemsen@remedy.nl>2014-07-03 10:57:43 +0000
commitb800c9cd906a793bb126805435e5f7dffe06b119 (patch)
treee3c757ee82df6e91a34e251d3974f342ab2cb6c6
parentf9afe76244e0523be58dbbe2703a94fdbe2cca2d (diff)
downloadATCD-b800c9cd906a793bb126805435e5f7dffe06b119.tar.gz
Thu Jul 3 10:47:48 UTC 2014 Johnny Willemsen <jwillemsen@remedy.nl>
* ace/Event_Handler.h: Introduce ACE::make_event_handler<T> factory method which is enabled when we have C++11 support. This is similar to std::make_unique and std::make_shared, but can be used to allocate ACE_Event_Handler instances and directly assign them to a ACE_Event_Handler_var * tests/Bug_2820_Regression_Test.cpp: Use the new ACE::make_event_handler<T> * ace/OS_NS_stdio.inl: * ace/config-win32-msvc-14.h: msvc14 has C99 compliant vsnprintf/vsnwprintf * ace/Dev_Poll_Reactor.cpp: * ace/Get_Opt.cpp: * ace/MMAP_Memory_Pool.cpp: * ace/SOCK_Dgram_Bcast.cpp: * ace/Select_Reactor_Base.cpp: * ace/Service_Gestalt.cpp: * ace/Sock_Connect.cpp: * ace/WFMO_Reactor.cpp: * apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/buffer.h: * apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/daemon.h: * bin/fuzz.pl: * examples/Reactor/Proactor/test_udp_proactor.cpp: Fixed typos * debian/debian.control: * debian/libace-6.2.7.lintian-overrides: * debian/libace-dev.lintian-overrides: * debian/libace-doc.lintian-overrides: * debian/libace-flreactor-6.2.7.lintian-overrides: * debian/libace-flreactor-dev.lintian-overrides: * debian/libace-foxreactor-6.2.7.lintian-overrides: * debian/libace-foxreactor-dev.lintian-overrides: * debian/libace-htbp-6.2.7.lintian-overrides: * debian/libace-htbp-dev.lintian-overrides: * debian/libace-inet-6.2.7.lintian-overrides: * debian/libace-inet-dev.lintian-overrides: * debian/libace-inet-ssl-6.2.7.lintian-overrides: * debian/libace-inet-ssl-dev.lintian-overrides: * debian/libace-qtreactor-6.2.7.lintian-overrides: * debian/libace-qtreactor-dev.lintian-overrides: * debian/libace-rmcast-6.2.7.lintian-overrides: * debian/libace-rmcast-dev.lintian-overrides: * debian/libace-ssl-6.2.7.lintian-overrides: * debian/libace-ssl-dev.lintian-overrides: * debian/libace-tkreactor-6.2.7.lintian-overrides: * debian/libace-tkreactor-dev.lintian-overrides: * debian/libace-tmcast-6.2.7.lintian-overrides: * debian/libace-tmcast-dev.lintian-overrides: * debian/libace-xml-utils-6.2.7.lintian-overrides: * debian/libace-xml-utils-dev.lintian-overrides: * debian/libace-xtreactor-6.2.7.lintian-overrides: * debian/libace-xtreactor-dev.lintian-overrides: * debian/libacexml-6.2.7.lintian-overrides: * debian/libacexml-dev.lintian-overrides: * debian/libkokyu-6.2.7.lintian-overrides: * debian/libkokyu-dev.lintian-overrides: * debian/libnetsvcs-6.2.7.lintian-overrides: * debian/libtao-2.2.7.lintian-overrides: * debian/libtao-dev.lintian-overrides: * debian/libtao-doc.lintian-overrides: * debian/libtao-flresource-2.2.7.lintian-overrides: * debian/libtao-flresource-dev.lintian-overrides: * debian/libtao-foxresource-2.2.7.lintian-overrides: * debian/libtao-foxresource-dev.lintian-overrides: * debian/libtao-orbsvcs-2.2.7.lintian-overrides: * debian/libtao-qtresource-2.2.7.lintian-overrides: * debian/libtao-qtresource-dev.lintian-overrides: * debian/libtao-tkresource-2.2.7.lintian-overrides: * debian/libtao-tkresource-dev.lintian-overrides: * debian/libtao-xtresource-2.2.7.lintian-overrides: * debian/libtao-xtresource-dev.lintian-overrides: Imported files from debian packaging
-rw-r--r--ACE/ChangeLog79
-rw-r--r--ACE/ace/Dev_Poll_Reactor.cpp2
-rw-r--r--ACE/ace/Event_Handler.h30
-rw-r--r--ACE/ace/Get_Opt.cpp2
-rw-r--r--ACE/ace/MMAP_Memory_Pool.cpp2
-rw-r--r--ACE/ace/OS_NS_stdio.inl16
-rw-r--r--ACE/ace/SOCK_Dgram_Bcast.cpp2
-rw-r--r--ACE/ace/Select_Reactor_Base.cpp2
-rw-r--r--ACE/ace/Service_Gestalt.cpp2
-rw-r--r--ACE/ace/Sock_Connect.cpp2
-rw-r--r--ACE/ace/WFMO_Reactor.cpp2
-rw-r--r--ACE/ace/config-win32-msvc-14.h10
-rw-r--r--ACE/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/buffer.h2
-rw-r--r--ACE/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/daemon.h2
-rwxr-xr-xACE/bin/fuzz.pl4
-rw-r--r--ACE/debian/debian.control50
-rw-r--r--ACE/debian/libace-6.2.7.lintian-overrides4
-rw-r--r--ACE/debian/libace-dev.lintian-overrides1
-rw-r--r--ACE/debian/libace-doc.lintian-overrides8
-rw-r--r--ACE/debian/libace-flreactor-6.2.7.lintian-overrides1
-rw-r--r--ACE/debian/libace-flreactor-dev.lintian-overrides1
-rw-r--r--ACE/debian/libace-foxreactor-6.2.7.lintian-overrides1
-rw-r--r--ACE/debian/libace-foxreactor-dev.lintian-overrides1
-rw-r--r--ACE/debian/libace-htbp-6.2.7.lintian-overrides1
-rw-r--r--ACE/debian/libace-htbp-dev.lintian-overrides1
-rw-r--r--ACE/debian/libace-inet-6.2.7.lintian-overrides2
-rw-r--r--ACE/debian/libace-inet-dev.lintian-overrides1
-rw-r--r--ACE/debian/libace-inet-ssl-6.2.7.lintian-overrides1
-rw-r--r--ACE/debian/libace-inet-ssl-dev.lintian-overrides1
-rw-r--r--ACE/debian/libace-qtreactor-6.2.7.lintian-overrides1
-rw-r--r--ACE/debian/libace-qtreactor-dev.lintian-overrides1
-rw-r--r--ACE/debian/libace-rmcast-6.2.7.lintian-overrides1
-rw-r--r--ACE/debian/libace-rmcast-dev.lintian-overrides1
-rw-r--r--ACE/debian/libace-ssl-6.2.7.lintian-overrides2
-rw-r--r--ACE/debian/libace-ssl-dev.lintian-overrides1
-rw-r--r--ACE/debian/libace-tkreactor-6.2.7.lintian-overrides1
-rw-r--r--ACE/debian/libace-tkreactor-dev.lintian-overrides1
-rw-r--r--ACE/debian/libace-tmcast-6.2.7.lintian-overrides1
-rw-r--r--ACE/debian/libace-tmcast-dev.lintian-overrides1
-rw-r--r--ACE/debian/libace-xml-utils-6.2.7.lintian-overrides1
-rw-r--r--ACE/debian/libace-xml-utils-dev.lintian-overrides1
-rw-r--r--ACE/debian/libace-xtreactor-6.2.7.lintian-overrides1
-rw-r--r--ACE/debian/libace-xtreactor-dev.lintian-overrides1
-rw-r--r--ACE/debian/libacexml-6.2.7.lintian-overrides3
-rw-r--r--ACE/debian/libacexml-dev.lintian-overrides1
-rw-r--r--ACE/debian/libkokyu-6.2.7.lintian-overrides1
-rw-r--r--ACE/debian/libkokyu-dev.lintian-overrides1
-rw-r--r--ACE/debian/libnetsvcs-6.2.7.lintian-overrides1
-rw-r--r--ACE/debian/libtao-2.2.7.lintian-overrides46
-rw-r--r--ACE/debian/libtao-dev.lintian-overrides1
-rw-r--r--ACE/debian/libtao-doc.lintian-overrides30
-rw-r--r--ACE/debian/libtao-flresource-2.2.7.lintian-overrides2
-rw-r--r--ACE/debian/libtao-flresource-dev.lintian-overrides1
-rw-r--r--ACE/debian/libtao-foxresource-2.2.7.lintian-overrides2
-rw-r--r--ACE/debian/libtao-foxresource-dev.lintian-overrides1
-rw-r--r--ACE/debian/libtao-orbsvcs-2.2.7.lintian-overrides71
-rw-r--r--ACE/debian/libtao-qtresource-2.2.7.lintian-overrides1
-rw-r--r--ACE/debian/libtao-qtresource-dev.lintian-overrides1
-rw-r--r--ACE/debian/libtao-tkresource-2.2.7.lintian-overrides2
-rw-r--r--ACE/debian/libtao-tkresource-dev.lintian-overrides1
-rw-r--r--ACE/debian/libtao-xtresource-2.2.7.lintian-overrides2
-rw-r--r--ACE/debian/libtao-xtresource-dev.lintian-overrides1
-rw-r--r--ACE/docs/svn/config1
-rw-r--r--ACE/examples/Reactor/Proactor/test_udp_proactor.cpp2
-rw-r--r--ACE/tests/Bug_2820_Regression_Test.cpp5
65 files changed, 369 insertions, 56 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index 3fe7eeacbbc..dd38483323e 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,3 +1,82 @@
+Thu Jul 3 10:47:48 UTC 2014 Johnny Willemsen <jwillemsen@remedy.nl>
+
+ * ace/Event_Handler.h:
+ Introduce ACE::make_event_handler<T> factory method which
+ is enabled when we have C++11 support. This is similar to
+ std::make_unique and std::make_shared, but can be used
+ to allocate ACE_Event_Handler instances and directly
+ assign them to a ACE_Event_Handler_var
+
+ * tests/Bug_2820_Regression_Test.cpp:
+ Use the new ACE::make_event_handler<T>
+
+ * ace/OS_NS_stdio.inl:
+ * ace/config-win32-msvc-14.h:
+ msvc14 has C99 compliant vsnprintf/vsnwprintf
+
+ * ace/Dev_Poll_Reactor.cpp:
+ * ace/Get_Opt.cpp:
+ * ace/MMAP_Memory_Pool.cpp:
+ * ace/SOCK_Dgram_Bcast.cpp:
+ * ace/Select_Reactor_Base.cpp:
+ * ace/Service_Gestalt.cpp:
+ * ace/Sock_Connect.cpp:
+ * ace/WFMO_Reactor.cpp:
+ * apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/buffer.h:
+ * apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/daemon.h:
+ * bin/fuzz.pl:
+ * examples/Reactor/Proactor/test_udp_proactor.cpp:
+ Fixed typos
+
+ * debian/debian.control:
+ * debian/libace-6.2.7.lintian-overrides:
+ * debian/libace-dev.lintian-overrides:
+ * debian/libace-doc.lintian-overrides:
+ * debian/libace-flreactor-6.2.7.lintian-overrides:
+ * debian/libace-flreactor-dev.lintian-overrides:
+ * debian/libace-foxreactor-6.2.7.lintian-overrides:
+ * debian/libace-foxreactor-dev.lintian-overrides:
+ * debian/libace-htbp-6.2.7.lintian-overrides:
+ * debian/libace-htbp-dev.lintian-overrides:
+ * debian/libace-inet-6.2.7.lintian-overrides:
+ * debian/libace-inet-dev.lintian-overrides:
+ * debian/libace-inet-ssl-6.2.7.lintian-overrides:
+ * debian/libace-inet-ssl-dev.lintian-overrides:
+ * debian/libace-qtreactor-6.2.7.lintian-overrides:
+ * debian/libace-qtreactor-dev.lintian-overrides:
+ * debian/libace-rmcast-6.2.7.lintian-overrides:
+ * debian/libace-rmcast-dev.lintian-overrides:
+ * debian/libace-ssl-6.2.7.lintian-overrides:
+ * debian/libace-ssl-dev.lintian-overrides:
+ * debian/libace-tkreactor-6.2.7.lintian-overrides:
+ * debian/libace-tkreactor-dev.lintian-overrides:
+ * debian/libace-tmcast-6.2.7.lintian-overrides:
+ * debian/libace-tmcast-dev.lintian-overrides:
+ * debian/libace-xml-utils-6.2.7.lintian-overrides:
+ * debian/libace-xml-utils-dev.lintian-overrides:
+ * debian/libace-xtreactor-6.2.7.lintian-overrides:
+ * debian/libace-xtreactor-dev.lintian-overrides:
+ * debian/libacexml-6.2.7.lintian-overrides:
+ * debian/libacexml-dev.lintian-overrides:
+ * debian/libkokyu-6.2.7.lintian-overrides:
+ * debian/libkokyu-dev.lintian-overrides:
+ * debian/libnetsvcs-6.2.7.lintian-overrides:
+ * debian/libtao-2.2.7.lintian-overrides:
+ * debian/libtao-dev.lintian-overrides:
+ * debian/libtao-doc.lintian-overrides:
+ * debian/libtao-flresource-2.2.7.lintian-overrides:
+ * debian/libtao-flresource-dev.lintian-overrides:
+ * debian/libtao-foxresource-2.2.7.lintian-overrides:
+ * debian/libtao-foxresource-dev.lintian-overrides:
+ * debian/libtao-orbsvcs-2.2.7.lintian-overrides:
+ * debian/libtao-qtresource-2.2.7.lintian-overrides:
+ * debian/libtao-qtresource-dev.lintian-overrides:
+ * debian/libtao-tkresource-2.2.7.lintian-overrides:
+ * debian/libtao-tkresource-dev.lintian-overrides:
+ * debian/libtao-xtresource-2.2.7.lintian-overrides:
+ * debian/libtao-xtresource-dev.lintian-overrides:
+ Imported files from debian packaging
+
Mon Jun 23 14:14:17 UTC 2014 Johnny Willemsen <jwillemsen@remedy.nl>
* bin/make_release.py:
diff --git a/ACE/ace/Dev_Poll_Reactor.cpp b/ACE/ace/Dev_Poll_Reactor.cpp
index 9dc4bc1f111..a9adbdd460d 100644
--- a/ACE/ace/Dev_Poll_Reactor.cpp
+++ b/ACE/ace/Dev_Poll_Reactor.cpp
@@ -2284,7 +2284,7 @@ ACE_Dev_Poll_Reactor::mask_ops_i (ACE_HANDLE handle,
{
case ACE_Reactor::GET_MASK:
// The work for this operation is done in all cases at the
- // begining of the function.
+ // beginning of the function.
return old_mask;
case ACE_Reactor::CLR_MASK:
diff --git a/ACE/ace/Event_Handler.h b/ACE/ace/Event_Handler.h
index 7f2a26f5db5..88524608cda 100644
--- a/ACE/ace/Event_Handler.h
+++ b/ACE/ace/Event_Handler.h
@@ -316,9 +316,7 @@ private:
*/
class ACE_Export ACE_Event_Handler_var
{
-
public:
-
/// Default constructor.
ACE_Event_Handler_var (void);
@@ -355,10 +353,36 @@ private:
ACE_Event_Handler *ptr_;
};
+#if defined ACE_HAS_CPP11
+
+namespace ACE
+{
+ /// With C++11 it is common to not use C++ new and delete, but
+ /// use std::make_shared and std::make_unique. This will not
+ /// work for ACE event handlers so we introduce a new
+ /// ACE::make_event_handler which can be used in user code to
+ /// allocate a new ACE event handler instance and directly assign
+ /// it to a ACE_Event_Handler_var
+ /// As user this now makes it for example possible to implement
+ /// the following when Simple_Handler is derived from ACE_Event_Handler
+ /// ACE_Event_Handler_var v =
+ /// ACE::make_event_handler<Simple_Handler> (reactor.get());
+ template<class T,
+ typename = typename
+ std::enable_if<std::is_base_of<ACE_Event_Handler, T>::value>::type,
+ typename ...Args> inline
+ ACE_Event_Handler_var make_event_handler (Args&& ...args)
+ {
+ return ACE_Event_Handler_var (new T (std::forward<Args> (args)...));
+ }
+}
+
+#endif
+
/**
* @class ACE_Notification_Buffer
*
- * @brief Simple wrapper for passing <ACE_Event_Handler *>s and
+ * @brief Simple wrapper for passing ACE_Event_Handler *s and
* ACE_Reactor_Masks between threads.
*/
class ACE_Export ACE_Notification_Buffer
diff --git a/ACE/ace/Get_Opt.cpp b/ACE/ace/Get_Opt.cpp
index e83f44786fc..603126b3ed2 100644
--- a/ACE/ace/Get_Opt.cpp
+++ b/ACE/ace/Get_Opt.cpp
@@ -130,7 +130,7 @@ ACE_Get_Opt::ACE_Get_Opt (int argc,
this->ordering_ = REQUIRE_ORDER;
// Now, check to see if any or the following were passed at
- // the begining of optstring: '+' same as POSIXLY_CORRECT;
+ // the beginning of optstring: '+' same as POSIXLY_CORRECT;
// '-' turns off POSIXLY_CORRECT; or ':' which signifies we
// should return ':' if a parameter is missing for an option.
// We use a loop here, since a combination of "{+|-}:" in any
diff --git a/ACE/ace/MMAP_Memory_Pool.cpp b/ACE/ace/MMAP_Memory_Pool.cpp
index bc942e03e8f..2dada204cdf 100644
--- a/ACE/ace/MMAP_Memory_Pool.cpp
+++ b/ACE/ace/MMAP_Memory_Pool.cpp
@@ -476,7 +476,7 @@ ACE_MMAP_Memory_Pool_Options::ACE_MMAP_Memory_Pool_Options (
install_signal_handler_ (install_signal_handler)
{
ACE_TRACE ("ACE_MMAP_Memory_Pool_Options::ACE_MMAP_Memory_Pool_Options");
- // for backwards compatability
+ // for backwards compatibility
if (base_addr_ == 0 && use_fixed_addr_ == ALWAYS_FIXED)
use_fixed_addr_ = FIRSTCALL_FIXED;
}
diff --git a/ACE/ace/OS_NS_stdio.inl b/ACE/ace/OS_NS_stdio.inl
index 60031b4fd63..66798d3c36d 100644
--- a/ACE/ace/OS_NS_stdio.inl
+++ b/ACE/ace/OS_NS_stdio.inl
@@ -1041,14 +1041,7 @@ ACE_OS::vsnprintf (char *buffer, size_t maxlen, const char *format, va_list ap)
{
#if !defined (ACE_LACKS_VSNPRINTF)
int result;
-# if 0 /* defined (ACE_HAS_TR24731_2005_CRT) */
- // _vsnprintf_s() doesn't report the length needed when it truncates. This
- // info is needed and relied on by others things in ACE+TAO, so don't use
- // this. There's adequate protection via the maxlen.
- result = _vsnprintf_s (buffer, maxlen, _TRUNCATE, format, ap);
-# elif !defined (ACE_WIN32)
- result = ::vsnprintf (buffer, maxlen, format, ap);
-# else
+# if defined (ACE_WIN32) && !defined (ACE_HAS_C99_VSNPRINTF)
result = ::_vsnprintf (buffer, maxlen, format, ap);
// Win32 doesn't regard a full buffer with no 0-terminate as an overrun.
@@ -1058,6 +1051,8 @@ ACE_OS::vsnprintf (char *buffer, size_t maxlen, const char *format, va_list ap)
// Win32 doesn't 0-terminate the string if it overruns maxlen.
if (result == -1 && maxlen > 0)
buffer[maxlen-1] = '\0';
+# else
+ result = ::vsnprintf (buffer, maxlen, format, ap);
# endif
// In out-of-range conditions, C99 defines vsnprintf() to return the number
// of characters that would have been written if enough space was available.
@@ -1093,7 +1088,7 @@ ACE_OS::vsnprintf (wchar_t *buffer, size_t maxlen, const wchar_t *format, va_lis
int result;
-# if defined (ACE_WIN32)
+# if defined (ACE_WIN32) && !defined (ACE_HAS_C99_VSNWPRINTF)
// Microsoft's vswprintf() doesn't have the maxlen argument that
// XPG4/UNIX98 define. They do, however, recommend use of _vsnwprintf()
// as a substitute, which does have the same signature as the UNIX98 one.
@@ -1119,15 +1114,12 @@ ACE_OS::vsnprintf (wchar_t *buffer, size_t maxlen, const wchar_t *format, va_lis
result = static_cast <int> (maxlen + 1);
return result;
-
# else
-
ACE_UNUSED_ARG (buffer);
ACE_UNUSED_ARG (maxlen);
ACE_UNUSED_ARG (format);
ACE_UNUSED_ARG (ap);
ACE_NOTSUP_RETURN (-1);
-
# endif /* platforms with a variant of vswprintf */
}
#endif /* ACE_HAS_WCHAR */
diff --git a/ACE/ace/SOCK_Dgram_Bcast.cpp b/ACE/ace/SOCK_Dgram_Bcast.cpp
index 0dd31d46c1a..b6538f5326a 100644
--- a/ACE/ace/SOCK_Dgram_Bcast.cpp
+++ b/ACE/ace/SOCK_Dgram_Bcast.cpp
@@ -260,7 +260,7 @@ ACE_SOCK_Dgram_Bcast::mk_broadcast (const ACE_TCHAR *host_name)
{
if (host_name != 0)
ACELIB_ERROR ((LM_ERROR, ACE_TEXT("%p [%s]\n"),
- ACE_TEXT("ACE_SOCK_Dgram_Bcast::mk_broadcast: Broadcast is not enable for this interface."),
+ ACE_TEXT("ACE_SOCK_Dgram_Bcast::mk_broadcast: Broadcast is not enabled for this interface."),
flags.ifr_name));
}
}
diff --git a/ACE/ace/Select_Reactor_Base.cpp b/ACE/ace/Select_Reactor_Base.cpp
index 68d74c16b32..8ab0fd495d7 100644
--- a/ACE/ace/Select_Reactor_Base.cpp
+++ b/ACE/ace/Select_Reactor_Base.cpp
@@ -1013,7 +1013,7 @@ ACE_Select_Reactor_Impl::bit_ops (ACE_HANDLE handle,
{
case ACE_Reactor::GET_MASK:
// The work for this operation is done in all cases at the
- // begining of the function.
+ // beginning of the function.
break;
case ACE_Reactor::CLR_MASK:
ptmf = &ACE_Handle_Set::clr_bit;
diff --git a/ACE/ace/Service_Gestalt.cpp b/ACE/ace/Service_Gestalt.cpp
index a7b9cea1c01..62192cae9be 100644
--- a/ACE/ace/Service_Gestalt.cpp
+++ b/ACE/ace/Service_Gestalt.cpp
@@ -60,7 +60,7 @@ ACE_Service_Type_Dynamic_Guard::ACE_Service_Type_Dynamic_Guard
if (ACE::debug ())
ACELIB_DEBUG ((LM_DEBUG,
ACE_TEXT ("ACE (%P|%t) STDG::<ctor>, repo=%@")
- ACE_TEXT(", name=%s - begining at [%d]\n"),
+ ACE_TEXT(", name=%s - beginning at [%d]\n"),
&this->repo_,
this->name_,
this->repo_begin_));
diff --git a/ACE/ace/Sock_Connect.cpp b/ACE/ace/Sock_Connect.cpp
index 1e92a37463c..beaef532ffc 100644
--- a/ACE/ace/Sock_Connect.cpp
+++ b/ACE/ace/Sock_Connect.cpp
@@ -314,7 +314,7 @@ ACE::get_bcast_addr (ACE_UINT32 &bcast_addr,
ACELIB_ERROR ((LM_ERROR,
ACE_TEXT ("%p\n"),
ACE_TEXT ("ACE::get_bcast_addr:")
- ACE_TEXT ("Broadcast is not enable for this interface.")));
+ ACE_TEXT ("Broadcast is not enabled for this interface.")));
if (handle == ACE_INVALID_HANDLE)
ACE_OS::close (s);
diff --git a/ACE/ace/WFMO_Reactor.cpp b/ACE/ace/WFMO_Reactor.cpp
index 9a9ba2edf22..e39247ee394 100644
--- a/ACE/ace/WFMO_Reactor.cpp
+++ b/ACE/ace/WFMO_Reactor.cpp
@@ -173,7 +173,7 @@ ACE_WFMO_Reactor_Handler_Repository::bit_ops (long &existing_masks,
case ACE_Reactor::GET_MASK:
// The work for this operation is done in all cases at the
- // begining of the function.
+ // beginning of the function.
ACE_UNUSED_ARG (change_masks);
diff --git a/ACE/ace/config-win32-msvc-14.h b/ACE/ace/config-win32-msvc-14.h
index 8135f65d870..7af34974814 100644
--- a/ACE/ace/config-win32-msvc-14.h
+++ b/ACE/ace/config-win32-msvc-14.h
@@ -28,8 +28,14 @@
// Until we have specific msvc14 settings, include the msvc12 file
#include "ace/config-win32-msvc-12.h"
-# define ACE_HAS_POSIX_TIME 1
-# define ACE_LACKS_TIMESPEC_T 1
+#define ACE_HAS_POSIX_TIME 1
+#define ACE_LACKS_TIMESPEC_T 1
+
+// According to MS the Visual Studio 2014 C-runtime has a
+// C99 compliant vsnprintf/vsnwprintf, this is a change compared to
+// previous versions
+#define ACE_HAS_C99_VSNPRINTF
+#define ACE_HAS_C99_VSNWPRINTF
#include /**/ "ace/post.h"
#endif /* ACE_CONFIG_WIN32_MSVC_14_H */
diff --git a/ACE/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/buffer.h b/ACE/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/buffer.h
index f172efcb93a..a594bced543 100644
--- a/ACE/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/buffer.h
+++ b/ACE/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/buffer.h
@@ -199,7 +199,7 @@ int netbuf_grab(netbuf *buf, int sz);
/*
* netbuf_buf2sd will send n bytes from the (probably previously read)
* buffer and send them to sd. If sd is -1, they are discarded. If n is
- * -1, it will continue until EOF is recieved. Returns IO_ERROR on error
+ * -1, it will continue until EOF is received. Returns IO_ERROR on error
* and the number of bytes sent any other time.
*/
diff --git a/ACE/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/daemon.h b/ACE/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/daemon.h
index afe0cfe6e5e..a163e7a95e0 100644
--- a/ACE/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/daemon.h
+++ b/ACE/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/daemon.h
@@ -83,7 +83,7 @@ extern int child_serial;
* log the daemon pid to (can be NULL). daemon_run never returns.
*
* child_callback is a function which will be called every time a new
- * connection is recieved. Session is a new session ID.
+ * connection is received. Session is a new session ID.
*
* rcback is a function which is a restart function: When SIGHUP is received,
* this function will be called. You may give SIG_DFL if you don't want to
diff --git a/ACE/bin/fuzz.pl b/ACE/bin/fuzz.pl
index 0f1dcfdac43..698364eb1f7 100755
--- a/ACE/bin/fuzz.pl
+++ b/ACE/bin/fuzz.pl
@@ -2190,12 +2190,12 @@ sub check_for_TAO_Local_RefCounted_Object ()
}
# This test checks for the correct use of ORB_init() so as
-# to be compatiable with wide character builds.
+# to be compatible with wide character builds.
sub check_for_ORB_init ()
{
return if is_suppressed ();
- print "Running the ORB_init() wide character incompatability check\n";
+ print "Running the ORB_init() wide character incompatibility check\n";
foreach $file (@files_cpp, @files_inl) {
if (open (FILE, $file)) {
my $disable = 0;
diff --git a/ACE/debian/debian.control b/ACE/debian/debian.control
index 61016ab1b95..a786ed01309 100644
--- a/ACE/debian/debian.control
+++ b/ACE/debian/debian.control
@@ -4,9 +4,9 @@ Priority: optional
Maintainer: Johnny Willemsen <jwillemsen@remedy.nl>
Uploaders: Johnny Willemsen <jwillemsen@remedy.nl>
DM-Upload-Allowed: yes
-Build-Depends: debhelper (>= 5), libssl-dev (>= 0.9.7d), libxt-dev (>= 4.3.0), libfltk1.1-dev (>= 1.1.4), libqt4-dev (>= 4.4~rc1-4), tk-dev, libfox-1.6-dev, zlib1g-dev, libzzip-dev, docbook-to-man, bzip2, libbz2-dev, libxerces-c-dev
+Build-Depends: debhelper (>= 9), dpkg-dev (>= 1.16.2), libssl-dev (>= 0.9.7d), libxt-dev (>= 4.3.0), libfltk1.1-dev (>= 1.1.4), libqt4-dev (>= 4.4~rc1-4), tk-dev (>= 8.5), libfox-1.6-dev, zlib1g-dev, libzzip-dev, liblzo2-dev, docbook-to-man, bzip2, libbz2-dev, libxerces-c-dev
Build-Depends-Indep: doxygen, graphviz
-Standards-Version: 3.9.2
+Standards-Version: 3.9.5.0
Vcs-Browser: https://svn.dre.vanderbilt.edu/viewvc/Middleware/trunk/ACE/debian/
Homepage: http://www.dre.vanderbilt.edu/~schmidt/ACE.html
@@ -73,7 +73,7 @@ Description: ACE secure socket layer library
Package: libace-ssl-dev
Architecture: any
Section: libdevel
-Depends: libace-ssl-6.2.5 (= ${binary:Version}), libace-dev (= ${binary:Version}), libssl-dev (>= 0.9.7d), ${misc:Depends}
+Depends: libace-ssl-6.2.7 (= ${binary:Version}), libace-dev (= ${binary:Version}), libssl-dev (>= 0.9.7d), ${misc:Depends}
Description: ACE secure socket layer library - development files
This package contains the header files and static library for the ACE
SSL library.
@@ -202,18 +202,6 @@ Description: ACE SAX based XML parsing library
ACEXML is a small footprint and portable library. It does not
validate XML documents and supports only Unicode encoding.
-Package: libacexml-6.2.7
-Architecture: any
-Section: libs
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: ACE SAX based XML parsing library
- This package provides interfaces for XML parsing based on Simple API
- for XML (SAX) 2.0, defined by David Megginson. This is an
- event-driven parsing approach.
- .
- ACEXML is a small footprint and portable library. It does not
- validate XML documents and supports only Unicode encoding.
-
Package: libacexml-dev
Architecture: any
Section: libdevel
@@ -228,15 +216,25 @@ Architecture: any
Section: libs
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: ACE XML utility classes and methods
- This package provides useful classes and methods for XML parsing
+ This package provides useful classes and methods for XML parsing with Xerces,
+ including simplified strings, schema resolution, validation and more.
.
ACE XML Utils is used by DAnCE and OpenDDS.
+Package: libace-xml-utils-dev
+Architecture: any
+Section: libdevel
+Replaces: libace-dev (<< 5.7.7-4)
+Depends: libace-xml-utils-6.2.7 (= ${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.2.7
Architecture: any
Section: libs
Depends: ${shlibs:Depends}, ${misc:Depends}
-Suggests: libtao-2.2.5, libtao-orbsvcs-2.2.7
+Suggests: libtao-2.2.7, libtao-orbsvcs-2.2.7
Description: ACE scheduling and dispatching library
Kokyu is a library designed to provide flexible scheduling and
dispatching services.
@@ -294,7 +292,7 @@ Description: ACE-GUI reactor integration for Xt
Package: libace-xtreactor-dev
Architecture: any
Section: libdevel
-Depends: libace-xtreactor-6.2.5 (= ${binary:Version}), libace-dev (= ${binary:Version}), libxt-dev (>= 6.2.7), ${misc:Depends}
+Depends: libace-xtreactor-6.2.7 (= ${binary:Version}), libace-dev (= ${binary:Version}), libxt-dev (>= 6.2.7), ${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.
@@ -327,7 +325,7 @@ Package: libace-flreactor-6.2.7
Architecture: any
Section: libs
Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: ACE-GUI reactor integration for Fl
+Description: ACE-GUI reactor integration for FLTK
Recognizing the need to write reactor-based GUI applications, the ACE
community has created several reactor extensions for use with X
Window System. Each of these extends the ACE_Select_Reactor to work
@@ -341,9 +339,9 @@ Description: ACE-GUI reactor integration for Fl
Package: libace-flreactor-dev
Architecture: any
Section: libdevel
-Depends: libace-flreactor-6.2.5 (= ${binary:Version}), libace-dev (= ${binary:Version}), libfltk1.1-dev (>= 6.2.7), ${misc:Depends}
-Description: ACE-GUI reactor integration for Fl - development files
- This package contains header files and static library for the ACE-Fl
+Depends: libace-flreactor-6.2.7 (= ${binary:Version}), libace-dev (= ${binary:Version}), libfltk1.1-dev (>= 6.2.7), ${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.2.7
@@ -453,7 +451,7 @@ Package: libtao-flresource-2.2.7
Architecture: any
Section: libs
Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: TAO-GUI reactor integration for Fl
+Description: TAO-GUI reactor integration for FLTK
The Fl resource factory integrates ACE FlReactor into TAO ORB
reactor.
@@ -461,8 +459,8 @@ Package: libtao-flresource-dev
Architecture: any
Section: libdevel
Depends: libtao-flresource-2.2.7 (= ${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
+Description: TAO-GUI reactor integration for FLTK - development files
+ This package contains header files and static library for the TAO-FLTK
reactor integration.
Package: libtao-tkresource-2.2.7
@@ -486,7 +484,7 @@ Architecture: any
Section: libs
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: TAO-GUI reactor integration for FOX
- The Fl resource factory integrates ACE FoxReactor into TAO ORB
+ The FLTK resource factory integrates ACE FoxReactor into TAO ORB
reactor.
Package: libtao-foxresource-dev
diff --git a/ACE/debian/libace-6.2.7.lintian-overrides b/ACE/debian/libace-6.2.7.lintian-overrides
new file mode 100644
index 00000000000..a734a623241
--- /dev/null
+++ b/ACE/debian/libace-6.2.7.lintian-overrides
@@ -0,0 +1,4 @@
+libace-6.2.7: no-symbols-control-file usr/lib/libACE-6.2.7.so
+libace-6.2.7: no-symbols-control-file usr/lib/libACE_ETCL_Parser-6.2.7.so
+libace-6.2.7: no-symbols-control-file usr/lib/libACE_Monitor_Control-6.2.7.so
+libace-6.2.7: no-symbols-control-file usr/lib/libACE_ETCL-6.2.7.so
diff --git a/ACE/debian/libace-dev.lintian-overrides b/ACE/debian/libace-dev.lintian-overrides
new file mode 100644
index 00000000000..3223c8bb431
--- /dev/null
+++ b/ACE/debian/libace-dev.lintian-overrides
@@ -0,0 +1 @@
+libace-dev: extended-description-is-probably-too-short
diff --git a/ACE/debian/libace-doc.lintian-overrides b/ACE/debian/libace-doc.lintian-overrides
new file mode 100644
index 00000000000..d2d2ac4659f
--- /dev/null
+++ b/ACE/debian/libace-doc.lintian-overrides
@@ -0,0 +1,8 @@
+libace-doc: extended-description-is-probably-too-short
+
+# Debian bug #736360 and https://lists.debian.org/debian-mentors/2012/11/msg00310.html
+libace-doc: embedded-javascript-library usr/share/doc/libace-doc/QoS/jquery.js please use libjs-jquery
+libace-doc: embedded-javascript-library usr/share/doc/libace-doc/inet/jquery.js please use libjs-jquery
+libace-doc: embedded-javascript-library usr/share/doc/libace-doc/jquery.js please use libjs-jquery
+libace-doc: embedded-javascript-library usr/share/doc/libace-doc/rmcast/jquery.js please use libjs-jquery
+libace-doc: embedded-javascript-library usr/share/doc/libace-doc/ssl/jquery.js please use libjs-jquery
diff --git a/ACE/debian/libace-flreactor-6.2.7.lintian-overrides b/ACE/debian/libace-flreactor-6.2.7.lintian-overrides
new file mode 100644
index 00000000000..1b84bf197dc
--- /dev/null
+++ b/ACE/debian/libace-flreactor-6.2.7.lintian-overrides
@@ -0,0 +1 @@
+libace-flreactor-6.2.7: no-symbols-control-file usr/lib/libACE_FlReactor-6.2.7.so
diff --git a/ACE/debian/libace-flreactor-dev.lintian-overrides b/ACE/debian/libace-flreactor-dev.lintian-overrides
new file mode 100644
index 00000000000..38bbaa37af2
--- /dev/null
+++ b/ACE/debian/libace-flreactor-dev.lintian-overrides
@@ -0,0 +1 @@
+libace-flreactor-dev: extended-description-is-probably-too-short
diff --git a/ACE/debian/libace-foxreactor-6.2.7.lintian-overrides b/ACE/debian/libace-foxreactor-6.2.7.lintian-overrides
new file mode 100644
index 00000000000..7c835b9b8e0
--- /dev/null
+++ b/ACE/debian/libace-foxreactor-6.2.7.lintian-overrides
@@ -0,0 +1 @@
+libace-foxreactor-6.2.7: no-symbols-control-file usr/lib/libACE_FoxReactor-6.2.7.so
diff --git a/ACE/debian/libace-foxreactor-dev.lintian-overrides b/ACE/debian/libace-foxreactor-dev.lintian-overrides
new file mode 100644
index 00000000000..35786196632
--- /dev/null
+++ b/ACE/debian/libace-foxreactor-dev.lintian-overrides
@@ -0,0 +1 @@
+libace-foxreactor-dev: extended-description-is-probably-too-short
diff --git a/ACE/debian/libace-htbp-6.2.7.lintian-overrides b/ACE/debian/libace-htbp-6.2.7.lintian-overrides
new file mode 100644
index 00000000000..63764ad81ee
--- /dev/null
+++ b/ACE/debian/libace-htbp-6.2.7.lintian-overrides
@@ -0,0 +1 @@
+libace-htbp-6.2.7: no-symbols-control-file usr/lib/libACE_HTBP-6.2.7.so
diff --git a/ACE/debian/libace-htbp-dev.lintian-overrides b/ACE/debian/libace-htbp-dev.lintian-overrides
new file mode 100644
index 00000000000..1289f4c7192
--- /dev/null
+++ b/ACE/debian/libace-htbp-dev.lintian-overrides
@@ -0,0 +1 @@
+libace-htbp-dev: extended-description-is-probably-too-short
diff --git a/ACE/debian/libace-inet-6.2.7.lintian-overrides b/ACE/debian/libace-inet-6.2.7.lintian-overrides
new file mode 100644
index 00000000000..a801058e382
--- /dev/null
+++ b/ACE/debian/libace-inet-6.2.7.lintian-overrides
@@ -0,0 +1,2 @@
+libace-inet-6.2.7: extended-description-is-probably-too-short
+libace-inet-6.2.7: no-symbols-control-file usr/lib/libACE_INet-6.2.7.so
diff --git a/ACE/debian/libace-inet-dev.lintian-overrides b/ACE/debian/libace-inet-dev.lintian-overrides
new file mode 100644
index 00000000000..9cd6a268b19
--- /dev/null
+++ b/ACE/debian/libace-inet-dev.lintian-overrides
@@ -0,0 +1 @@
+libace-inet-dev: extended-description-is-probably-too-short
diff --git a/ACE/debian/libace-inet-ssl-6.2.7.lintian-overrides b/ACE/debian/libace-inet-ssl-6.2.7.lintian-overrides
new file mode 100644
index 00000000000..c105861e8c8
--- /dev/null
+++ b/ACE/debian/libace-inet-ssl-6.2.7.lintian-overrides
@@ -0,0 +1 @@
+libace-inet-ssl-6.2.7: no-symbols-control-file usr/lib/libACE_INet_SSL-6.2.7.so
diff --git a/ACE/debian/libace-inet-ssl-dev.lintian-overrides b/ACE/debian/libace-inet-ssl-dev.lintian-overrides
new file mode 100644
index 00000000000..66638b80cec
--- /dev/null
+++ b/ACE/debian/libace-inet-ssl-dev.lintian-overrides
@@ -0,0 +1 @@
+libace-inet-ssl-dev: extended-description-is-probably-too-short
diff --git a/ACE/debian/libace-qtreactor-6.2.7.lintian-overrides b/ACE/debian/libace-qtreactor-6.2.7.lintian-overrides
new file mode 100644
index 00000000000..08d9151dbd6
--- /dev/null
+++ b/ACE/debian/libace-qtreactor-6.2.7.lintian-overrides
@@ -0,0 +1 @@
+libace-qtreactor-6.2.7: no-symbols-control-file usr/lib/libACE_QtReactor-6.2.7.so
diff --git a/ACE/debian/libace-qtreactor-dev.lintian-overrides b/ACE/debian/libace-qtreactor-dev.lintian-overrides
new file mode 100644
index 00000000000..2bf18f7681a
--- /dev/null
+++ b/ACE/debian/libace-qtreactor-dev.lintian-overrides
@@ -0,0 +1 @@
+libace-qtreactor-dev: extended-description-is-probably-too-short
diff --git a/ACE/debian/libace-rmcast-6.2.7.lintian-overrides b/ACE/debian/libace-rmcast-6.2.7.lintian-overrides
new file mode 100644
index 00000000000..9644f06518a
--- /dev/null
+++ b/ACE/debian/libace-rmcast-6.2.7.lintian-overrides
@@ -0,0 +1 @@
+libace-rmcast-6.2.7: no-symbols-control-file usr/lib/libACE_RMCast-6.2.7.so
diff --git a/ACE/debian/libace-rmcast-dev.lintian-overrides b/ACE/debian/libace-rmcast-dev.lintian-overrides
new file mode 100644
index 00000000000..974511fa45b
--- /dev/null
+++ b/ACE/debian/libace-rmcast-dev.lintian-overrides
@@ -0,0 +1 @@
+libace-rmcast-dev: extended-description-is-probably-too-short
diff --git a/ACE/debian/libace-ssl-6.2.7.lintian-overrides b/ACE/debian/libace-ssl-6.2.7.lintian-overrides
new file mode 100644
index 00000000000..e8ea7ddcf34
--- /dev/null
+++ b/ACE/debian/libace-ssl-6.2.7.lintian-overrides
@@ -0,0 +1,2 @@
+libace-ssl-6.2.7: extended-description-is-probably-too-short
+libace-ssl-6.2.7: no-symbols-control-file usr/lib/libACE_SSL-6.2.7.so
diff --git a/ACE/debian/libace-ssl-dev.lintian-overrides b/ACE/debian/libace-ssl-dev.lintian-overrides
new file mode 100644
index 00000000000..ac28ede1aad
--- /dev/null
+++ b/ACE/debian/libace-ssl-dev.lintian-overrides
@@ -0,0 +1 @@
+libace-ssl-dev: extended-description-is-probably-too-short
diff --git a/ACE/debian/libace-tkreactor-6.2.7.lintian-overrides b/ACE/debian/libace-tkreactor-6.2.7.lintian-overrides
new file mode 100644
index 00000000000..0be73cb750c
--- /dev/null
+++ b/ACE/debian/libace-tkreactor-6.2.7.lintian-overrides
@@ -0,0 +1 @@
+libace-tkreactor-6.2.7: no-symbols-control-file usr/lib/libACE_TkReactor-6.2.7.so
diff --git a/ACE/debian/libace-tkreactor-dev.lintian-overrides b/ACE/debian/libace-tkreactor-dev.lintian-overrides
new file mode 100644
index 00000000000..e8d4da2252f
--- /dev/null
+++ b/ACE/debian/libace-tkreactor-dev.lintian-overrides
@@ -0,0 +1 @@
+libace-tkreactor-dev: extended-description-is-probably-too-short
diff --git a/ACE/debian/libace-tmcast-6.2.7.lintian-overrides b/ACE/debian/libace-tmcast-6.2.7.lintian-overrides
new file mode 100644
index 00000000000..42c1086a791
--- /dev/null
+++ b/ACE/debian/libace-tmcast-6.2.7.lintian-overrides
@@ -0,0 +1 @@
+libace-tmcast-6.2.7: no-symbols-control-file usr/lib/libACE_TMCast-6.2.7.so
diff --git a/ACE/debian/libace-tmcast-dev.lintian-overrides b/ACE/debian/libace-tmcast-dev.lintian-overrides
new file mode 100644
index 00000000000..63eed088552
--- /dev/null
+++ b/ACE/debian/libace-tmcast-dev.lintian-overrides
@@ -0,0 +1 @@
+libace-tmcast-dev: extended-description-is-probably-too-short
diff --git a/ACE/debian/libace-xml-utils-6.2.7.lintian-overrides b/ACE/debian/libace-xml-utils-6.2.7.lintian-overrides
new file mode 100644
index 00000000000..c6d67613a41
--- /dev/null
+++ b/ACE/debian/libace-xml-utils-6.2.7.lintian-overrides
@@ -0,0 +1 @@
+libace-xml-utils-6.2.7: extended-description-is-probably-too-short
diff --git a/ACE/debian/libace-xml-utils-dev.lintian-overrides b/ACE/debian/libace-xml-utils-dev.lintian-overrides
new file mode 100644
index 00000000000..72d0f635ffc
--- /dev/null
+++ b/ACE/debian/libace-xml-utils-dev.lintian-overrides
@@ -0,0 +1 @@
+libace-xml-utils-dev: extended-description-is-probably-too-short
diff --git a/ACE/debian/libace-xtreactor-6.2.7.lintian-overrides b/ACE/debian/libace-xtreactor-6.2.7.lintian-overrides
new file mode 100644
index 00000000000..3bb1f71096e
--- /dev/null
+++ b/ACE/debian/libace-xtreactor-6.2.7.lintian-overrides
@@ -0,0 +1 @@
+libace-xtreactor-6.2.7: no-symbols-control-file usr/lib/libACE_XtReactor-6.2.7.so
diff --git a/ACE/debian/libace-xtreactor-dev.lintian-overrides b/ACE/debian/libace-xtreactor-dev.lintian-overrides
new file mode 100644
index 00000000000..dbc2d9c918b
--- /dev/null
+++ b/ACE/debian/libace-xtreactor-dev.lintian-overrides
@@ -0,0 +1 @@
+libace-xtreactor-dev: extended-description-is-probably-too-short
diff --git a/ACE/debian/libacexml-6.2.7.lintian-overrides b/ACE/debian/libacexml-6.2.7.lintian-overrides
new file mode 100644
index 00000000000..90f4b3eb86c
--- /dev/null
+++ b/ACE/debian/libacexml-6.2.7.lintian-overrides
@@ -0,0 +1,3 @@
+libacexml-6.2.7: no-symbols-control-file usr/lib/libACEXML_Parser-6.2.7.so
+libacexml-6.2.7: no-symbols-control-file usr/lib/libACEXML_XML_Svc_Conf_Parser-6.2.7.so
+libacexml-6.2.7: no-symbols-control-file usr/lib/libACEXML-6.2.7.so
diff --git a/ACE/debian/libacexml-dev.lintian-overrides b/ACE/debian/libacexml-dev.lintian-overrides
new file mode 100644
index 00000000000..239e0d58d21
--- /dev/null
+++ b/ACE/debian/libacexml-dev.lintian-overrides
@@ -0,0 +1 @@
+libacexml-dev: extended-description-is-probably-too-short
diff --git a/ACE/debian/libkokyu-6.2.7.lintian-overrides b/ACE/debian/libkokyu-6.2.7.lintian-overrides
new file mode 100644
index 00000000000..b01f2e10dfd
--- /dev/null
+++ b/ACE/debian/libkokyu-6.2.7.lintian-overrides
@@ -0,0 +1 @@
+libkokyu-6.2.7: no-symbols-control-file usr/lib/libKokyu-6.2.7.so
diff --git a/ACE/debian/libkokyu-dev.lintian-overrides b/ACE/debian/libkokyu-dev.lintian-overrides
new file mode 100644
index 00000000000..58c5fa2db4c
--- /dev/null
+++ b/ACE/debian/libkokyu-dev.lintian-overrides
@@ -0,0 +1 @@
+libkokyu-dev: extended-description-is-probably-too-short
diff --git a/ACE/debian/libnetsvcs-6.2.7.lintian-overrides b/ACE/debian/libnetsvcs-6.2.7.lintian-overrides
new file mode 100644
index 00000000000..0b5a352f8a5
--- /dev/null
+++ b/ACE/debian/libnetsvcs-6.2.7.lintian-overrides
@@ -0,0 +1 @@
+libnetsvcs-6.2.7: no-symbols-control-file usr/lib/libnetsvcs-6.2.7.so
diff --git a/ACE/debian/libtao-2.2.7.lintian-overrides b/ACE/debian/libtao-2.2.7.lintian-overrides
new file mode 100644
index 00000000000..77cc51ec2ff
--- /dev/null
+++ b/ACE/debian/libtao-2.2.7.lintian-overrides
@@ -0,0 +1,46 @@
+libtao-2.2.7: no-symbols-control-file usr/lib/libTAO_RTScheduler-2.2.7.so
+libtao-2.2.7: no-symbols-control-file usr/lib/libTAO_ImR_Client-2.2.7.so
+libtao-2.2.7: no-symbols-control-file usr/lib/libTAO_CSD_ThreadPool-2.2.7.so
+libtao-2.2.7: no-symbols-control-file usr/lib/libTAO_Async_IORTable-2.2.7.so
+libtao-2.2.7: no-symbols-control-file usr/lib/libTAO_EndpointPolicy-2.2.7.so
+libtao-2.2.7: no-symbols-control-file usr/lib/libTAO_IFR_BE-2.2.7.so
+libtao-2.2.7: no-symbols-control-file usr/lib/libTAO_LzoCompressor-2.2.7.so
+libtao-2.2.7: no-symbols-control-file usr/lib/libTAO_IFR_Client-2.2.7.so
+libtao-2.2.7: no-symbols-control-file usr/lib/libTAO_IDL_FE-2.2.7.so
+libtao-2.2.7: no-symbols-control-file usr/lib/libTAO_IORInterceptor-2.2.7.so
+libtao-2.2.7: no-symbols-control-file usr/lib/libTAO_Compression-2.2.7.so
+libtao-2.2.7: no-symbols-control-file usr/lib/libTAO_AnyTypeCode-2.2.7.so
+libtao-2.2.7: no-symbols-control-file usr/lib/libTAO_IDL_BE-2.2.7.so
+libtao-2.2.7: no-symbols-control-file usr/lib/libTAO_Codeset-2.2.7.so
+libtao-2.2.7: no-symbols-control-file usr/lib/libTAO_Messaging-2.2.7.so
+libtao-2.2.7: no-symbols-control-file usr/lib/libTAO_IFR_Client_skel-2.2.7.so
+libtao-2.2.7: no-symbols-control-file usr/lib/libTAO_Strategies-2.2.7.so
+libtao-2.2.7: no-symbols-control-file usr/lib/libTAO_IORTable-2.2.7.so
+libtao-2.2.7: no-symbols-control-file usr/lib/libTAO_Bzip2Compressor-2.2.7.so
+libtao-2.2.7: no-symbols-control-file usr/lib/libTAO_ZlibCompressor-2.2.7.so
+libtao-2.2.7: no-symbols-control-file usr/lib/libTAO_Monitor-2.2.7.so
+libtao-2.2.7: no-symbols-control-file usr/lib/libTAO_Utils-2.2.7.so
+libtao-2.2.7: no-symbols-control-file usr/lib/libTAO_DynamicInterface-2.2.7.so
+libtao-2.2.7: no-symbols-control-file usr/lib/libTAO_BiDirGIOP-2.2.7.so
+libtao-2.2.7: no-symbols-control-file usr/lib/libTAO_ObjRefTemplate-2.2.7.so
+libtao-2.2.7: no-symbols-control-file usr/lib/libTAO_ETCL-2.2.7.so
+libtao-2.2.7: no-symbols-control-file usr/lib/libTAO_IORManip-2.2.7.so
+libtao-2.2.7: no-symbols-control-file usr/lib/libTAO_CodecFactory-2.2.7.so
+libtao-2.2.7: no-symbols-control-file usr/lib/libTAO_ZIOP-2.2.7.so
+libtao-2.2.7: no-symbols-control-file usr/lib/libTAO_PortableServer-2.2.7.so
+libtao-2.2.7: no-symbols-control-file usr/lib/libTAO_CSD_Framework-2.2.7.so
+libtao-2.2.7: no-symbols-control-file usr/lib/libTAO_RTPortableServer-2.2.7.so
+libtao-2.2.7: no-symbols-control-file usr/lib/libTAO_TC_IIOP-2.2.7.so
+libtao-2.2.7: no-symbols-control-file usr/lib/libTAO-2.2.7.so
+libtao-2.2.7: no-symbols-control-file usr/lib/libTAO_SmartProxies-2.2.7.so
+libtao-2.2.7: no-symbols-control-file usr/lib/libTAO_PI_Server-2.2.7.so
+libtao-2.2.7: no-symbols-control-file usr/lib/libTAO_TypeCodeFactory-2.2.7.so
+libtao-2.2.7: no-symbols-control-file usr/lib/libTAO_DynamicAny-2.2.7.so
+libtao-2.2.7: no-symbols-control-file usr/lib/libTAO_RTCORBA-2.2.7.so
+libtao-2.2.7: no-symbols-control-file usr/lib/libTAO_TC-2.2.7.so
+libtao-2.2.7: no-symbols-control-file usr/lib/libTAO_DiffServPolicy-2.2.7.so
+libtao-2.2.7: no-symbols-control-file usr/lib/libTAO_Valuetype-2.2.7.so
+libtao-2.2.7: no-symbols-control-file usr/lib/libTAO_PI-2.2.7.so
+
+# False positive, it's an exit() call in a Lex-generated parser
+libtao-2.2.7: shlib-calls-exit usr/lib/libTAO_IDL_FE-2.2.7.so
diff --git a/ACE/debian/libtao-dev.lintian-overrides b/ACE/debian/libtao-dev.lintian-overrides
new file mode 100644
index 00000000000..3f4644b345a
--- /dev/null
+++ b/ACE/debian/libtao-dev.lintian-overrides
@@ -0,0 +1 @@
+libtao-dev: extended-description-is-probably-too-short
diff --git a/ACE/debian/libtao-doc.lintian-overrides b/ACE/debian/libtao-doc.lintian-overrides
new file mode 100644
index 00000000000..fc450eae68e
--- /dev/null
+++ b/ACE/debian/libtao-doc.lintian-overrides
@@ -0,0 +1,30 @@
+libtao-doc: extended-description-is-probably-too-short
+libtao-doc: embedded-javascript-library usr/share/doc/libtao-doc/anytypecode/jquery.js please use libjs-jquery
+libtao-doc: embedded-javascript-library usr/share/doc/libtao-doc/av/jquery.js please use libjs-jquery
+libtao-doc: embedded-javascript-library usr/share/doc/libtao-doc/compression/jquery.js please use libjs-jquery
+libtao-doc: embedded-javascript-library usr/share/doc/libtao-doc/cosevent/jquery.js please use libjs-jquery
+libtao-doc: embedded-javascript-library usr/share/doc/libtao-doc/cosnaming/jquery.js please use libjs-jquery
+libtao-doc: embedded-javascript-library usr/share/doc/libtao-doc/cosnotification/jquery.js please use libjs-jquery
+libtao-doc: embedded-javascript-library usr/share/doc/libtao-doc/costime/jquery.js please use libjs-jquery
+libtao-doc: embedded-javascript-library usr/share/doc/libtao-doc/costrader/jquery.js please use libjs-jquery
+libtao-doc: embedded-javascript-library usr/share/doc/libtao-doc/dynamicany/jquery.js please use libjs-jquery
+libtao-doc: embedded-javascript-library usr/share/doc/libtao-doc/dynamicinterface/jquery.js please use libjs-jquery
+libtao-doc: embedded-javascript-library usr/share/doc/libtao-doc/esf/jquery.js please use libjs-jquery
+libtao-doc: embedded-javascript-library usr/share/doc/libtao-doc/ifr/jquery.js please use libjs-jquery
+libtao-doc: embedded-javascript-library usr/share/doc/libtao-doc/implrepo_service/jquery.js please use libjs-jquery
+libtao-doc: embedded-javascript-library usr/share/doc/libtao-doc/iormanipulation/jquery.js please use libjs-jquery
+libtao-doc: embedded-javascript-library usr/share/doc/libtao-doc/iortable/jquery.js please use libjs-jquery
+libtao-doc: embedded-javascript-library usr/share/doc/libtao-doc/jquery.js please use libjs-jquery
+libtao-doc: embedded-javascript-library usr/share/doc/libtao-doc/pi/jquery.js please use libjs-jquery
+libtao-doc: embedded-javascript-library usr/share/doc/libtao-doc/pi_server/jquery.js please use libjs-jquery
+libtao-doc: embedded-javascript-library usr/share/doc/libtao-doc/portablegroup/jquery.js please use libjs-jquery
+libtao-doc: embedded-javascript-library usr/share/doc/libtao-doc/portableserver/jquery.js please use libjs-jquery
+libtao-doc: embedded-javascript-library usr/share/doc/libtao-doc/rtcorba/jquery.js please use libjs-jquery
+libtao-doc: embedded-javascript-library usr/share/doc/libtao-doc/rtevent/jquery.js please use libjs-jquery
+libtao-doc: embedded-javascript-library usr/share/doc/libtao-doc/rtportableserver/jquery.js please use libjs-jquery
+libtao-doc: embedded-javascript-library usr/share/doc/libtao-doc/security/jquery.js please use libjs-jquery
+libtao-doc: embedded-javascript-library usr/share/doc/libtao-doc/smartproxies/jquery.js please use libjs-jquery
+libtao-doc: embedded-javascript-library usr/share/doc/libtao-doc/ssliop/jquery.js please use libjs-jquery
+libtao-doc: embedded-javascript-library usr/share/doc/libtao-doc/strategies/jquery.js please use libjs-jquery
+libtao-doc: embedded-javascript-library usr/share/doc/libtao-doc/transportcurrent/jquery.js please use libjs-jquery
+libtao-doc: embedded-javascript-library usr/share/doc/libtao-doc/ziop/jquery.js please use libjs-jquery
diff --git a/ACE/debian/libtao-flresource-2.2.7.lintian-overrides b/ACE/debian/libtao-flresource-2.2.7.lintian-overrides
new file mode 100644
index 00000000000..28b7907f70b
--- /dev/null
+++ b/ACE/debian/libtao-flresource-2.2.7.lintian-overrides
@@ -0,0 +1,2 @@
+libtao-flresource-2.2.7: extended-description-is-probably-too-short
+libtao-flresource-2.2.7: no-symbols-control-file usr/lib/libTAO_FlResource-2.2.7.so
diff --git a/ACE/debian/libtao-flresource-dev.lintian-overrides b/ACE/debian/libtao-flresource-dev.lintian-overrides
new file mode 100644
index 00000000000..2c3e5f9b6ff
--- /dev/null
+++ b/ACE/debian/libtao-flresource-dev.lintian-overrides
@@ -0,0 +1 @@
+libtao-flresource-dev: extended-description-is-probably-too-short
diff --git a/ACE/debian/libtao-foxresource-2.2.7.lintian-overrides b/ACE/debian/libtao-foxresource-2.2.7.lintian-overrides
new file mode 100644
index 00000000000..0e291526088
--- /dev/null
+++ b/ACE/debian/libtao-foxresource-2.2.7.lintian-overrides
@@ -0,0 +1,2 @@
+libtao-foxresource-2.2.7: extended-description-is-probably-too-short
+libtao-foxresource-2.2.7: no-symbols-control-file usr/lib/libTAO_FoxResource-2.2.7.so
diff --git a/ACE/debian/libtao-foxresource-dev.lintian-overrides b/ACE/debian/libtao-foxresource-dev.lintian-overrides
new file mode 100644
index 00000000000..7ccdd21ebef
--- /dev/null
+++ b/ACE/debian/libtao-foxresource-dev.lintian-overrides
@@ -0,0 +1 @@
+libtao-foxresource-dev: extended-description-is-probably-too-short
diff --git a/ACE/debian/libtao-orbsvcs-2.2.7.lintian-overrides b/ACE/debian/libtao-orbsvcs-2.2.7.lintian-overrides
new file mode 100644
index 00000000000..8f357d027bf
--- /dev/null
+++ b/ACE/debian/libtao-orbsvcs-2.2.7.lintian-overrides
@@ -0,0 +1,71 @@
+libtao-orbsvcs-2.2.7: package-name-doesnt-match-sonames libTAO-AV-2.2.7 libTAO-Async-ImR-Client-IDL-2.2.7 libTAO-Catior-i-2.2.7 libTAO-CosConcurrency-2.2.7 libTAO-CosConcurrency-Serv-2.2.7 libTAO-CosConcurrency-Skel-2.2.7 libTAO-CosEvent-2.2.7 libTAO-CosEvent-Serv-2.2.7 libTAO-CosEvent-Skel-2.2.7 libTAO-CosLifeCycle-2.2.7 libTAO-CosLifeCycle-Skel-2.2.7 libTAO-CosLoadBalancing-2.2.7 libTAO-CosNaming-2.2.7 libTAO-CosNaming-Serv-2.2.7 libTAO-CosNaming-Skel-2.2.7 libTAO-CosNotification-2.2.7 libTAO-CosNotification-MC-2.2.7 libTAO-CosNotification-MC-Ext-2.2.7 libTAO-CosNotification-Persist-2.2.7 libTAO-CosNotification-Serv-2.2.7 libTAO-CosNotification-Skel-2.2.7 libTAO-CosProperty-2.2.7 libTAO-CosProperty-Serv-2.2.7 libTAO-CosProperty-Skel-2.2.7 libTAO-CosTime-2.2.7 libTAO-CosTime-Serv-2.2.7 libTAO-CosTime-Skel-2.2.7 libTAO-CosTrading-2.2.7 libTAO-CosTrading-Serv-2.2.7 libTAO-CosTrading-Skel-2.2.7 libTAO-DsEventLogAdmin-2.2.7 libTAO-DsEventLogAdmin-Serv-2.2.7 libTAO-DsEventLogAdmin-Skel-2.2.7 libTAO-DsLogAdmin-2.2.7 libTAO-DsLogAdmin-Serv-2.2.7 libTAO-DsLogAdmin-Skel-2.2.7 libTAO-DsNotifyLogAdmin-2.2.7 libTAO-DsNotifyLogAdmin-Serv-2.2.7 libTAO-DsNotifyLogAdmin-Skel-2.2.7 libTAO-FTORB-Utils-2.2.7 libTAO-FTRT-ClientORB-2.2.7 libTAO-FTRT-EventChannel-2.2.7 libTAO-FT-ClientORB-2.2.7 libTAO-FT-ServerORB-2.2.7 libTAO-FaultTolerance-2.2.7 libTAO-FtRtEvent-2.2.7 libTAO-HTIOP-2.2.7 libTAO-IFRService-2.2.7 libTAO-ImR-Activator-2.2.7 libTAO-ImR-Activator-IDL-2.2.7 libTAO-ImR-Locator-2.2.7 libTAO-ImR-Locator-IDL-2.2.7 libTAO-Notify-Service-2.2.7 libTAO-PortableGroup-2.2.7 libTAO-RTCORBAEvent-2.2.7 libTAO-RTEvent-2.2.7 libTAO-RTEventLogAdmin-2.2.7 libTAO-RTEventLogAdmin-Serv-2.2.7 libTAO-RTEventLogAdmin-Skel-2.2.7 libTAO-RTEvent-Serv-2.2.7 libTAO-RTEvent-Skel-2.2.7 libTAO-RTKokyuEvent-2.2.7 libTAO-RTSched-2.2.7 libTAO-RTSchedEvent-2.2.7 libTAO-RT-Notification-2.2.7 libTAO-ReplicationManagerLib-2.2.7 libTAO-SSLIOP-2.2.7 libTAO-Security-2.2.7 libTAO-Svc-Utils-2.2.7
+libtao-orbsvcs-2.2.7: extended-description-is-probably-too-short
+libtao-orbsvcs-2.2.7: no-symbols-control-file usr/lib/libTAO_CosLifeCycle_Skel-2.2.7.so
+libtao-orbsvcs-2.2.7: no-symbols-control-file usr/lib/libTAO_CosTrading_Skel-2.2.7.so
+libtao-orbsvcs-2.2.7: no-symbols-control-file usr/lib/libTAO_FtRtEvent-2.2.7.so
+libtao-orbsvcs-2.2.7: no-symbols-control-file usr/lib/libTAO_CosEvent_Skel-2.2.7.so
+libtao-orbsvcs-2.2.7: no-symbols-control-file usr/lib/libTAO_CosConcurrency_Serv-2.2.7.so
+libtao-orbsvcs-2.2.7: no-symbols-control-file usr/lib/libTAO_DsEventLogAdmin_Serv-2.2.7.so
+libtao-orbsvcs-2.2.7: no-symbols-control-file usr/lib/libTAO_CosProperty_Serv-2.2.7.so
+libtao-orbsvcs-2.2.7: no-symbols-control-file usr/lib/libTAO_ImR_Locator-2.2.7.so
+libtao-orbsvcs-2.2.7: no-symbols-control-file usr/lib/libTAO_ReplicationManagerLib-2.2.7.so
+libtao-orbsvcs-2.2.7: no-symbols-control-file usr/lib/libTAO_CosNotification_Serv-2.2.7.so
+libtao-orbsvcs-2.2.7: no-symbols-control-file usr/lib/libTAO_DsEventLogAdmin_Skel-2.2.7.so
+libtao-orbsvcs-2.2.7: no-symbols-control-file usr/lib/libTAO_DsLogAdmin_Serv-2.2.7.so
+libtao-orbsvcs-2.2.7: no-symbols-control-file usr/lib/libTAO_CosLoadBalancing-2.2.7.so
+libtao-orbsvcs-2.2.7: no-symbols-control-file usr/lib/libTAO_AV-2.2.7.so
+libtao-orbsvcs-2.2.7: no-symbols-control-file usr/lib/libTAO_FTORB_Utils-2.2.7.so
+libtao-orbsvcs-2.2.7: no-symbols-control-file usr/lib/libTAO_RTEventLogAdmin-2.2.7.so
+libtao-orbsvcs-2.2.7: no-symbols-control-file usr/lib/libTAO_CosTime_Skel-2.2.7.so
+libtao-orbsvcs-2.2.7: no-symbols-control-file usr/lib/libTAO_RTEventLogAdmin_Serv-2.2.7.so
+libtao-orbsvcs-2.2.7: no-symbols-control-file usr/lib/libTAO_RTSchedEvent-2.2.7.so
+libtao-orbsvcs-2.2.7: no-symbols-control-file usr/lib/libTAO_ImR_Activator-2.2.7.so
+libtao-orbsvcs-2.2.7: no-symbols-control-file usr/lib/libTAO_DsNotifyLogAdmin-2.2.7.so
+libtao-orbsvcs-2.2.7: no-symbols-control-file usr/lib/libTAO_DsNotifyLogAdmin_Skel-2.2.7.so
+libtao-orbsvcs-2.2.7: no-symbols-control-file usr/lib/libTAO_CosConcurrency-2.2.7.so
+libtao-orbsvcs-2.2.7: no-symbols-control-file usr/lib/libTAO_DsLogAdmin-2.2.7.so
+libtao-orbsvcs-2.2.7: no-symbols-control-file usr/lib/libTAO_CosNotification-2.2.7.so
+libtao-orbsvcs-2.2.7: no-symbols-control-file usr/lib/libTAO_RTEvent_Serv-2.2.7.so
+libtao-orbsvcs-2.2.7: no-symbols-control-file usr/lib/libTAO_CosNotification_Skel-2.2.7.so
+libtao-orbsvcs-2.2.7: no-symbols-control-file usr/lib/libTAO_CosTrading-2.2.7.so
+libtao-orbsvcs-2.2.7: no-symbols-control-file usr/lib/libTAO_RTEvent-2.2.7.so
+libtao-orbsvcs-2.2.7: no-symbols-control-file usr/lib/libTAO_DsLogAdmin_Skel-2.2.7.so
+libtao-orbsvcs-2.2.7: no-symbols-control-file usr/lib/libTAO_ImR_Activator_IDL-2.2.7.so
+libtao-orbsvcs-2.2.7: no-symbols-control-file usr/lib/libTAO_RTCORBAEvent-2.2.7.so
+libtao-orbsvcs-2.2.7: no-symbols-control-file usr/lib/libTAO_CosTrading_Serv-2.2.7.so
+libtao-orbsvcs-2.2.7: no-symbols-control-file usr/lib/libTAO_ImR_Locator_IDL-2.2.7.so
+libtao-orbsvcs-2.2.7: no-symbols-control-file usr/lib/libTAO_CosNaming_Serv-2.2.7.so
+libtao-orbsvcs-2.2.7: no-symbols-control-file usr/lib/libTAO_RTEvent_Skel-2.2.7.so
+libtao-orbsvcs-2.2.7: no-symbols-control-file usr/lib/libTAO_Notify_Service-2.2.7.so
+libtao-orbsvcs-2.2.7: no-symbols-control-file usr/lib/libTAO_CosProperty_Skel-2.2.7.so
+libtao-orbsvcs-2.2.7: no-symbols-control-file usr/lib/libTAO_DsNotifyLogAdmin_Serv-2.2.7.so
+libtao-orbsvcs-2.2.7: no-symbols-control-file usr/lib/libTAO_FT_ServerORB-2.2.7.so
+libtao-orbsvcs-2.2.7: no-symbols-control-file usr/lib/libTAO_CosLifeCycle-2.2.7.so
+libtao-orbsvcs-2.2.7: no-symbols-control-file usr/lib/libTAO_CosNotification_Persist-2.2.7.so
+libtao-orbsvcs-2.2.7: no-symbols-control-file usr/lib/libTAO_Catior_i-2.2.7.so
+libtao-orbsvcs-2.2.7: no-symbols-control-file usr/lib/libTAO_FTRT_ClientORB-2.2.7.so
+libtao-orbsvcs-2.2.7: no-symbols-control-file usr/lib/libTAO_Security-2.2.7.so
+libtao-orbsvcs-2.2.7: no-symbols-control-file usr/lib/libTAO_CosNotification_MC_Ext-2.2.7.so
+libtao-orbsvcs-2.2.7: no-symbols-control-file usr/lib/libTAO_HTIOP-2.2.7.so
+libtao-orbsvcs-2.2.7: no-symbols-control-file usr/lib/libTAO_IFRService-2.2.7.so
+libtao-orbsvcs-2.2.7: no-symbols-control-file usr/lib/libTAO_CosTime_Serv-2.2.7.so
+libtao-orbsvcs-2.2.7: no-symbols-control-file usr/lib/libTAO_Async_ImR_Client_IDL-2.2.7.so
+libtao-orbsvcs-2.2.7: no-symbols-control-file usr/lib/libTAO_CosTime-2.2.7.so
+libtao-orbsvcs-2.2.7: no-symbols-control-file usr/lib/libTAO_Svc_Utils-2.2.7.so
+libtao-orbsvcs-2.2.7: no-symbols-control-file usr/lib/libTAO_CosProperty-2.2.7.so
+libtao-orbsvcs-2.2.7: no-symbols-control-file usr/lib/libTAO_CosEvent_Serv-2.2.7.so
+libtao-orbsvcs-2.2.7: no-symbols-control-file usr/lib/libTAO_DsEventLogAdmin-2.2.7.so
+libtao-orbsvcs-2.2.7: no-symbols-control-file usr/lib/libTAO_RTEventLogAdmin_Skel-2.2.7.so
+libtao-orbsvcs-2.2.7: no-symbols-control-file usr/lib/libTAO_CosEvent-2.2.7.so
+libtao-orbsvcs-2.2.7: no-symbols-control-file usr/lib/libTAO_PortableGroup-2.2.7.so
+libtao-orbsvcs-2.2.7: no-symbols-control-file usr/lib/libTAO_RT_Notification-2.2.7.so
+libtao-orbsvcs-2.2.7: no-symbols-control-file usr/lib/libTAO_FaultTolerance-2.2.7.so
+libtao-orbsvcs-2.2.7: no-symbols-control-file usr/lib/libTAO_RTKokyuEvent-2.2.7.so
+libtao-orbsvcs-2.2.7: no-symbols-control-file usr/lib/libTAO_CosNaming_Skel-2.2.7.so
+libtao-orbsvcs-2.2.7: no-symbols-control-file usr/lib/libTAO_FT_ClientORB-2.2.7.so
+libtao-orbsvcs-2.2.7: no-symbols-control-file usr/lib/libTAO_FTRT_EventChannel-2.2.7.so
+libtao-orbsvcs-2.2.7: no-symbols-control-file usr/lib/libTAO_SSLIOP-2.2.7.so
+libtao-orbsvcs-2.2.7: no-symbols-control-file usr/lib/libTAO_CosConcurrency_Skel-2.2.7.so
+libtao-orbsvcs-2.2.7: no-symbols-control-file usr/lib/libTAO_CosNaming-2.2.7.so
+libtao-orbsvcs-2.2.7: no-symbols-control-file usr/lib/libTAO_CosNotification_MC-2.2.7.so
+libtao-orbsvcs-2.2.7: no-symbols-control-file usr/lib/libTAO_RTSched-2.2.7.so
diff --git a/ACE/debian/libtao-qtresource-2.2.7.lintian-overrides b/ACE/debian/libtao-qtresource-2.2.7.lintian-overrides
new file mode 100644
index 00000000000..d7c2f9dac9f
--- /dev/null
+++ b/ACE/debian/libtao-qtresource-2.2.7.lintian-overrides
@@ -0,0 +1 @@
+libtao-qtresource-2.2.7: no-symbols-control-file usr/lib/libTAO_QtResource-2.2.7.so
diff --git a/ACE/debian/libtao-qtresource-dev.lintian-overrides b/ACE/debian/libtao-qtresource-dev.lintian-overrides
new file mode 100644
index 00000000000..4fbef0c0800
--- /dev/null
+++ b/ACE/debian/libtao-qtresource-dev.lintian-overrides
@@ -0,0 +1 @@
+libtao-qtresource-dev: extended-description-is-probably-too-short
diff --git a/ACE/debian/libtao-tkresource-2.2.7.lintian-overrides b/ACE/debian/libtao-tkresource-2.2.7.lintian-overrides
new file mode 100644
index 00000000000..94627217c4e
--- /dev/null
+++ b/ACE/debian/libtao-tkresource-2.2.7.lintian-overrides
@@ -0,0 +1,2 @@
+libtao-tkresource-2.2.7: extended-description-is-probably-too-short
+libtao-tkresource-2.2.7: no-symbols-control-file usr/lib/libTAO_TkResource-2.2.7.so
diff --git a/ACE/debian/libtao-tkresource-dev.lintian-overrides b/ACE/debian/libtao-tkresource-dev.lintian-overrides
new file mode 100644
index 00000000000..308c4af6bc6
--- /dev/null
+++ b/ACE/debian/libtao-tkresource-dev.lintian-overrides
@@ -0,0 +1 @@
+libtao-tkresource-dev: extended-description-is-probably-too-short
diff --git a/ACE/debian/libtao-xtresource-2.2.7.lintian-overrides b/ACE/debian/libtao-xtresource-2.2.7.lintian-overrides
new file mode 100644
index 00000000000..3b0d1808c3c
--- /dev/null
+++ b/ACE/debian/libtao-xtresource-2.2.7.lintian-overrides
@@ -0,0 +1,2 @@
+libtao-xtresource-2.2.7: extended-description-is-probably-too-short
+libtao-xtresource-2.2.7: no-symbols-control-file usr/lib/libTAO_XtResource-2.2.7.so
diff --git a/ACE/debian/libtao-xtresource-dev.lintian-overrides b/ACE/debian/libtao-xtresource-dev.lintian-overrides
new file mode 100644
index 00000000000..d6bde587983
--- /dev/null
+++ b/ACE/debian/libtao-xtresource-dev.lintian-overrides
@@ -0,0 +1 @@
+libtao-xtresource-dev: extended-description-is-probably-too-short
diff --git a/ACE/docs/svn/config b/ACE/docs/svn/config
index e1a39660b5b..1d343062030 100644
--- a/ACE/docs/svn/config
+++ b/ACE/docs/svn/config
@@ -153,6 +153,7 @@ enable-auto-props = yes
*.pem=svn:eol-style=native;svn:keywords=Author Date Id Revision
*.xme=svn:eol-style=native;svn:keywords=Author Date Id Revision
*.features=svn:eol-style=native;svn:keywords=Author Date Id Revision
+*.lintian-overrides=svn:eol-style=native;svn:keywords=Author Date Id Revision
Change?og*=svn:eol-style=native;svn:keywords=Author Date Id Revision
README=svn:eol-style=native;svn:keywords=Author Date Id Revision
"Makefile"="svn:eol-style=native;svn:keywords=Author Date Id Revision"
diff --git a/ACE/examples/Reactor/Proactor/test_udp_proactor.cpp b/ACE/examples/Reactor/Proactor/test_udp_proactor.cpp
index d802ef412ce..4d8a6ca0ebb 100644
--- a/ACE/examples/Reactor/Proactor/test_udp_proactor.cpp
+++ b/ACE/examples/Reactor/Proactor/test_udp_proactor.cpp
@@ -146,7 +146,7 @@ Receiver::open_addr (const ACE_INET_Addr &localAddr)
ACE_DEBUG ((LM_DEBUG, "********************\n"));
ACE_DEBUG ((LM_DEBUG,
"%s = %d\n",
- "bytes recieved immediately",
+ "bytes received immediately",
number_of_bytes_recvd));
ACE_DEBUG ((LM_DEBUG, "********************\n"));
res = 0;
diff --git a/ACE/tests/Bug_2820_Regression_Test.cpp b/ACE/tests/Bug_2820_Regression_Test.cpp
index 17a1036d19b..55bb868c78d 100644
--- a/ACE/tests/Bug_2820_Regression_Test.cpp
+++ b/ACE/tests/Bug_2820_Regression_Test.cpp
@@ -50,8 +50,13 @@ run_main (int, ACE_TCHAR *[])
auto_ptr<ACE_Reactor> reactor(
new ACE_Reactor(new ACE_Select_Reactor, 1));
+#if defined ACE_HAS_CPP11
+ ACE_Event_Handler_var v =
+ ACE::make_event_handler<Simple_Handler> (reactor.get());
+#else
ACE_Event_Handler_var v(
new Simple_Handler(reactor.get()));
+#endif
ACE_Event_Handler::Reference_Count pre_notify_count =
v->add_reference();