From 45df27f3869f66d895964f18a582136bb44333af Mon Sep 17 00:00:00 2001
From: "shuai.lou" <shuai.lou@greatopensource.com>
Date: Fri, 2 Mar 2018 22:34:46 +0800
Subject: Bugfix: ACE abort when use %l and the msg len exceed ACE_MAXLOGMSGLEN

---
 ACE/ace/Log_Msg.cpp        | 1 +
 ACE/tests/Log_Msg_Test.cpp | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/ACE/ace/Log_Msg.cpp b/ACE/ace/Log_Msg.cpp
index 09b43632575..cc5cf7107a2 100644
--- a/ACE/ace/Log_Msg.cpp
+++ b/ACE/ace/Log_Msg.cpp
@@ -1256,6 +1256,7 @@ ACE_Log_Msg::log (const ACE_TCHAR *format_str,
                                                  this->linenum ());
                   else
                     this_len = ACE_OS::sprintf (bp, format, this->linenum ());
+                  ACE_UPDATE_COUNT (bspace, this_len);
                   break;
 
                 case 'N':             // Source file name
diff --git a/ACE/tests/Log_Msg_Test.cpp b/ACE/tests/Log_Msg_Test.cpp
index 0b489116694..b0f31ddf21a 100644
--- a/ACE/tests/Log_Msg_Test.cpp
+++ b/ACE/tests/Log_Msg_Test.cpp
@@ -246,7 +246,7 @@ test_log_msg_features (const ACE_TCHAR *program)
       big[index] = alphabet[i % j];
     }
   big[ACE_Log_Record::MAXLOGMSGLEN] = ACE_TEXT ('\0');
-  ACE_DEBUG ((LM_INFO, ACE_TEXT ("This is too big: %s\n"), big));
+  ACE_DEBUG ((LM_INFO, ACE_TEXT ("This is too big:%l %s\n"), big));
 
   ACE_HEX_DUMP((LM_INFO, (const char*)big, ACE_Log_Record::MAXLOGMSGLEN ));
 
-- 
cgit v1.2.1


From 4fa7cca17c3ff0c07f4c1b7b1bda71b6e131092b Mon Sep 17 00:00:00 2001
From: Johnny Willemsen <jwillemsen@remedy.nl>
Date: Tue, 6 Mar 2018 11:41:04 +0100
Subject: Any bcc32 version doesn't support inlined assembly

    * ACE/ace/config-win32-borland.h:
---
 ACE/ace/config-win32-borland.h | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/ACE/ace/config-win32-borland.h b/ACE/ace/config-win32-borland.h
index 0f6faa8e1b3..25333940e55 100644
--- a/ACE/ace/config-win32-borland.h
+++ b/ACE/ace/config-win32-borland.h
@@ -174,6 +174,12 @@
 #endif
 
 #if defined (ACE_HAS_BCC32)
+// The bcc32 compiler can't handle assembly in inline methods or
+// templates (E2211). When we build for pentium optimized and we are inlining
+// then we disable inline assembly
+# if defined (ACE_HAS_PENTIUM) && defined(__ACE_INLINE__) && !defined(__clang__)
+#  define ACE_LACKS_INLINE_ASSEMBLY
+# endif
 # define ACE_SIZEOF_LONG_DOUBLE 10
 # define ACE_NEEDS_DL_UNDERSCORE
 #endif
-- 
cgit v1.2.1


From 82a13ced5dc9560849b96f5f90f889c7221037cc Mon Sep 17 00:00:00 2001
From: Johnny Willemsen <jwillemsen@remedy.nl>
Date: Tue, 6 Mar 2018 17:00:16 +0100
Subject: Starter issue template

---
 issue_template.md | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 48 insertions(+)
 create mode 100644 issue_template.md

diff --git a/issue_template.md b/issue_template.md
new file mode 100644
index 00000000000..d216b72535f
--- /dev/null
+++ b/issue_template.md
@@ -0,0 +1,48 @@
+    TAO VERSION: 2.4.6
+    ACE VERSION: 6.4.6
+
+    HOST MACHINE and OPERATING SYSTEM:
+        If on Windows based OS's, which version of WINSOCK do you
+        use?:
+
+    TARGET MACHINE and OPERATING SYSTEM, if different from HOST:
+    COMPILER NAME AND VERSION (AND PATCHLEVEL):
+
+    THE $ACE_ROOT/ace/config.h FILE [if you use a link to a platform-
+    specific file, simply state which one]:
+
+    THE $ACE_ROOT/include/makeinclude/platform_macros.GNU FILE [if you
+    use a link to a platform-specific file, simply state which one
+    (unless this isn't used in this case, e.g., with Microsoft Visual
+    C++)]:
+
+    CONTENTS OF $ACE_ROOT/bin/MakeProjectCreator/config/default.features
+    (used by MPC when you generate your own makefiles):
+
+    AREA/CLASS/EXAMPLE AFFECTED:
+[What example failed?  What module failed to compile?]
+
+    DOES THE PROBLEM AFFECT:
+        COMPILATION?
+            If so, what do your $ACE_ROOT/ace/config.h and
+            $ACE_ROOT/include/makeinclude/platform_macros.GNU contain?
+        LINKING?
+            On Unix systems, did you run make realclean first?
+        EXECUTION?
+        OTHER (please specify)?
+[Please indicate whether ACE/TAO, your application, or both are affected.]
+
+    SYNOPSIS:
+[Brief description of the problem]
+
+    DESCRIPTION:
+[Detailed description of problem.  Don't just say "<blah>
+doesn't work, here's a fix," explain what your program does
+to get to the <blah> state. ]
+
+    REPEAT BY:
+[What you did to get the error; include test program or session
+transcript if at all possible.  ]
+
+### SAMPLE FIX/WORKAROUND:
+[If available ]
-- 
cgit v1.2.1


From b30dd93734a3ae8a32882b73fd8c680d49f13b0a Mon Sep 17 00:00:00 2001
From: Johnny Willemsen <jwillemsen@remedy.nl>
Date: Tue, 6 Mar 2018 17:06:47 +0100
Subject: Convert to MD format

---
 issue_template.md | 96 +++++++++++++++++++++++++++----------------------------
 1 file changed, 48 insertions(+), 48 deletions(-)

diff --git a/issue_template.md b/issue_template.md
index d216b72535f..fa63ec1fdb7 100644
--- a/issue_template.md
+++ b/issue_template.md
@@ -1,48 +1,48 @@
-    TAO VERSION: 2.4.6
-    ACE VERSION: 6.4.6
-
-    HOST MACHINE and OPERATING SYSTEM:
-        If on Windows based OS's, which version of WINSOCK do you
-        use?:
-
-    TARGET MACHINE and OPERATING SYSTEM, if different from HOST:
-    COMPILER NAME AND VERSION (AND PATCHLEVEL):
-
-    THE $ACE_ROOT/ace/config.h FILE [if you use a link to a platform-
-    specific file, simply state which one]:
-
-    THE $ACE_ROOT/include/makeinclude/platform_macros.GNU FILE [if you
-    use a link to a platform-specific file, simply state which one
-    (unless this isn't used in this case, e.g., with Microsoft Visual
-    C++)]:
-
-    CONTENTS OF $ACE_ROOT/bin/MakeProjectCreator/config/default.features
-    (used by MPC when you generate your own makefiles):
-
-    AREA/CLASS/EXAMPLE AFFECTED:
-[What example failed?  What module failed to compile?]
-
-    DOES THE PROBLEM AFFECT:
-        COMPILATION?
-            If so, what do your $ACE_ROOT/ace/config.h and
-            $ACE_ROOT/include/makeinclude/platform_macros.GNU contain?
-        LINKING?
-            On Unix systems, did you run make realclean first?
-        EXECUTION?
-        OTHER (please specify)?
-[Please indicate whether ACE/TAO, your application, or both are affected.]
-
-    SYNOPSIS:
-[Brief description of the problem]
-
-    DESCRIPTION:
-[Detailed description of problem.  Don't just say "<blah>
-doesn't work, here's a fix," explain what your program does
-to get to the <blah> state. ]
-
-    REPEAT BY:
-[What you did to get the error; include test program or session
-transcript if at all possible.  ]
-
-### SAMPLE FIX/WORKAROUND:
-[If available ]
+### Version
+
+ACE: [your version]
+TAO: [your version]
+
+### Host machine and operating system
+
+If on Windows based OS's, which version of WINSOCK do you use?:
+
+### Target machine and operating system (if different from host)
+
+### Compiler name and version (including patch level)
+
+### The $ACE_ROOT/ace/config.h file 
+
+If you use a link to a platform-specific file, simply state which one]
+    
+### The $ACE_ROOT/include/makeinclude/platform_macros.GNU file
+
+if you use a link to a platform-specific file, simply state which one (unless this isn't used in this case, e.g., with Microsoft Visual C++)]:
+
+### Contents of $ACE_ROOT/bin/MakeProjectCreator/config/default.features
+    
+Uused by MPC when you generate your own makefiles
+
+### AREA/CLASS/EXAMPLE AFFECTED:
+ 
+What example failed?  What module failed to compile?
+
+### The problem effects:
+
+Does it affect compilation, linking, or execution. Please indicate whether ACE/TAO, your application, or both are affected.
+
+### Synopsis
+
+Brief description of the problem
+
+### Description
+
+Detailed description of problem.  Don't just say "<blah> doesn't work, here's a fix," explain what your program does to get to the <blah> state.
+
+### Repeast by
+
+What you did to get the error; include test program or session transcript if at all possible. 
+
+### Sample fix/ workaround
+
+If available
-- 
cgit v1.2.1


From 2b9a17f3007245a9449bec2e2abe0e6d936b2ce9 Mon Sep 17 00:00:00 2001
From: Johnny Willemsen <jwillemsen@remedy.nl>
Date: Tue, 6 Mar 2018 17:07:15 +0100
Subject: Fixed typo

---
 issue_template.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/issue_template.md b/issue_template.md
index fa63ec1fdb7..d535e9d7154 100644
--- a/issue_template.md
+++ b/issue_template.md
@@ -21,7 +21,7 @@ if you use a link to a platform-specific file, simply state which one (unless th
 
 ### Contents of $ACE_ROOT/bin/MakeProjectCreator/config/default.features
     
-Uused by MPC when you generate your own makefiles
+Used by MPC when you generate your own makefiles
 
 ### AREA/CLASS/EXAMPLE AFFECTED:
  
-- 
cgit v1.2.1


From 66e84f43246a74b1efadf60ff7aef1146a853c98 Mon Sep 17 00:00:00 2001
From: Adam Mitz <mitza@ociweb.com>
Date: Tue, 6 Mar 2018 11:06:41 -0600
Subject: Bug 1220 fix applied to SHMIOP (fixed for IIOP long ago).

Also added a SHMIOP test, IPv6 compatibility, and fixed wrong indent in Synch_Invocation.cpp.
---
 TAO/bin/tao_orb_tests.lst               |   3 +
 TAO/tao/Strategies/SHMIOP_Acceptor.cpp  |  15 +---
 TAO/tao/Strategies/SHMIOP_Connector.cpp |   9 ++-
 TAO/tao/Synch_Invocation.cpp            |  20 ++---
 TAO/tests/SHMIOP/SHMIOP_Test.mpc        |  11 +++
 TAO/tests/SHMIOP/Test.idl               |   9 +++
 TAO/tests/SHMIOP/run_test.pl            |  84 +++++++++++++++++++++
 TAO/tests/SHMIOP/run_test_collocated.pl |  40 ++++++++++
 TAO/tests/SHMIOP/shmiop_test.cpp        | 126 ++++++++++++++++++++++++++++++++
 TAO/tests/SHMIOP/static_shmiop.conf     |   1 +
 10 files changed, 294 insertions(+), 24 deletions(-)
 create mode 100644 TAO/tests/SHMIOP/SHMIOP_Test.mpc
 create mode 100644 TAO/tests/SHMIOP/Test.idl
 create mode 100644 TAO/tests/SHMIOP/run_test.pl
 create mode 100644 TAO/tests/SHMIOP/run_test_collocated.pl
 create mode 100644 TAO/tests/SHMIOP/shmiop_test.cpp
 create mode 100644 TAO/tests/SHMIOP/static_shmiop.conf

diff --git a/TAO/bin/tao_orb_tests.lst b/TAO/bin/tao_orb_tests.lst
index fc10728010b..3d5431de636 100644
--- a/TAO/bin/tao_orb_tests.lst
+++ b/TAO/bin/tao_orb_tests.lst
@@ -267,6 +267,9 @@ TAO/tests/No_Server_MT_Connect_Test/run_test.pl: !ST !MINIMUM !CORBA_E_COMPACT !
 TAO/tests/Connect_Strategy_Test/run_test.pl:
 # DISABLED TAO/tests/Client_Leaks/run_test.pl: !VxWorks !ST !Tru64
 TAO/tests/Server_Leaks/run_test.pl: !ANDROID
+TAO/tests/SHMIOP/run_test_collocated.pl: !ACE_FOR_TAO
+TAO/tests/SHMIOP/run_test.pl: !ACE_FOR_TAO
+TAO/tests/SHMIOP/run_test.pl with_collocated: !ACE_FOR_TAO
 TAO/tests/Smart_Proxies/Policy/run_test.pl:
 TAO/tests/Smart_Proxies/run_test.pl:
 TAO/tests/Smart_Proxies/dtor/run_test.pl:
diff --git a/TAO/tao/Strategies/SHMIOP_Acceptor.cpp b/TAO/tao/Strategies/SHMIOP_Acceptor.cpp
index 2a582f8e2a5..83443fd6430 100644
--- a/TAO/tao/Strategies/SHMIOP_Acceptor.cpp
+++ b/TAO/tao/Strategies/SHMIOP_Acceptor.cpp
@@ -153,18 +153,9 @@ TAO_SHMIOP_Acceptor::is_collocated (const TAO_Endpoint *endpoint)
   if (endp == 0)
     return 0;
 
-      // @@ TODO The following code looks funky, why only the host
-      //    name is compared?  What if there are multiple SHMIOP
-      //    servers in the same address?  Why do SHMIOP_Endpoints keep
-      //    a INET_Addr but not a MEM_Addr?  And why is there no lazy
-      //    evaluation of IP-addresses for SHMIOP endpoints?  Is it
-      //    because it is always 'localhost'?  We need answers to
-      //    these questions to solve:
-      //
-      // http://deuce.doc.wustl.edu/bugzilla/show_bug.cgi?id=1220
-      //
-  // The following code is suspec
-  // compare the port and sin_addr (numeric host address)
+  if (endp->port () != this->address_.get_port_number ())
+    return 0;
+
   return this->address_.same_host (endp->object_addr ());
 }
 
diff --git a/TAO/tao/Strategies/SHMIOP_Connector.cpp b/TAO/tao/Strategies/SHMIOP_Connector.cpp
index bcf909b54ee..3f0532eb050 100644
--- a/TAO/tao/Strategies/SHMIOP_Connector.cpp
+++ b/TAO/tao/Strategies/SHMIOP_Connector.cpp
@@ -96,8 +96,14 @@ TAO_SHMIOP_Connector::set_validate_endpoint (TAO_Endpoint *endpoint)
    // Verify that the remote ACE_INET_Addr was initialized properly.
    // Failure can occur if hostname lookup failed when initializing the
    // remote ACE_INET_Addr.
-   if (remote_address.get_type () != AF_INET)
+   switch (remote_address.get_type ())
      {
+     case AF_INET:
+#ifdef ACE_HAS_IPV6
+     case AF_INET6:
+#endif
+       break;
+     default:
        if (TAO_debug_level > 0)
          {
            TAOLIB_ERROR ((LM_ERROR,
@@ -111,7 +117,6 @@ TAO_SHMIOP_Connector::set_validate_endpoint (TAO_Endpoint *endpoint)
      }
 
    return 0;
-
 }
 
 TAO_Transport *
diff --git a/TAO/tao/Synch_Invocation.cpp b/TAO/tao/Synch_Invocation.cpp
index c2159dc9049..5cc60f9ad17 100644
--- a/TAO/tao/Synch_Invocation.cpp
+++ b/TAO/tao/Synch_Invocation.cpp
@@ -126,18 +126,18 @@ namespace TAO
           {
             if (this->retry_state_ &&
                 this->retry_state_->forward_on_exception_increment(FOE_TRANSIENT))
-                  {
-                    if (TAO_debug_level > 0)
-                      TAOLIB_DEBUG ((LM_INFO,
-                                  ACE_TEXT ("TAO (%P|%t) - Synch_Twoway_Invocation::")
-                                  ACE_TEXT ("remote_twoway retrying on TRANSIENT ")
-                                  ACE_TEXT ("exception\n")));
-                    this->retry_state_->next_profile_retry (*this->stub ());
+              {
+                if (TAO_debug_level > 0)
+                  TAOLIB_DEBUG ((LM_INFO,
+                              ACE_TEXT ("TAO (%P|%t) - Synch_Twoway_Invocation::")
+                              ACE_TEXT ("remote_twoway retrying on TRANSIENT ")
+                              ACE_TEXT ("exception\n")));
+                this->retry_state_->next_profile_retry (*this->stub ());
 #if TAO_HAS_INTERCEPTORS == 1
-                    s = this->receive_other_interception ();
+                s = this->receive_other_interception ();
 #endif /* TAO_HAS_INTERCEPTORS */
-                    return TAO_INVOKE_RESTART;
-                  }
+                return TAO_INVOKE_RESTART;
+              }
             else
               {
                 // Way back, we failed to find a profile we could connect to.
diff --git a/TAO/tests/SHMIOP/SHMIOP_Test.mpc b/TAO/tests/SHMIOP/SHMIOP_Test.mpc
new file mode 100644
index 00000000000..8ccc71387cc
--- /dev/null
+++ b/TAO/tests/SHMIOP/SHMIOP_Test.mpc
@@ -0,0 +1,11 @@
+project: taoidldefaults, taoserver, strategies {
+  exename = shmiop_test
+
+  IDL_Files {
+    Test.idl
+  }
+
+  Source_Files {
+    shmiop_test.cpp
+  }
+}
diff --git a/TAO/tests/SHMIOP/Test.idl b/TAO/tests/SHMIOP/Test.idl
new file mode 100644
index 00000000000..1f8ff5e7970
--- /dev/null
+++ b/TAO/tests/SHMIOP/Test.idl
@@ -0,0 +1,9 @@
+module Test
+{
+  interface Hello
+  {
+    string get_string ();
+
+    oneway void shutdown ();
+  };
+};
diff --git a/TAO/tests/SHMIOP/run_test.pl b/TAO/tests/SHMIOP/run_test.pl
new file mode 100644
index 00000000000..a4b44408ed5
--- /dev/null
+++ b/TAO/tests/SHMIOP/run_test.pl
@@ -0,0 +1,84 @@
+eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
+     & eval 'exec perl -S $0 $argv:q'
+     if 0;
+
+use lib "$ENV{ACE_ROOT}/bin";
+use PerlACE::TestTarget;
+use strict;
+
+my $status = 0;
+my $debug_level = 0;
+my $cdebug_level = 0;
+my $extra;
+foreach my $i (@ARGV) {
+    if ($i eq '-debug') {
+        $debug_level = 10;
+    }
+    elsif ($i eq '-cdebug') {
+	$cdebug_level = 10;
+    }
+    elsif ($i eq 'with_collocated') {
+	$extra = "-s temp.ior";
+    }
+}
+
+my $server = PerlACE::TestTarget::create_target (1) || die "Create target 1 failed\n";
+my $client = PerlACE::TestTarget::create_target (2) || die "Create target 2 failed\n";
+
+my $iorbase = "server.ior";
+my $server_iorfile = $server->LocalFile ($iorbase);
+my $client_iorfile = $client->LocalFile ($iorbase);
+$server->DeleteFile ($iorbase);
+$client->DeleteFile ($iorbase);
+
+my $shm = '-ORBSvcConf static_shmiop.conf -ORBListenEndpoints shmiop://';
+
+my $SV = $server->CreateProcess ("shmiop_test", "-ORBDebugLevel $debug_level $shm -s $server_iorfile");
+my $CL = $client->CreateProcess ("shmiop_test", "-ORBDebugLevel $cdebug_level $shm -c $client_iorfile $extra");
+my $server_status = $SV->Spawn ();
+
+if ($server_status != 0) {
+    print STDERR "ERROR: server returned $server_status\n";
+    exit 1;
+}
+
+if ($server->WaitForFileTimed ($iorbase,
+                               $server->ProcessStartWaitInterval ()) == -1) {
+    print STDERR "ERROR: cannot find file <$server_iorfile>\n";
+    $SV->Kill (); $SV->TimedWait (1);
+    exit 1;
+}
+
+if ($server->GetFile ($iorbase) == -1) {
+    print STDERR "ERROR: cannot retrieve file <$server_iorfile>\n";
+    $SV->Kill (); $SV->TimedWait (1);
+    exit 1;
+}
+if ($client->PutFile ($iorbase) == -1) {
+    print STDERR "ERROR: cannot set file <$client_iorfile>\n";
+    $SV->Kill (); $SV->TimedWait (1);
+    exit 1;
+}
+
+my $client_status = $CL->SpawnWaitKill ($client->ProcessStartWaitInterval ());
+
+if ($client_status != 0) {
+    print STDERR "ERROR: client returned $client_status\n";
+    $status = 1;
+}
+
+$server_status = $SV->WaitKill ($server->ProcessStopWaitInterval ());
+
+if ($server_status != 0) {
+    print STDERR "ERROR: server returned $server_status\n";
+    $status = 1;
+}
+
+$server->DeleteFile ($iorbase);
+$client->DeleteFile ($iorbase);
+
+if ($extra ne '') {
+    unlink 'temp.ior';
+}
+
+exit $status;
diff --git a/TAO/tests/SHMIOP/run_test_collocated.pl b/TAO/tests/SHMIOP/run_test_collocated.pl
new file mode 100644
index 00000000000..2a6f251b73a
--- /dev/null
+++ b/TAO/tests/SHMIOP/run_test_collocated.pl
@@ -0,0 +1,40 @@
+eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
+     & eval 'exec perl -S $0 $argv:q'
+     if 0;
+
+use lib "$ENV{ACE_ROOT}/bin";
+use PerlACE::TestTarget;
+use strict;
+
+my $debug_level = 0;
+foreach my $i (@ARGV) {
+    if ($i eq '-debug') {
+        $debug_level = 10;
+    }
+}
+
+my $target = PerlACE::TestTarget::create_target(1) || die "Create target 1 failed\n";
+
+my $iorbase = "server.ior";
+my $server_iorfile = $target->LocalFile ($iorbase);
+$target->DeleteFile ($iorbase);
+
+my $status = 0;
+
+print "Collocated\n\n";
+
+my $shm = '-ORBSvcConf static_shmiop.conf -ORBListenEndpoints shmiop://';
+
+my $SV = $target->CreateProcess ("shmiop_test", "-ORBDebugLevel $debug_level $shm " .
+				 "-s $server_iorfile -c $server_iorfile");
+
+my $server = $SV->SpawnWaitKill ($target->ProcessStartWaitInterval ());
+
+if ($server != 0) {
+    print STDERR "ERROR: Collocated test returned $server\n";
+    $status = 1;
+}
+
+$target->DeleteFile ($iorbase);
+
+exit $status;
diff --git a/TAO/tests/SHMIOP/shmiop_test.cpp b/TAO/tests/SHMIOP/shmiop_test.cpp
new file mode 100644
index 00000000000..dfbd3699508
--- /dev/null
+++ b/TAO/tests/SHMIOP/shmiop_test.cpp
@@ -0,0 +1,126 @@
+#include "TestS.h"
+
+#include "tao/Strategies/advanced_resource.h"
+
+#include "ace/Get_Opt.h"
+#include "ace/OS_NS_stdio.h"
+#include "ace/SString.h"
+#include "ace/Task.h"
+
+struct Servant : virtual POA_Test::Hello
+{
+  explicit Servant (const CORBA::ORB_var &orb)
+    : orb_ (orb)
+  {}
+
+  char *get_string ()
+  {
+    CORBA::String_var str ("hello");
+    return str._retn ();
+  }
+
+  void shutdown ()
+  {
+    this->orb_->shutdown (0);
+  }
+
+  CORBA::ORB_var orb_;
+};
+
+struct ORBTask : ACE_Task_Base
+{
+  explicit ORBTask (const CORBA::ORB_var &orb)
+    : orb_ (orb)
+  {}
+
+  int svc ()
+  {
+    try
+      {
+        this->orb_->run ();
+        return 0;
+      }
+    catch (const CORBA::Exception &e)
+      {
+        e._tao_print_exception ("Exception caught from ORB::run:");
+      }
+    catch (...)
+      {
+        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR unknown exception caught ")
+                              ACE_TEXT ("from ORB::run\n")));
+      }
+    return 1;
+  }
+
+  CORBA::ORB_var orb_;
+};
+
+int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
+{
+  try
+    {
+      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv);
+
+      ACE_Get_Opt opts (argc, argv, ACE_TEXT ("s:c:"));
+      const ACE_TCHAR *server = 0, *client = 0;
+      for (int o; (o = opts ()) != -1;)
+        {
+          switch (o)
+            {
+            case 's':
+              server = opts.opt_arg ();
+              break;
+            case 'c':
+              client = opts.opt_arg ();
+              break;
+            }
+        }
+
+      Servant srv (orb);
+      ORBTask task (orb);
+
+      if (server)
+        {
+          CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA");
+          PortableServer::POA_var poa = PortableServer::POA::_narrow (obj);
+          PortableServer::POAManager_var pm = poa->the_POAManager ();
+          pm->activate ();
+          Test::Hello_var srv_obj = srv._this ();
+          CORBA::String_var srv_str = orb->object_to_string (srv_obj);
+          FILE *f = ACE_OS::fopen (server, "w");
+          ACE_OS::fputs (srv_str, f);
+          ACE_OS::fclose (f);
+          if (!client)
+            task.activate();
+        }
+
+      if (client)
+        {
+          ACE_CString ior ("file://");
+          ior += ACE_TEXT_ALWAYS_CHAR (client);
+          CORBA::Object_var obj = orb->string_to_object (ior.c_str ());
+          Test::Hello_var hello = Test::Hello::_narrow (obj);
+          CORBA::String_var str = hello->get_string ();
+          ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) - returned <%C>\n"),
+                      str.in ()));
+          hello->shutdown ();
+        }
+      else if (server)
+        {
+          task.wait ();
+        }
+
+      orb->destroy ();
+      return 0;
+    }
+  catch (const CORBA::Exception &e)
+    {
+      e._tao_print_exception ("Exception caught:");
+    }
+  catch (...)
+    {
+      ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR unknown exception ")
+                            ACE_TEXT ("caught in main\n")));
+    }
+  return 1;
+}
diff --git a/TAO/tests/SHMIOP/static_shmiop.conf b/TAO/tests/SHMIOP/static_shmiop.conf
new file mode 100644
index 00000000000..7fac80fcca5
--- /dev/null
+++ b/TAO/tests/SHMIOP/static_shmiop.conf
@@ -0,0 +1 @@
+static Advanced_Resource_Factory "-ORBProtocolFactory SHMIOP_Factory"
-- 
cgit v1.2.1


From 92ca1276fb8fac97f043154b380550a4e4780607 Mon Sep 17 00:00:00 2001
From: Johnny Willemsen <jwillemsen@remedy.nl>
Date: Tue, 6 Mar 2018 18:15:54 +0100
Subject: Minor fixes

    * issue_template.md:
---
 issue_template.md | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/issue_template.md b/issue_template.md
index d535e9d7154..781f4161474 100644
--- a/issue_template.md
+++ b/issue_template.md
@@ -1,30 +1,27 @@
 ### Version
 
-ACE: [your version]
-TAO: [your version]
+The version of ACE and/or TAO you are using
 
 ### Host machine and operating system
 
-If on Windows based OS's, which version of WINSOCK do you use?:
-
 ### Target machine and operating system (if different from host)
 
 ### Compiler name and version (including patch level)
 
-### The $ACE_ROOT/ace/config.h file 
+### The $ACE_ROOT/ace/config.h file
+
+If you use a link to a platform-specific file, simply state which one
 
-If you use a link to a platform-specific file, simply state which one]
-    
 ### The $ACE_ROOT/include/makeinclude/platform_macros.GNU file
 
-if you use a link to a platform-specific file, simply state which one (unless this isn't used in this case, e.g., with Microsoft Visual C++)]:
+if you use a link to a platform-specific file, simply state which one (unless this isn't used in this case, e.g., with Microsoft Visual C++)
 
 ### Contents of $ACE_ROOT/bin/MakeProjectCreator/config/default.features
-    
+
 Used by MPC when you generate your own makefiles
 
 ### AREA/CLASS/EXAMPLE AFFECTED:
- 
+
 What example failed?  What module failed to compile?
 
 ### The problem effects:
@@ -39,9 +36,9 @@ Brief description of the problem
 
 Detailed description of problem.  Don't just say "<blah> doesn't work, here's a fix," explain what your program does to get to the <blah> state.
 
-### Repeast by
+### Repeat by
 
-What you did to get the error; include test program or session transcript if at all possible. 
+What you did to get the error; include test program or session transcript if at all possible.
 
 ### Sample fix/ workaround
 
-- 
cgit v1.2.1


From 643658368ad9c4db6ee41aa22036a8e7c9994708 Mon Sep 17 00:00:00 2001
From: Johnny Willemsen <jwillemsen@remedy.nl>
Date: Tue, 6 Mar 2018 18:43:59 +0100
Subject: Remove old left over version commit message

    * ACE/bin/MakeProjectCreator/config/bmake.features:
---
 ACE/bin/MakeProjectCreator/config/bmake.features | 2 --
 1 file changed, 2 deletions(-)

diff --git a/ACE/bin/MakeProjectCreator/config/bmake.features b/ACE/bin/MakeProjectCreator/config/bmake.features
index f7f24def9d1..fa48614c377 100644
--- a/ACE/bin/MakeProjectCreator/config/bmake.features
+++ b/ACE/bin/MakeProjectCreator/config/bmake.features
@@ -1,5 +1,3 @@
-// bmake.features,v 1.2 2005/08/22 09:35:48 jwillemsen Exp
-
 ssl=0
 qos=1
 cidl=0
-- 
cgit v1.2.1


From 167e776843a3e756e1c879f4129479b15964d320 Mon Sep 17 00:00:00 2001
From: Johnny Willemsen <jwillemsen@remedy.nl>
Date: Tue, 6 Mar 2018 19:09:45 +0100
Subject: Move issue template to .github

---
 .github/issue_template.md | 45 +++++++++++++++++++++++++++++++++++++++++++++
 issue_template.md         | 45 ---------------------------------------------
 2 files changed, 45 insertions(+), 45 deletions(-)
 create mode 100644 .github/issue_template.md
 delete mode 100644 issue_template.md

diff --git a/.github/issue_template.md b/.github/issue_template.md
new file mode 100644
index 00000000000..781f4161474
--- /dev/null
+++ b/.github/issue_template.md
@@ -0,0 +1,45 @@
+### Version
+
+The version of ACE and/or TAO you are using
+
+### Host machine and operating system
+
+### Target machine and operating system (if different from host)
+
+### Compiler name and version (including patch level)
+
+### The $ACE_ROOT/ace/config.h file
+
+If you use a link to a platform-specific file, simply state which one
+
+### The $ACE_ROOT/include/makeinclude/platform_macros.GNU file
+
+if you use a link to a platform-specific file, simply state which one (unless this isn't used in this case, e.g., with Microsoft Visual C++)
+
+### Contents of $ACE_ROOT/bin/MakeProjectCreator/config/default.features
+
+Used by MPC when you generate your own makefiles
+
+### AREA/CLASS/EXAMPLE AFFECTED:
+
+What example failed?  What module failed to compile?
+
+### The problem effects:
+
+Does it affect compilation, linking, or execution. Please indicate whether ACE/TAO, your application, or both are affected.
+
+### Synopsis
+
+Brief description of the problem
+
+### Description
+
+Detailed description of problem.  Don't just say "<blah> doesn't work, here's a fix," explain what your program does to get to the <blah> state.
+
+### Repeat by
+
+What you did to get the error; include test program or session transcript if at all possible.
+
+### Sample fix/ workaround
+
+If available
diff --git a/issue_template.md b/issue_template.md
deleted file mode 100644
index 781f4161474..00000000000
--- a/issue_template.md
+++ /dev/null
@@ -1,45 +0,0 @@
-### Version
-
-The version of ACE and/or TAO you are using
-
-### Host machine and operating system
-
-### Target machine and operating system (if different from host)
-
-### Compiler name and version (including patch level)
-
-### The $ACE_ROOT/ace/config.h file
-
-If you use a link to a platform-specific file, simply state which one
-
-### The $ACE_ROOT/include/makeinclude/platform_macros.GNU file
-
-if you use a link to a platform-specific file, simply state which one (unless this isn't used in this case, e.g., with Microsoft Visual C++)
-
-### Contents of $ACE_ROOT/bin/MakeProjectCreator/config/default.features
-
-Used by MPC when you generate your own makefiles
-
-### AREA/CLASS/EXAMPLE AFFECTED:
-
-What example failed?  What module failed to compile?
-
-### The problem effects:
-
-Does it affect compilation, linking, or execution. Please indicate whether ACE/TAO, your application, or both are affected.
-
-### Synopsis
-
-Brief description of the problem
-
-### Description
-
-Detailed description of problem.  Don't just say "<blah> doesn't work, here's a fix," explain what your program does to get to the <blah> state.
-
-### Repeat by
-
-What you did to get the error; include test program or session transcript if at all possible.
-
-### Sample fix/ workaround
-
-If available
-- 
cgit v1.2.1


From 8ebc1623b063e89a2e3e3b225af7c54dc2c5de2f Mon Sep 17 00:00:00 2001
From: Johnny Willemsen <jwillemsen@remedy.nl>
Date: Fri, 9 Mar 2018 08:52:30 +0100
Subject: Check if __GNUC__ is defined and only log that C++ support is ok when
 the test code has been compiled

    * ACE/tests/Compiler_Features_38_Test.cpp:
---
 ACE/tests/Compiler_Features_38_Test.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ACE/tests/Compiler_Features_38_Test.cpp b/ACE/tests/Compiler_Features_38_Test.cpp
index 83733394013..31a02190573 100644
--- a/ACE/tests/Compiler_Features_38_Test.cpp
+++ b/ACE/tests/Compiler_Features_38_Test.cpp
@@ -6,7 +6,7 @@
 #include "test_config.h"
 
 // g++ 4.1 can't handle this construct
-#if (__GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ <= 1))
+#if defined (__GNUC__) && (__GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ <= 1))
 # define ACE_DISABLE_TEST
 #endif
 
@@ -44,10 +44,10 @@ run_main (int, ACE_TCHAR *[])
   Foo2Seq f2;
   long const j = f2[0].i;
   ACE_UNUSED_ARG(j);
-#endif /* !ACE_DISABLE_TEST */
 
   ACE_DEBUG ((LM_INFO,
               ACE_TEXT ("C++ support ok\n")));
+#endif /* !ACE_DISABLE_TEST */
 
   ACE_END_TEST;
 
-- 
cgit v1.2.1


From 168208dfd6bb859a48a7470730127de8cc22c639 Mon Sep 17 00:00:00 2001
From: Steve Huston <shuston@riverace.com>
Date: Fri, 9 Mar 2018 16:02:04 -0500
Subject: Remove preproc checks - if ACE_HAS_IPV6 is set, the IPV^ defs should
 be there too.

---
 ACE/ace/SOCK_Acceptor.cpp | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/ACE/ace/SOCK_Acceptor.cpp b/ACE/ace/SOCK_Acceptor.cpp
index 12311129ee0..47057df08d3 100644
--- a/ACE/ace/SOCK_Acceptor.cpp
+++ b/ACE/ace/SOCK_Acceptor.cpp
@@ -227,7 +227,7 @@ ACE_SOCK_Acceptor::shared_open (const ACE_Addr &local_sap,
   ACE_TRACE ("ACE_SOCK_Acceptor::shared_open");
   int error = 0;
 
-#if !defined (ACE_HAS_IPV6) || (!defined (IPPROTO_IPV6) || !defined (IPV6_V6ONLY))
+#if !defined (ACE_HAS_IPV6)
   ACE_UNUSED_ARG (ipv6_only);
 #else /* defined (ACE_HAS_IPV6) */
   if (protocol_family == PF_INET6)
@@ -253,7 +253,6 @@ ACE_SOCK_Acceptor::shared_open (const ACE_Addr &local_sap,
        * This must be done before attempting to bind the address.
        * On Windows older than Vista this will fail.
        */
-#  if defined (IPPROTO_IPV6) && defined (IPV6_V6ONLY)
       int setting = !!ipv6_only;
       if (-1 == ACE_OS::setsockopt (this->get_handle (),
                                     IPPROTO_IPV6,
@@ -262,17 +261,16 @@ ACE_SOCK_Acceptor::shared_open (const ACE_Addr &local_sap,
                                     sizeof (setting)))
         error = 1;
       else
-# endif /* IPPROTO_V6 && IPV6_ONLY */
-      // We probably don't need a bind_port written here.
-      // There are currently no supported OS's that define
-      // ACE_LACKS_WILDCARD_BIND.
-      if (ACE_OS::bind (this->get_handle (),
-                        reinterpret_cast<sockaddr *> (&local_inet6_addr),
-                        sizeof local_inet6_addr) == -1)
-        error = 1;
+        // We probably don't need a bind_port written here.
+        // There are currently no supported OS's that define
+        // ACE_LACKS_WILDCARD_BIND.
+        if (ACE_OS::bind (this->get_handle (),
+                          reinterpret_cast<sockaddr *> (&local_inet6_addr),
+                          sizeof local_inet6_addr) == -1)
+          error = 1;
     }
   else
-#endif
+#endif /* ACE_HAS_IPV6 */
   if (protocol_family == PF_INET)
     {
       sockaddr_in local_inet_addr;
-- 
cgit v1.2.1


From 5a4a08e16062d6ecbf0e599fc2bdb26f103e72d3 Mon Sep 17 00:00:00 2001
From: Adam Mitz <mitza@ociweb.com>
Date: Mon, 12 Mar 2018 11:19:23 -0500
Subject: TAO NEWS for shmiop change

---
 TAO/NEWS | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/TAO/NEWS b/TAO/NEWS
index 0ed87bd8d9c..f63639663a2 100644
--- a/TAO/NEWS
+++ b/TAO/NEWS
@@ -3,6 +3,8 @@ USER VISIBLE CHANGES BETWEEN TAO-2.4.6 and TAO-2.4.7
 
 . TAO_IDL parses and discards IDLv4 annotations (applying, not defining)
 
+. Fixed Bug 1220 as it applies to the SHMIOP transport.
+
 USER VISIBLE CHANGES BETWEEN TAO-2.4.5 and TAO-2.4.6
 ====================================================
 
-- 
cgit v1.2.1


From 2ea8eaff34b62be1b38c3291779bae72a3dd3e56 Mon Sep 17 00:00:00 2001
From: Johnny Willemsen <jwillemsen@remedy.nl>
Date: Mon, 12 Mar 2018 18:19:20 +0100
Subject: Sun Studio 5.13 and older can't handle this

    * ACE/tests/Compiler_Features_38_Test.cpp:
---
 ACE/tests/Compiler_Features_38_Test.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/ACE/tests/Compiler_Features_38_Test.cpp b/ACE/tests/Compiler_Features_38_Test.cpp
index 31a02190573..73c40644253 100644
--- a/ACE/tests/Compiler_Features_38_Test.cpp
+++ b/ACE/tests/Compiler_Features_38_Test.cpp
@@ -15,6 +15,11 @@
 # define ACE_DISABLE_TEST
 #endif
 
+// Sun Studio 5.13 and older can't handle this construct
+#if defined (__SUNPRO_CC) && (__SUNPRO_CC <= 0x5130)
+# define ACE_DISABLE_TEST
+#endif
+
 #if !defined (ACE_DISABLE_TEST)
 template <typename T>
 class Foo_T
-- 
cgit v1.2.1


From b1228f4bfd1be92b1590de65fe49c8511c2b71e1 Mon Sep 17 00:00:00 2001
From: Adam Mitz <mitza@ociweb.com>
Date: Tue, 13 Mar 2018 10:58:36 -0500
Subject: TAO test list: mark tests that won't run with CORBA/e compact

---
 TAO/bin/tao_orb_tests.lst | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/TAO/bin/tao_orb_tests.lst b/TAO/bin/tao_orb_tests.lst
index 3d5431de636..6e087048ee9 100644
--- a/TAO/bin/tao_orb_tests.lst
+++ b/TAO/bin/tao_orb_tests.lst
@@ -203,12 +203,12 @@ TAO/tests/Bug_3919_Regression/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MI
 TAO/tests/Bug_3926_Regression/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !DISABLE_INTERCEPTORS
 TAO/tests/Bug_3941_Regression/run_test.pl: !CORBA_E_MICRO
 TAO/tests/Bug_3942_Regression/run_test.pl: !FIXED_BUGS_ONLY
-TAO/tests/Bug_3953_Regression/run_test.pl: !CORBA_E_MICRO
+TAO/tests/Bug_3953_Regression/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO
 TAO/tests/Bug_3954_Regression/run_test.pl:
 TAO/tests/Bug_4010_Regression/run_test.pl:
 TAO/tests/Bug_4059_Regression/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO
 TAO/tests/Bug_4082_Regression/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO
-TAO/tests/Bug_4097_Regression/run_test.pl: !CORBA_E_MICRO
+TAO/tests/Bug_4097_Regression/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRRO
 TAO/tests/DIOP/run_test.pl: !ST !NO_DIOP !ACE_FOR_TAO !CORBA_E_MICRO
 TAO/tests/DIOP/run_test_ipv6.pl: IPV6 !ST !NO_DIOP !ACE_FOR_TAO !CORBA_E_MICRO
 TAO/tests/RTCORBA/Activate_Object_Multiple_ORBs/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ST
@@ -267,9 +267,9 @@ TAO/tests/No_Server_MT_Connect_Test/run_test.pl: !ST !MINIMUM !CORBA_E_COMPACT !
 TAO/tests/Connect_Strategy_Test/run_test.pl:
 # DISABLED TAO/tests/Client_Leaks/run_test.pl: !VxWorks !ST !Tru64
 TAO/tests/Server_Leaks/run_test.pl: !ANDROID
-TAO/tests/SHMIOP/run_test_collocated.pl: !ACE_FOR_TAO
-TAO/tests/SHMIOP/run_test.pl: !ACE_FOR_TAO
-TAO/tests/SHMIOP/run_test.pl with_collocated: !ACE_FOR_TAO
+TAO/tests/SHMIOP/run_test_collocated.pl: !ACE_FOR_TAO !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO
+TAO/tests/SHMIOP/run_test.pl: !ACE_FOR_TAO !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO
+TAO/tests/SHMIOP/run_test.pl with_collocated: !ACE_FOR_TAO !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO
 TAO/tests/Smart_Proxies/Policy/run_test.pl:
 TAO/tests/Smart_Proxies/run_test.pl:
 TAO/tests/Smart_Proxies/dtor/run_test.pl:
-- 
cgit v1.2.1


From 99f855f9f3ab5102ce07424fd2968f8e330462a6 Mon Sep 17 00:00:00 2001
From: Steve Huston <shuston@riverace.com>
Date: Tue, 13 Mar 2018 17:03:33 -0400
Subject: Fix IPv4 case

---
 ACE/ace/SOCK_Dgram.cpp | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/ACE/ace/SOCK_Dgram.cpp b/ACE/ace/SOCK_Dgram.cpp
index 3726fb24398..60f148441f1 100644
--- a/ACE/ace/SOCK_Dgram.cpp
+++ b/ACE/ace/SOCK_Dgram.cpp
@@ -121,22 +121,23 @@ ACE_SOCK_Dgram::shared_open (const ACE_Addr &local,
 {
   ACE_TRACE ("ACE_SOCK_Dgram::shared_open");
   bool error = false;
-#if !defined (ACE_HAS_IPV6) || (!defined (IPPROTO_IPV6) || !defined (IPV6_V6ONLY))
+#if !defined (ACE_HAS_IPV6)
   ACE_UNUSED_ARG (ipv6_only);
-#endif /* !defined (ACE_HAS_IPV6) || (!defined (IPPROTO_IPV6) || !defined (IPV6_V6ONLY)) */
+#endif /* !defined (ACE_HAS_IPV6) */
 
   if (local == ACE_Addr::sap_any)
     {
-#if defined (ACE_HAS_IPV6) && defined (IPPROTO_IPV6) && defined (IPV6_V6ONLY)
+#if defined (ACE_HAS_IPV6)
       int setting = !!ipv6_only;
-      if (-1 == ACE_OS::setsockopt (this->get_handle (),
+      if (protocol_family == PF_INET6 &&
+          -1 == ACE_OS::setsockopt (this->get_handle (),
                                     IPPROTO_IPV6,
                                     IPV6_V6ONLY,
                                     (char *)&setting,
                                     sizeof (setting)))
         error = true;
       else
-#endif /* ACE_HAS_IPV6 && IPPROTO_IPV6 && IPV6_V6ONLY */
+#endif /* ACE_HAS_IPV6 */
 
       if (protocol_family == PF_INET
 #if defined (ACE_HAS_IPV6)
-- 
cgit v1.2.1


From 5ac231f90dacffd9933b63d3340237e035eab41a Mon Sep 17 00:00:00 2001
From: Johnny Willemsen <jwillemsen@remedy.nl>
Date: Fri, 16 Mar 2018 08:05:30 +0100
Subject: ACE+TAO-6_4_7

---
 ACE/ChangeLogs/ACE-6_4_7                           | 427 +++++++++++++++++++++
 ACE/PROBLEM-REPORT-FORM                            |   2 +-
 ACE/VERSION                                        |   2 +-
 ACE/ace/Version.h                                  |   8 +-
 ACE/debian/ace.dsc                                 |   6 +-
 ACE/debian/debian.control                          |  62 +--
 ACE/debian/libace-6.4.6.docs                       |   8 -
 ACE/debian/libace-6.4.6.install                    |   6 -
 ACE/debian/libace-6.4.6.lintian-overrides          |   6 -
 ACE/debian/libace-6.4.7.docs                       |   8 +
 ACE/debian/libace-6.4.7.install                    |   6 +
 ACE/debian/libace-6.4.7.lintian-overrides          |   6 +
 ACE/debian/libace-flreactor-6.4.6.install          |   1 -
 .../libace-flreactor-6.4.6.lintian-overrides       |   1 -
 ACE/debian/libace-flreactor-6.4.7.install          |   1 +
 .../libace-flreactor-6.4.7.lintian-overrides       |   1 +
 ACE/debian/libace-foxreactor-6.4.6.install         |   1 -
 .../libace-foxreactor-6.4.6.lintian-overrides      |   1 -
 ACE/debian/libace-foxreactor-6.4.7.install         |   1 +
 .../libace-foxreactor-6.4.7.lintian-overrides      |   1 +
 ACE/debian/libace-htbp-6.4.6.install               |   1 -
 ACE/debian/libace-htbp-6.4.6.lintian-overrides     |   1 -
 ACE/debian/libace-htbp-6.4.7.install               |   1 +
 ACE/debian/libace-htbp-6.4.7.lintian-overrides     |   1 +
 ACE/debian/libace-inet-6.4.6.install               |   1 -
 ACE/debian/libace-inet-6.4.6.lintian-overrides     |   2 -
 ACE/debian/libace-inet-6.4.7.install               |   1 +
 ACE/debian/libace-inet-6.4.7.lintian-overrides     |   2 +
 ACE/debian/libace-inet-ssl-6.4.6.install           |   1 -
 ACE/debian/libace-inet-ssl-6.4.6.lintian-overrides |   4 -
 ACE/debian/libace-inet-ssl-6.4.7.install           |   1 +
 ACE/debian/libace-inet-ssl-6.4.7.lintian-overrides |   4 +
 ACE/debian/libace-qtreactor-6.4.6.install          |   1 -
 .../libace-qtreactor-6.4.6.lintian-overrides       |   1 -
 ACE/debian/libace-qtreactor-6.4.7.install          |   1 +
 .../libace-qtreactor-6.4.7.lintian-overrides       |   1 +
 ACE/debian/libace-rmcast-6.4.6.install             |   1 -
 ACE/debian/libace-rmcast-6.4.6.lintian-overrides   |   1 -
 ACE/debian/libace-rmcast-6.4.7.install             |   1 +
 ACE/debian/libace-rmcast-6.4.7.lintian-overrides   |   1 +
 ACE/debian/libace-ssl-6.4.6.NEWS                   |  11 -
 ACE/debian/libace-ssl-6.4.6.install                |   1 -
 ACE/debian/libace-ssl-6.4.6.lintian-overrides      |   5 -
 ACE/debian/libace-ssl-6.4.7.NEWS                   |  11 +
 ACE/debian/libace-ssl-6.4.7.install                |   1 +
 ACE/debian/libace-ssl-6.4.7.lintian-overrides      |   5 +
 ACE/debian/libace-tkreactor-6.4.6.install          |   1 -
 .../libace-tkreactor-6.4.6.lintian-overrides       |   1 -
 ACE/debian/libace-tkreactor-6.4.7.install          |   1 +
 .../libace-tkreactor-6.4.7.lintian-overrides       |   1 +
 ACE/debian/libace-tmcast-6.4.6.install             |   1 -
 ACE/debian/libace-tmcast-6.4.6.lintian-overrides   |   1 -
 ACE/debian/libace-tmcast-6.4.7.install             |   1 +
 ACE/debian/libace-tmcast-6.4.7.lintian-overrides   |   1 +
 ACE/debian/libace-xml-utils-6.4.6.install          |   1 -
 .../libace-xml-utils-6.4.6.lintian-overrides       |   1 -
 ACE/debian/libace-xml-utils-6.4.7.install          |   1 +
 .../libace-xml-utils-6.4.7.lintian-overrides       |   1 +
 ACE/debian/libace-xtreactor-6.4.6.install          |   1 -
 .../libace-xtreactor-6.4.6.lintian-overrides       |   1 -
 ACE/debian/libace-xtreactor-6.4.7.install          |   1 +
 .../libace-xtreactor-6.4.7.lintian-overrides       |   1 +
 ACE/debian/libacexml-6.4.6.docs                    |   1 -
 ACE/debian/libacexml-6.4.6.install                 |   3 -
 ACE/debian/libacexml-6.4.6.lintian-overrides       |   3 -
 ACE/debian/libacexml-6.4.7.docs                    |   1 +
 ACE/debian/libacexml-6.4.7.install                 |   3 +
 ACE/debian/libacexml-6.4.7.lintian-overrides       |   3 +
 ACE/debian/libkokyu-6.4.6.docs                     |   1 -
 ACE/debian/libkokyu-6.4.6.install                  |   1 -
 ACE/debian/libkokyu-6.4.6.lintian-overrides        |   1 -
 ACE/debian/libkokyu-6.4.7.docs                     |   1 +
 ACE/debian/libkokyu-6.4.7.install                  |   1 +
 ACE/debian/libkokyu-6.4.7.lintian-overrides        |   1 +
 ACE/debian/libnetsvcs-6.4.6.docs                   |   2 -
 ACE/debian/libnetsvcs-6.4.6.install                |   1 -
 ACE/debian/libnetsvcs-6.4.6.lintian-overrides      |   1 -
 ACE/debian/libnetsvcs-6.4.7.docs                   |   2 +
 ACE/debian/libnetsvcs-6.4.7.install                |   1 +
 ACE/debian/libnetsvcs-6.4.7.lintian-overrides      |   1 +
 ACE/rpmbuild/ace-tao.spec                          |   4 +-
 TAO/ChangeLogs/TAO-2_4_7                           | 283 ++++++++++++++
 TAO/PROBLEM-REPORT-FORM                            |   4 +-
 TAO/VERSION                                        |   2 +-
 TAO/tao/Version.h                                  |   8 +-
 85 files changed, 836 insertions(+), 126 deletions(-)
 create mode 100644 ACE/ChangeLogs/ACE-6_4_7
 delete mode 100644 ACE/debian/libace-6.4.6.docs
 delete mode 100644 ACE/debian/libace-6.4.6.install
 delete mode 100644 ACE/debian/libace-6.4.6.lintian-overrides
 create mode 100644 ACE/debian/libace-6.4.7.docs
 create mode 100644 ACE/debian/libace-6.4.7.install
 create mode 100644 ACE/debian/libace-6.4.7.lintian-overrides
 delete mode 100644 ACE/debian/libace-flreactor-6.4.6.install
 delete mode 100644 ACE/debian/libace-flreactor-6.4.6.lintian-overrides
 create mode 100644 ACE/debian/libace-flreactor-6.4.7.install
 create mode 100644 ACE/debian/libace-flreactor-6.4.7.lintian-overrides
 delete mode 100644 ACE/debian/libace-foxreactor-6.4.6.install
 delete mode 100644 ACE/debian/libace-foxreactor-6.4.6.lintian-overrides
 create mode 100644 ACE/debian/libace-foxreactor-6.4.7.install
 create mode 100644 ACE/debian/libace-foxreactor-6.4.7.lintian-overrides
 delete mode 100644 ACE/debian/libace-htbp-6.4.6.install
 delete mode 100644 ACE/debian/libace-htbp-6.4.6.lintian-overrides
 create mode 100644 ACE/debian/libace-htbp-6.4.7.install
 create mode 100644 ACE/debian/libace-htbp-6.4.7.lintian-overrides
 delete mode 100644 ACE/debian/libace-inet-6.4.6.install
 delete mode 100644 ACE/debian/libace-inet-6.4.6.lintian-overrides
 create mode 100644 ACE/debian/libace-inet-6.4.7.install
 create mode 100644 ACE/debian/libace-inet-6.4.7.lintian-overrides
 delete mode 100644 ACE/debian/libace-inet-ssl-6.4.6.install
 delete mode 100644 ACE/debian/libace-inet-ssl-6.4.6.lintian-overrides
 create mode 100644 ACE/debian/libace-inet-ssl-6.4.7.install
 create mode 100644 ACE/debian/libace-inet-ssl-6.4.7.lintian-overrides
 delete mode 100644 ACE/debian/libace-qtreactor-6.4.6.install
 delete mode 100644 ACE/debian/libace-qtreactor-6.4.6.lintian-overrides
 create mode 100644 ACE/debian/libace-qtreactor-6.4.7.install
 create mode 100644 ACE/debian/libace-qtreactor-6.4.7.lintian-overrides
 delete mode 100644 ACE/debian/libace-rmcast-6.4.6.install
 delete mode 100644 ACE/debian/libace-rmcast-6.4.6.lintian-overrides
 create mode 100644 ACE/debian/libace-rmcast-6.4.7.install
 create mode 100644 ACE/debian/libace-rmcast-6.4.7.lintian-overrides
 delete mode 100644 ACE/debian/libace-ssl-6.4.6.NEWS
 delete mode 100644 ACE/debian/libace-ssl-6.4.6.install
 delete mode 100644 ACE/debian/libace-ssl-6.4.6.lintian-overrides
 create mode 100644 ACE/debian/libace-ssl-6.4.7.NEWS
 create mode 100644 ACE/debian/libace-ssl-6.4.7.install
 create mode 100644 ACE/debian/libace-ssl-6.4.7.lintian-overrides
 delete mode 100644 ACE/debian/libace-tkreactor-6.4.6.install
 delete mode 100644 ACE/debian/libace-tkreactor-6.4.6.lintian-overrides
 create mode 100644 ACE/debian/libace-tkreactor-6.4.7.install
 create mode 100644 ACE/debian/libace-tkreactor-6.4.7.lintian-overrides
 delete mode 100644 ACE/debian/libace-tmcast-6.4.6.install
 delete mode 100644 ACE/debian/libace-tmcast-6.4.6.lintian-overrides
 create mode 100644 ACE/debian/libace-tmcast-6.4.7.install
 create mode 100644 ACE/debian/libace-tmcast-6.4.7.lintian-overrides
 delete mode 100644 ACE/debian/libace-xml-utils-6.4.6.install
 delete mode 100644 ACE/debian/libace-xml-utils-6.4.6.lintian-overrides
 create mode 100644 ACE/debian/libace-xml-utils-6.4.7.install
 create mode 100644 ACE/debian/libace-xml-utils-6.4.7.lintian-overrides
 delete mode 100644 ACE/debian/libace-xtreactor-6.4.6.install
 delete mode 100644 ACE/debian/libace-xtreactor-6.4.6.lintian-overrides
 create mode 100644 ACE/debian/libace-xtreactor-6.4.7.install
 create mode 100644 ACE/debian/libace-xtreactor-6.4.7.lintian-overrides
 delete mode 100644 ACE/debian/libacexml-6.4.6.docs
 delete mode 100644 ACE/debian/libacexml-6.4.6.install
 delete mode 100644 ACE/debian/libacexml-6.4.6.lintian-overrides
 create mode 100644 ACE/debian/libacexml-6.4.7.docs
 create mode 100644 ACE/debian/libacexml-6.4.7.install
 create mode 100644 ACE/debian/libacexml-6.4.7.lintian-overrides
 delete mode 100644 ACE/debian/libkokyu-6.4.6.docs
 delete mode 100644 ACE/debian/libkokyu-6.4.6.install
 delete mode 100644 ACE/debian/libkokyu-6.4.6.lintian-overrides
 create mode 100644 ACE/debian/libkokyu-6.4.7.docs
 create mode 100644 ACE/debian/libkokyu-6.4.7.install
 create mode 100644 ACE/debian/libkokyu-6.4.7.lintian-overrides
 delete mode 100644 ACE/debian/libnetsvcs-6.4.6.docs
 delete mode 100644 ACE/debian/libnetsvcs-6.4.6.install
 delete mode 100644 ACE/debian/libnetsvcs-6.4.6.lintian-overrides
 create mode 100644 ACE/debian/libnetsvcs-6.4.7.docs
 create mode 100644 ACE/debian/libnetsvcs-6.4.7.install
 create mode 100644 ACE/debian/libnetsvcs-6.4.7.lintian-overrides
 create mode 100644 TAO/ChangeLogs/TAO-2_4_7

diff --git a/ACE/ChangeLogs/ACE-6_4_7 b/ACE/ChangeLogs/ACE-6_4_7
new file mode 100644
index 00000000000..3a24d62fe21
--- /dev/null
+++ b/ACE/ChangeLogs/ACE-6_4_7
@@ -0,0 +1,427 @@
+commit 99f855f9f3ab5102ce07424fd2968f8e330462a6
+Author: Steve Huston <shuston@riverace.com>
+Date:   Tue Mar 13 17:03:33 2018 -0400
+
+    Fix IPv4 case
+
+commit ba891f62e7f7d1d5255cbff26bf31f19d299a028
+Merge: 5a4a08e1606 2ea8eaff34b
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Mon Mar 12 21:26:07 2018 +0100
+
+    Merge pull request #593 from jwillemsen/jwi-comp38
+    
+    Sun Studio 5.13 and older can't handle this
+
+commit 2ea8eaff34b62be1b38c3291779bae72a3dd3e56
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Mon Mar 12 18:19:20 2018 +0100
+
+    Sun Studio 5.13 and older can't handle this
+    
+        * ACE/tests/Compiler_Features_38_Test.cpp:
+
+commit 4cbfbc87e403652de1493685778392309524a095
+Merge: 1879d43292c 168208dfd6b
+Author: Steve Huston <shuston@riverace.com>
+Date:   Fri Mar 9 17:16:58 2018 -0500
+
+    Merge pull request #592 from DOCGroup/fix-ipv6only-handling
+    
+    Remove preproc checks - if ACE_HAS_IPV6 is set, the IPV6 defs should be there too.
+
+commit 168208dfd6bb859a48a7470730127de8cc22c639
+Author: Steve Huston <shuston@riverace.com>
+Date:   Fri Mar 9 16:02:04 2018 -0500
+
+    Remove preproc checks - if ACE_HAS_IPV6 is set, the IPV^ defs should be there too.
+
+commit 8ebc1623b063e89a2e3e3b225af7c54dc2c5de2f
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Fri Mar 9 08:52:30 2018 +0100
+
+    Check if __GNUC__ is defined and only log that C++ support is ok when the test code has been compiled
+    
+        * ACE/tests/Compiler_Features_38_Test.cpp:
+
+commit 4cfd0f26bde05974b3c4152463f92eb91f8ff6ad
+Merge: 2018a59b318 643658368ad
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Tue Mar 6 18:52:35 2018 +0100
+
+    Merge pull request #589 from jwillemsen/jwi-oldidtag
+    
+    Remove old left over version commit message
+
+commit 643658368ad9c4db6ee41aa22036a8e7c9994708
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Tue Mar 6 18:43:59 2018 +0100
+
+    Remove old left over version commit message
+    
+        * ACE/bin/MakeProjectCreator/config/bmake.features:
+
+commit 4fa7cca17c3ff0c07f4c1b7b1bda71b6e131092b
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Tue Mar 6 11:41:04 2018 +0100
+
+    Any bcc32 version doesn't support inlined assembly
+    
+        * ACE/ace/config-win32-borland.h:
+
+commit 45df27f3869f66d895964f18a582136bb44333af
+Author: shuai.lou <shuai.lou@greatopensource.com>
+Date:   Fri Mar 2 22:34:46 2018 +0800
+
+    Bugfix: ACE abort when use %l and the msg len exceed ACE_MAXLOGMSGLEN
+
+commit 8e034deb5cee9701aa396f10cfc16c01be0acd08
+Author: Steve Huston <shuston@riverace.com>
+Date:   Thu Mar 1 09:16:13 2018 -0500
+
+    Remove $Id$ to resolve fuzz error
+
+commit 1fee8620f369c4699a3ab44144a9d19a1e510303
+Merge: 296d82b7a2f 71a517bfb38
+Author: Steve Huston <shuston@riverace.com>
+Date:   Wed Feb 28 19:02:06 2018 -0500
+
+    Merge out from master
+
+commit 296d82b7a2fcff3d9cc704039a25fb0189669c17
+Author: Steve Huston <shuston@riverace.com>
+Date:   Wed Feb 28 18:54:05 2018 -0500
+
+    Add UDP changes and test program
+
+commit 222b5db197187810b1fd1b54aad9fc8dc0ffd774
+Author: Steve Huston <shuston@riverace.com>
+Date:   Wed Feb 28 18:30:19 2018 -0500
+
+    Added description of changes
+
+commit d4c520ce4cf5fc14aa296936e6c80cccbc12757e
+Author: Adam Mitz <mitza@ociweb.com>
+Date:   Mon Feb 26 11:24:58 2018 -0600
+
+    NEWS for upcoming release
+
+commit 386d660e8d4f805190f0afcc68e3b3a8b0827da7
+Merge: 7675cb72f6b 63265355d6c
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Mon Feb 26 09:59:19 2018 +0100
+
+    Merge pull request #580 from jwillemsen/jwi-wfmo-versioned
+    
+    List major changes
+
+commit 63265355d6c8d9677f048ee0dd628a82608b904e
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Mon Feb 26 09:58:37 2018 +0100
+
+    List major changes
+    
+        * ACE/NEWS:
+
+commit 7675cb72f6b415ae19a278ac6364089eb57b4fff
+Merge: 61beb04ce03 7ff4828b1d6
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Sun Feb 25 10:20:43 2018 +0100
+
+    Merge pull request #579 from DOCGroup/jwillemsen-patch-2
+    
+    Fixed mingw error
+
+commit 7ff4828b1d6fd976240a3aa15401f8a907f8119e
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Sun Feb 25 08:40:13 2018 +0100
+
+    Fixed mingw error
+
+commit fee85964688d1ac7da3cb792906d857440f6c072
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Sun Feb 25 08:17:33 2018 +0100
+
+    Fixed error
+
+commit 250aef2e14bc22a9faffefb1999bc71646105d1c
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Sat Feb 24 15:12:38 2018 +0100
+
+    Fixed errors with versioned namespace builds
+    
+        * ACE/examples/Reactor/WFMO_Reactor/Exceptions.cpp:
+        * ACE/examples/Reactor/WFMO_Reactor/Suspended_Removals.cpp:
+
+commit b3a525bcc9a7e575b8e17e0abb9dd7d8f39cb5a7
+Merge: cb29bd46571 e46f45e6a00
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Sat Feb 17 22:32:19 2018 +0100
+
+    Merge pull request #574 from jwillemsen/jwi-taoidlleak
+    
+    msvc7.1 and gcc 4.1.1 can't handle this test so disable this test for…
+
+commit e46f45e6a00228722f3694152fcb02e79a9c1bc9
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Sat Feb 17 20:05:27 2018 +0100
+
+    msvc7.1 and gcc 4.1.1 can't handle this test so disable this test for those compilers
+
+commit cb29bd46571e428d1d71c860ec9010d29a3a1fe4
+Merge: 4665969af11 d14029823bf
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Fri Feb 16 16:05:33 2018 +0100
+
+    Merge pull request #573 from jwillemsen/jwi-taoidlleak
+    
+    Add new C++ compiler test for testing a feature TAO is using
+
+commit d14029823bf4be658affed6c0a413b45534e5cfe
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Fri Feb 16 12:39:02 2018 +0100
+
+    Initialise member to solve Codacy warning
+    
+        * ACE/tests/Compiler_Features_38_Test.cpp:
+
+commit 785cca646211feed9c238cf8d219687b85552546
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Fri Feb 16 12:09:57 2018 +0100
+
+    Add constructor to make codacy happy
+    
+        * ACE/tests/Compiler_Features_38_Test.cpp:
+
+commit 56cba7ad62f51463ddaf89894db16cabc2193b9c
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Fri Feb 16 11:36:35 2018 +0100
+
+    Add new compiler test for a C++ feature TAO is using
+    
+        * ACE/tests/Compiler_Features_38_Test.cpp:
+          Added.
+    
+        * ACE/tests/run_test.lst:
+        * ACE/tests/tests.mpc:
+
+commit eb04d4bc9c163aed6f509d2c9888c65b3f1f622f
+Author: Steve Huston <shuston@riverace.com>
+Date:   Mon Jan 29 19:34:50 2018 -0500
+
+    Fix typos, compile errors
+
+commit a13ddfc5371ca69a38c7d66906bd357a8ca87830
+Merge: c5d68d4ed60 220e906922b
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Sat Jan 27 14:17:58 2018 +0100
+
+    Merge pull request #569 from jwillemsen/master
+    
+    Performance improvements
+
+commit 220e906922bcfd91013611a19923094f5c95f96b
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Sat Jan 27 11:11:06 2018 +0100
+
+    Fixed compile error
+    
+        * ACE/ace/XML_Utils/XMLSchema/id_map.hpp:
+
+commit 6bd80e559a75a00ca328997d7e54acc6d6030c79
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Sat Jan 27 11:08:01 2018 +0100
+
+    Pass strings as const&
+    
+        * ACE/ace/XML_Utils/XMLSchema/id_map.hpp:
+
+commit d5ba9d4e65ade6cc83a76c5cc47eab41ed3ad941
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Sat Jan 27 10:26:34 2018 +0100
+
+    Check trailing whitespaces also for .py files
+    
+        * ACE/bin/fuzz.pl:
+
+commit c5d68d4ed60d031445356d670fa293d78f04c505
+Merge: 6639d53a99c fb5c132cda3
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Fri Jan 26 18:57:16 2018 +0100
+
+    Merge pull request #568 from jwillemsen/master
+    
+    Update XML_Utils file with the latest from xsc
+
+commit fb5c132cda315cf72f7ba0873c2f06b60ca8b952
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Fri Jan 26 16:18:10 2018 +0100
+
+    Mark constructor explicit
+    
+        * ACE/ace/XML_Utils/XMLSchema/id_map.hpp:
+
+commit d32216e0244b969acfffa4776073637519ceaa02
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Fri Jan 26 15:53:25 2018 +0100
+
+    Pull in latest version from XSC which adds a new operation and provides some more information when an error occurs
+    
+        * ACE/ace/XML_Utils/XMLSchema/id_map.hpp:
+
+commit 1a055d24a37d709ff78364ccf0b84fae594107e6
+Author: Steve Huston <shuston@riverace.com>
+Date:   Mon Jan 22 18:55:00 2018 -0500
+
+    Add Howard's changes to allow ipv6-only on SOCK_Acceptor
+
+commit 29a39ca0376d04d1675b1642d9a06d509bca49d2
+Merge: 98ccf5cd1c7 6f09295375e
+Author: Adam Mitz <mitza@objectcomputing.com>
+Date:   Fri Jan 19 08:59:51 2018 -0600
+
+    Merge pull request #566 from iguessthislldo/master
+    
+    MPC global.features wireshark2 renamed to wireshark_cmake
+
+commit 9da59f9347aca3bd71a291b0a4b0b24666a82004
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Fri Jan 19 11:04:26 2018 +0100
+
+    Removed old left over cvs id tag
+
+commit 6f09295375e7dbe65ad6087c4be02c93dd84d2ac
+Author: Frederick Hornsey <fred@hornsey.us>
+Date:   Wed Jan 17 18:22:19 2018 -0600
+
+    MPC global.features wireshark2 renamed to wireshark_cmake
+
+commit 41018b2be93ea1f5ef30d74ca9a0b9233e86630a
+Author: Adam Mitz <mitza@ociweb.com>
+Date:   Sat Jan 13 12:10:40 2018 -0600
+
+    Compiler Features 32 Test: need to check Apple clang version numbers which use a different scheme than real clang version numbers
+
+commit 26a9a5469899f66eb5816d9d585b296cf49df28a
+Author: Adam Mitz <mitza@ociweb.com>
+Date:   Fri Jan 12 15:23:17 2018 -0600
+
+    Compiler Features 24 Test: skip older clang versions
+
+commit 7d0117c30506099a968a0dc0d9229330217ec9ed
+Merge: b0ef5cf1876 484dcbf6f2e
+Author: Adam Mitz <mitza@objectcomputing.com>
+Date:   Thu Jan 11 13:54:45 2018 -0600
+
+    Merge pull request #557 from iguessthislldo/master
+    
+    Match MPC for Wireshark 2 Support
+
+commit e5d6c55227f9ee795d2e8ff8473296848a7e0190
+Author: Adam Mitz <mitza@ociweb.com>
+Date:   Thu Jan 11 13:54:08 2018 -0600
+
+    check clang version number for compiler test workaround
+
+commit 90adcc25acb454ce3de98443fb76e9a6d52de871
+Author: Adam Mitz <mitza@ociweb.com>
+Date:   Thu Jan 11 12:13:06 2018 -0600
+
+    clang workarounds for Compiler_Features_32_Test
+
+commit db6ca5ccdcb52899ce9571ff24897d50529de13b
+Author: Adam Mitz <mitza@ociweb.com>
+Date:   Thu Jan 11 11:10:39 2018 -0600
+
+    clang: set ACE_HAS_CPP11 based on predefined macros
+
+commit 484dcbf6f2e089757a1fe38cd3638da1482f03df
+Author: Fred Hornsey <fred@hornsey.us>
+Date:   Fri Jan 5 13:16:29 2018 -0600
+
+    Match MPC for Wireshark 2 Support
+    
+    Added wireshark_any and wireshark2 to global.features for Wireshark2 Support  Windows to match the global.features file in MPC.
+
+commit 6fbf5788f0589ae7cde5448baeda0d6e9b1bfc79
+Merge: ac9ffb65e75 4ac686684c6
+Author: Adam Mitz <mitza@objectcomputing.com>
+Date:   Tue Jan 2 09:36:50 2018 -0600
+
+    Merge pull request #555 from mitza-oci/singleton-restart
+    
+    ACE_Singleton should work after ACE::fini, ACE::init (fixes issue #554)
+
+commit ac9ffb65e75c37283e3d238ba7ec86ffb35fd147
+Merge: 8e4d9ab2ae8 dff4439b183
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Tue Jan 2 12:26:30 2018 +0100
+
+    Merge pull request #556 from jwillemsen/master
+    
+    Updated copyright to 2018
+
+commit dff4439b18379b9008ee696303be492d84d794dd
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Mon Jan 1 11:24:13 2018 +0100
+
+    Updated copyright to 2018
+    
+        * ACE/tests/ACE.bsp:
+          Deleted, not used anymore
+    
+        * ACE/COPYING:
+        * TAO/COPYING:
+
+commit 4ac686684c6dff57c295fd5c28f929613be5aefa
+Author: Adam Mitz <mitza@ociweb.com>
+Date:   Thu Dec 21 10:20:15 2017 -0600
+
+    updated test list now that test should pass
+
+commit 5bbbaacd283951886642a5113300f0c0543e51c0
+Author: Adam Mitz <mitza@ociweb.com>
+Date:   Thu Dec 21 10:18:10 2017 -0600
+
+    fixed issue #554 ACE_Singleton use after ACE::fini, ACE::init
+
+commit a68721afec17c9ac51077591bf12159645ef0756
+Author: Adam Mitz <mitza@ociweb.com>
+Date:   Thu Dec 21 10:10:52 2017 -0600
+
+    Updated MPC project for new ACE test
+
+commit 7233cf588e327e1c9ff4121ece63b8c0a63878d8
+Author: Adam Mitz <mitza@ociweb.com>
+Date:   Tue Dec 19 17:36:03 2017 -0600
+
+    New ACE test: check if ACE_Singleton works after ACE::fini, ACE::init
+    
+    Some lock types work, others don't, due to different logic per lock type
+    in ACE_Object_Manager::get_singleton_lock and how ACE_Singleton uses it.
+
+commit f0067177b0a0aa227b503f9b20cfd623143372cf
+Author: Adam Mitz <mitza@ociweb.com>
+Date:   Tue Dec 12 12:09:46 2017 -0600
+
+    Added support for FreeBSD 11
+
+commit 98c5adf44b718a26304d89619f993dc5725b0790
+Author: Adam Mitz <mitza@ociweb.com>
+Date:   Mon Dec 11 17:14:28 2017 -0600
+
+    Added support for cross compiling using MinGW on a Linux host.
+
+commit 52618c6f2a83446eb15ecd95e98e9d178a013d47
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Fri Dec 8 09:38:58 2017 +0100
+
+    Make ACE 6.4.6 and TAO 2.4.6 public
+    
+        * ACE/NEWS:
+        * ACE/bin/diff-builds-and-group-fixed-tests-only.sh:
+        * ACE/debian/debian.control:
+        * ACE/docs/Download.html:
+        * ACE/docs/bczar/bczar.html:
+        * ACE/etc/index.html:
+        * TAO/NEWS:
diff --git a/ACE/PROBLEM-REPORT-FORM b/ACE/PROBLEM-REPORT-FORM
index 8ea942bbbca..cfcd00dc322 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.4.6
+    ACE VERSION: 6.4.7
 
     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 5c6ece94edd..3e2aa8f1ac4 100644
--- a/ACE/VERSION
+++ b/ACE/VERSION
@@ -1,4 +1,4 @@
-This is ACE version 6.4.6, released Fri Dec 08 08:48:59 CET 2017
+This is ACE version 6.4.7, released Fri Mar 16 08:05:28 CET 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 53e1c908024..25bd543d50e 100644
--- a/ACE/ace/Version.h
+++ b/ACE/ace/Version.h
@@ -4,9 +4,9 @@
 
 #define ACE_MAJOR_VERSION 6
 #define ACE_MINOR_VERSION 4
-#define ACE_MICRO_VERSION 6
-#define ACE_BETA_VERSION 6
-#define ACE_VERSION "6.4.6"
-#define ACE_VERSION_CODE 394246
+#define ACE_MICRO_VERSION 7
+#define ACE_BETA_VERSION 7
+#define ACE_VERSION "6.4.7"
+#define ACE_VERSION_CODE 394247
 #define ACE_MAKE_VERSION_CODE(a,b,c) (((a) << 16) + ((b) << 8) + (c))
 
diff --git a/ACE/debian/ace.dsc b/ACE/debian/ace.dsc
index 80f711c00d0..5e386aaf397 100644
--- a/ACE/debian/ace.dsc
+++ b/ACE/debian/ace.dsc
@@ -1,10 +1,10 @@
 Format: 1.0
-Source: ACE+src-6.4.6
-Version: 2.4.6
+Source: ACE+src-6.4.7
+Version: 2.4.7
 Binary: ace
 Maintainer: Johnny Willemsen  <jwillemsen@remedy.nl>
 Architecture: any
 Build-Depends: gcc, make, g++, debhelper (>= 5), dpkg-dev, libssl-dev (>= 0.9.7d), dpatch (>= 2.0.10), libxt-dev (>= 4.3.0), libfltk1.1-dev (>= 1.1.4), libqt4-dev (>= 4.4~rc1-4), tk-dev, docbook-to-man, autoconf, automake, libtool, autotools-dev, doxygen, graphviz, libfox-1.6-dev
 Files:
- 65b34001c9605f056713a7e146b052d1 46346654 ACE-src-6.4.6.tar.gz
+ 65b34001c9605f056713a7e146b052d1 46346654 ACE-src-6.4.7.tar.gz
 
diff --git a/ACE/debian/debian.control b/ACE/debian/debian.control
index 5eb1bd3bae4..20c2ed49c96 100644
--- a/ACE/debian/debian.control
+++ b/ACE/debian/debian.control
@@ -27,7 +27,7 @@ Description: makefile, project, and workspace creator
   * mpc-ace: generates project files for a single target
   * mwc-ace: generates workspace files for a set of projects
 
-Package: libace-6.4.6
+Package: libace-6.4.7
 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.4.6 (= ${binary:Version}), ${misc:Depends}
+Depends: libace-6.4.7 (= ${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.4.6
+Package: libace-ssl-6.4.7
 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.4.6 (= ${binary:Version}), libace-dev (= ${binary:Version}), libssl-dev, ${misc:Depends}
+Depends: libace-ssl-6.4.7 (= ${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.4.6
+Package: libace-rmcast-6.4.7
 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.4.6 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libace-rmcast-6.4.7 (= ${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.4.6
+Package: libace-tmcast-6.4.7
 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.4.6 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libace-tmcast-6.4.7 (= ${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.4.6
+Package: libace-htbp-6.4.7
 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.4.6 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libace-htbp-6.4.7 (= ${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.4.6
+Package: libace-inet-6.4.7
 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.4.6 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libace-inet-6.4.7 (= ${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.4.6
+Package: libace-inet-ssl-6.4.7
 Architecture: any
 Section: libs
-Depends: libace-inet-6.4.6, libace-ssl-6.4.6, ${shlibs:Depends}, ${misc:Depends}
+Depends: libace-inet-6.4.6, libace-ssl-6.4.7, ${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.4.6 (= ${binary:Version}), libace-inet-dev (= ${binary:Version}), libace-ssl-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libace-inet-ssl-6.4.7 (= ${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.4.6
+Package: libacexml-6.4.7
 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.4.6 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libacexml-6.4.7 (= ${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.4.6
+Package: libace-xml-utils-6.4.7
 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.4.6 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}, libxerces-c-dev
+Depends: libace-xml-utils-6.4.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.4.6
+Package: libkokyu-6.4.7
 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.4.6 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libkokyu-6.4.7 (= ${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.4.6
+Package: libace-xtreactor-6.4.7
 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.4.6 (= ${binary:Version}), libace-dev (= ${binary:Version}), libxt-dev (>= 6.4.6), ${misc:Depends}
+Depends: libace-xtreactor-6.4.6 (= ${binary:Version}), libace-dev (= ${binary:Version}), libxt-dev (>= 6.4.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.
 
-Package: libace-tkreactor-6.4.6
+Package: libace-tkreactor-6.4.7
 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.4.6 (= ${binary:Version}), libace-dev (= ${binary:Version}), tk-dev (>= 8.5), ${misc:Depends}
+Depends: libace-tkreactor-6.4.7 (= ${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.4.6
+Package: libace-flreactor-6.4.7
 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.4.6 (= ${binary:Version}), libace-dev (= ${binary:Version}), libfltk1.1-dev (>= 6.4.6), ${misc:Depends}
+Depends: libace-flreactor-6.4.6 (= ${binary:Version}), libace-dev (= ${binary:Version}), libfltk1.1-dev (>= 6.4.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.4.6
+Package: libace-foxreactor-6.4.7
 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.4.6 (= ${binary:Version}), libace-dev (= ${binary:Version}), libfox-1.6-dev, ${misc:Depends}
+Depends: libace-foxreactor-6.4.7 (= ${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.4.6
+Package: libnetsvcs-6.4.7
 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.4.6 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libnetsvcs-6.4.7 (= ${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.4.6.docs b/ACE/debian/libace-6.4.6.docs
deleted file mode 100644
index 3bdab5b0089..00000000000
--- a/ACE/debian/libace-6.4.6.docs
+++ /dev/null
@@ -1,8 +0,0 @@
-README
-VERSION
-AUTHORS
-docs/FAQ
-PROBLEM-REPORT-FORM
-THANKS
-VERSION
-NEWS
diff --git a/ACE/debian/libace-6.4.6.install b/ACE/debian/libace-6.4.6.install
deleted file mode 100644
index 182a5eda411..00000000000
--- a/ACE/debian/libace-6.4.6.install
+++ /dev/null
@@ -1,6 +0,0 @@
-usr/lib/libACE-*.so
-usr/lib/libACE_ETCL-*.so
-usr/lib/libACE_Monitor_Control-*.so
-usr/lib/libACE_ETCL_Parser-*.so
-usr/lib/libACE_RLECompression-*.so
-usr/lib/libACE_Compression-*.so
diff --git a/ACE/debian/libace-6.4.6.lintian-overrides b/ACE/debian/libace-6.4.6.lintian-overrides
deleted file mode 100644
index 240f8e08d0c..00000000000
--- a/ACE/debian/libace-6.4.6.lintian-overrides
+++ /dev/null
@@ -1,6 +0,0 @@
-libace-6.4.5: no-symbols-control-file usr/lib/libACE-6.4.5.so
-libace-6.4.5: no-symbols-control-file usr/lib/libACE_ETCL_Parser-6.4.5.so
-libace-6.4.5: no-symbols-control-file usr/lib/libACE_Monitor_Control-6.4.5.so
-libace-6.4.5: no-symbols-control-file usr/lib/libACE_ETCL-6.4.5.so
-libace-6.4.5: no-symbols-control-file usr/lib/libACE_RLECompression-6.4.5.so
-libace-6.4.5: no-symbols-control-file usr/lib/libACE_Compression-6.4.5.so
diff --git a/ACE/debian/libace-6.4.7.docs b/ACE/debian/libace-6.4.7.docs
new file mode 100644
index 00000000000..3bdab5b0089
--- /dev/null
+++ b/ACE/debian/libace-6.4.7.docs
@@ -0,0 +1,8 @@
+README
+VERSION
+AUTHORS
+docs/FAQ
+PROBLEM-REPORT-FORM
+THANKS
+VERSION
+NEWS
diff --git a/ACE/debian/libace-6.4.7.install b/ACE/debian/libace-6.4.7.install
new file mode 100644
index 00000000000..182a5eda411
--- /dev/null
+++ b/ACE/debian/libace-6.4.7.install
@@ -0,0 +1,6 @@
+usr/lib/libACE-*.so
+usr/lib/libACE_ETCL-*.so
+usr/lib/libACE_Monitor_Control-*.so
+usr/lib/libACE_ETCL_Parser-*.so
+usr/lib/libACE_RLECompression-*.so
+usr/lib/libACE_Compression-*.so
diff --git a/ACE/debian/libace-6.4.7.lintian-overrides b/ACE/debian/libace-6.4.7.lintian-overrides
new file mode 100644
index 00000000000..240f8e08d0c
--- /dev/null
+++ b/ACE/debian/libace-6.4.7.lintian-overrides
@@ -0,0 +1,6 @@
+libace-6.4.5: no-symbols-control-file usr/lib/libACE-6.4.5.so
+libace-6.4.5: no-symbols-control-file usr/lib/libACE_ETCL_Parser-6.4.5.so
+libace-6.4.5: no-symbols-control-file usr/lib/libACE_Monitor_Control-6.4.5.so
+libace-6.4.5: no-symbols-control-file usr/lib/libACE_ETCL-6.4.5.so
+libace-6.4.5: no-symbols-control-file usr/lib/libACE_RLECompression-6.4.5.so
+libace-6.4.5: no-symbols-control-file usr/lib/libACE_Compression-6.4.5.so
diff --git a/ACE/debian/libace-flreactor-6.4.6.install b/ACE/debian/libace-flreactor-6.4.6.install
deleted file mode 100644
index 528836aacee..00000000000
--- a/ACE/debian/libace-flreactor-6.4.6.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/libACE_FlReactor-*.so
diff --git a/ACE/debian/libace-flreactor-6.4.6.lintian-overrides b/ACE/debian/libace-flreactor-6.4.6.lintian-overrides
deleted file mode 100644
index 4b58af00d10..00000000000
--- a/ACE/debian/libace-flreactor-6.4.6.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-libace-flreactor-6.4.5: no-symbols-control-file usr/lib/libACE_FlReactor-6.4.5.so
diff --git a/ACE/debian/libace-flreactor-6.4.7.install b/ACE/debian/libace-flreactor-6.4.7.install
new file mode 100644
index 00000000000..528836aacee
--- /dev/null
+++ b/ACE/debian/libace-flreactor-6.4.7.install
@@ -0,0 +1 @@
+usr/lib/libACE_FlReactor-*.so
diff --git a/ACE/debian/libace-flreactor-6.4.7.lintian-overrides b/ACE/debian/libace-flreactor-6.4.7.lintian-overrides
new file mode 100644
index 00000000000..4b58af00d10
--- /dev/null
+++ b/ACE/debian/libace-flreactor-6.4.7.lintian-overrides
@@ -0,0 +1 @@
+libace-flreactor-6.4.5: no-symbols-control-file usr/lib/libACE_FlReactor-6.4.5.so
diff --git a/ACE/debian/libace-foxreactor-6.4.6.install b/ACE/debian/libace-foxreactor-6.4.6.install
deleted file mode 100644
index e360f29f5af..00000000000
--- a/ACE/debian/libace-foxreactor-6.4.6.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/libACE_FoxReactor-*.so
diff --git a/ACE/debian/libace-foxreactor-6.4.6.lintian-overrides b/ACE/debian/libace-foxreactor-6.4.6.lintian-overrides
deleted file mode 100644
index 61c403e638b..00000000000
--- a/ACE/debian/libace-foxreactor-6.4.6.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-libace-foxreactor-6.4.5: no-symbols-control-file usr/lib/libACE_FoxReactor-6.4.5.so
diff --git a/ACE/debian/libace-foxreactor-6.4.7.install b/ACE/debian/libace-foxreactor-6.4.7.install
new file mode 100644
index 00000000000..e360f29f5af
--- /dev/null
+++ b/ACE/debian/libace-foxreactor-6.4.7.install
@@ -0,0 +1 @@
+usr/lib/libACE_FoxReactor-*.so
diff --git a/ACE/debian/libace-foxreactor-6.4.7.lintian-overrides b/ACE/debian/libace-foxreactor-6.4.7.lintian-overrides
new file mode 100644
index 00000000000..61c403e638b
--- /dev/null
+++ b/ACE/debian/libace-foxreactor-6.4.7.lintian-overrides
@@ -0,0 +1 @@
+libace-foxreactor-6.4.5: no-symbols-control-file usr/lib/libACE_FoxReactor-6.4.5.so
diff --git a/ACE/debian/libace-htbp-6.4.6.install b/ACE/debian/libace-htbp-6.4.6.install
deleted file mode 100644
index 08103fd5cad..00000000000
--- a/ACE/debian/libace-htbp-6.4.6.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/libACE_HTBP-*.so
diff --git a/ACE/debian/libace-htbp-6.4.6.lintian-overrides b/ACE/debian/libace-htbp-6.4.6.lintian-overrides
deleted file mode 100644
index 32697f5e2c0..00000000000
--- a/ACE/debian/libace-htbp-6.4.6.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-libace-htbp-6.4.5: no-symbols-control-file usr/lib/libACE_HTBP-6.4.5.so
diff --git a/ACE/debian/libace-htbp-6.4.7.install b/ACE/debian/libace-htbp-6.4.7.install
new file mode 100644
index 00000000000..08103fd5cad
--- /dev/null
+++ b/ACE/debian/libace-htbp-6.4.7.install
@@ -0,0 +1 @@
+usr/lib/libACE_HTBP-*.so
diff --git a/ACE/debian/libace-htbp-6.4.7.lintian-overrides b/ACE/debian/libace-htbp-6.4.7.lintian-overrides
new file mode 100644
index 00000000000..32697f5e2c0
--- /dev/null
+++ b/ACE/debian/libace-htbp-6.4.7.lintian-overrides
@@ -0,0 +1 @@
+libace-htbp-6.4.5: no-symbols-control-file usr/lib/libACE_HTBP-6.4.5.so
diff --git a/ACE/debian/libace-inet-6.4.6.install b/ACE/debian/libace-inet-6.4.6.install
deleted file mode 100644
index 59a73a509d0..00000000000
--- a/ACE/debian/libace-inet-6.4.6.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/libACE_INet-*.so
diff --git a/ACE/debian/libace-inet-6.4.6.lintian-overrides b/ACE/debian/libace-inet-6.4.6.lintian-overrides
deleted file mode 100644
index afb8bb9f959..00000000000
--- a/ACE/debian/libace-inet-6.4.6.lintian-overrides
+++ /dev/null
@@ -1,2 +0,0 @@
-libace-inet-6.4.5: extended-description-is-probably-too-short
-libace-inet-6.4.5: no-symbols-control-file usr/lib/libACE_INet-6.4.5.so
diff --git a/ACE/debian/libace-inet-6.4.7.install b/ACE/debian/libace-inet-6.4.7.install
new file mode 100644
index 00000000000..59a73a509d0
--- /dev/null
+++ b/ACE/debian/libace-inet-6.4.7.install
@@ -0,0 +1 @@
+usr/lib/libACE_INet-*.so
diff --git a/ACE/debian/libace-inet-6.4.7.lintian-overrides b/ACE/debian/libace-inet-6.4.7.lintian-overrides
new file mode 100644
index 00000000000..afb8bb9f959
--- /dev/null
+++ b/ACE/debian/libace-inet-6.4.7.lintian-overrides
@@ -0,0 +1,2 @@
+libace-inet-6.4.5: extended-description-is-probably-too-short
+libace-inet-6.4.5: no-symbols-control-file usr/lib/libACE_INet-6.4.5.so
diff --git a/ACE/debian/libace-inet-ssl-6.4.6.install b/ACE/debian/libace-inet-ssl-6.4.6.install
deleted file mode 100644
index b9b8b9045f7..00000000000
--- a/ACE/debian/libace-inet-ssl-6.4.6.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/libACE_INet_SSL-*.so
diff --git a/ACE/debian/libace-inet-ssl-6.4.6.lintian-overrides b/ACE/debian/libace-inet-ssl-6.4.6.lintian-overrides
deleted file mode 100644
index dcf77c5c4a0..00000000000
--- a/ACE/debian/libace-inet-ssl-6.4.6.lintian-overrides
+++ /dev/null
@@ -1,4 +0,0 @@
-libace-inet-ssl-6.4.5: no-symbols-control-file usr/lib/libACE_INet_SSL-6.4.5.so
-
-# It's Bison-generate code covered by the GNU Bison GPL-exception
-libace-inet-ssl-6.4.5: possible-gpl-code-linked-with-openssl
diff --git a/ACE/debian/libace-inet-ssl-6.4.7.install b/ACE/debian/libace-inet-ssl-6.4.7.install
new file mode 100644
index 00000000000..b9b8b9045f7
--- /dev/null
+++ b/ACE/debian/libace-inet-ssl-6.4.7.install
@@ -0,0 +1 @@
+usr/lib/libACE_INet_SSL-*.so
diff --git a/ACE/debian/libace-inet-ssl-6.4.7.lintian-overrides b/ACE/debian/libace-inet-ssl-6.4.7.lintian-overrides
new file mode 100644
index 00000000000..dcf77c5c4a0
--- /dev/null
+++ b/ACE/debian/libace-inet-ssl-6.4.7.lintian-overrides
@@ -0,0 +1,4 @@
+libace-inet-ssl-6.4.5: no-symbols-control-file usr/lib/libACE_INet_SSL-6.4.5.so
+
+# It's Bison-generate code covered by the GNU Bison GPL-exception
+libace-inet-ssl-6.4.5: possible-gpl-code-linked-with-openssl
diff --git a/ACE/debian/libace-qtreactor-6.4.6.install b/ACE/debian/libace-qtreactor-6.4.6.install
deleted file mode 100644
index 1d371e1e571..00000000000
--- a/ACE/debian/libace-qtreactor-6.4.6.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/libACE_QtReactor-*.so
diff --git a/ACE/debian/libace-qtreactor-6.4.6.lintian-overrides b/ACE/debian/libace-qtreactor-6.4.6.lintian-overrides
deleted file mode 100644
index 31bc9dc3867..00000000000
--- a/ACE/debian/libace-qtreactor-6.4.6.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-libace-qtreactor-6.4.5: no-symbols-control-file usr/lib/libACE_QtReactor-6.4.5.so
diff --git a/ACE/debian/libace-qtreactor-6.4.7.install b/ACE/debian/libace-qtreactor-6.4.7.install
new file mode 100644
index 00000000000..1d371e1e571
--- /dev/null
+++ b/ACE/debian/libace-qtreactor-6.4.7.install
@@ -0,0 +1 @@
+usr/lib/libACE_QtReactor-*.so
diff --git a/ACE/debian/libace-qtreactor-6.4.7.lintian-overrides b/ACE/debian/libace-qtreactor-6.4.7.lintian-overrides
new file mode 100644
index 00000000000..31bc9dc3867
--- /dev/null
+++ b/ACE/debian/libace-qtreactor-6.4.7.lintian-overrides
@@ -0,0 +1 @@
+libace-qtreactor-6.4.5: no-symbols-control-file usr/lib/libACE_QtReactor-6.4.5.so
diff --git a/ACE/debian/libace-rmcast-6.4.6.install b/ACE/debian/libace-rmcast-6.4.6.install
deleted file mode 100644
index 86e78259853..00000000000
--- a/ACE/debian/libace-rmcast-6.4.6.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/libACE_RMCast-*.so
diff --git a/ACE/debian/libace-rmcast-6.4.6.lintian-overrides b/ACE/debian/libace-rmcast-6.4.6.lintian-overrides
deleted file mode 100644
index 89d1e6523ce..00000000000
--- a/ACE/debian/libace-rmcast-6.4.6.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-libace-rmcast-6.4.5: no-symbols-control-file usr/lib/libACE_RMCast-6.4.5.so
diff --git a/ACE/debian/libace-rmcast-6.4.7.install b/ACE/debian/libace-rmcast-6.4.7.install
new file mode 100644
index 00000000000..86e78259853
--- /dev/null
+++ b/ACE/debian/libace-rmcast-6.4.7.install
@@ -0,0 +1 @@
+usr/lib/libACE_RMCast-*.so
diff --git a/ACE/debian/libace-rmcast-6.4.7.lintian-overrides b/ACE/debian/libace-rmcast-6.4.7.lintian-overrides
new file mode 100644
index 00000000000..89d1e6523ce
--- /dev/null
+++ b/ACE/debian/libace-rmcast-6.4.7.lintian-overrides
@@ -0,0 +1 @@
+libace-rmcast-6.4.5: no-symbols-control-file usr/lib/libACE_RMCast-6.4.5.so
diff --git a/ACE/debian/libace-ssl-6.4.6.NEWS b/ACE/debian/libace-ssl-6.4.6.NEWS
deleted file mode 100644
index e5bd0e4aa10..00000000000
--- a/ACE/debian/libace-ssl-6.4.6.NEWS
+++ /dev/null
@@ -1,11 +0,0 @@
-ace (6.0.1-2) unstable; urgency=low
-
-  As of ace 6.0.1-2, SSLv2 support was removed from Debian ACE+TAO
-  packages. This follows change introduced in openssl 1.0.0c-2.
-
-  WARNING: it means existing ACE-based software will default to SSL v3
-  instead of SSL v2 without warning. Recompiling software explicitly
-  using SSL v2 will fail since the ACE_SSL_Context::SSLv2_* enums got
-  removed.
-
- -- Thomas Girard <thomas.g.girard@free.fr>  Sat, 11 Jun 2011 18:51:20 +0200
diff --git a/ACE/debian/libace-ssl-6.4.6.install b/ACE/debian/libace-ssl-6.4.6.install
deleted file mode 100644
index 8df45a6d55f..00000000000
--- a/ACE/debian/libace-ssl-6.4.6.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/libACE_SSL-*.so
diff --git a/ACE/debian/libace-ssl-6.4.6.lintian-overrides b/ACE/debian/libace-ssl-6.4.6.lintian-overrides
deleted file mode 100644
index 2b0bc5f692a..00000000000
--- a/ACE/debian/libace-ssl-6.4.6.lintian-overrides
+++ /dev/null
@@ -1,5 +0,0 @@
-libace-ssl-6.4.5: extended-description-is-probably-too-short
-libace-ssl-6.4.5: no-symbols-control-file usr/lib/libACE_SSL-6.4.5.so
-
-# It's Bison-generate code covered by the GNU Bison GPL-exception
-libace-ssl-6.4.5: possible-gpl-code-linked-with-openssl
diff --git a/ACE/debian/libace-ssl-6.4.7.NEWS b/ACE/debian/libace-ssl-6.4.7.NEWS
new file mode 100644
index 00000000000..e5bd0e4aa10
--- /dev/null
+++ b/ACE/debian/libace-ssl-6.4.7.NEWS
@@ -0,0 +1,11 @@
+ace (6.0.1-2) unstable; urgency=low
+
+  As of ace 6.0.1-2, SSLv2 support was removed from Debian ACE+TAO
+  packages. This follows change introduced in openssl 1.0.0c-2.
+
+  WARNING: it means existing ACE-based software will default to SSL v3
+  instead of SSL v2 without warning. Recompiling software explicitly
+  using SSL v2 will fail since the ACE_SSL_Context::SSLv2_* enums got
+  removed.
+
+ -- Thomas Girard <thomas.g.girard@free.fr>  Sat, 11 Jun 2011 18:51:20 +0200
diff --git a/ACE/debian/libace-ssl-6.4.7.install b/ACE/debian/libace-ssl-6.4.7.install
new file mode 100644
index 00000000000..8df45a6d55f
--- /dev/null
+++ b/ACE/debian/libace-ssl-6.4.7.install
@@ -0,0 +1 @@
+usr/lib/libACE_SSL-*.so
diff --git a/ACE/debian/libace-ssl-6.4.7.lintian-overrides b/ACE/debian/libace-ssl-6.4.7.lintian-overrides
new file mode 100644
index 00000000000..2b0bc5f692a
--- /dev/null
+++ b/ACE/debian/libace-ssl-6.4.7.lintian-overrides
@@ -0,0 +1,5 @@
+libace-ssl-6.4.5: extended-description-is-probably-too-short
+libace-ssl-6.4.5: no-symbols-control-file usr/lib/libACE_SSL-6.4.5.so
+
+# It's Bison-generate code covered by the GNU Bison GPL-exception
+libace-ssl-6.4.5: possible-gpl-code-linked-with-openssl
diff --git a/ACE/debian/libace-tkreactor-6.4.6.install b/ACE/debian/libace-tkreactor-6.4.6.install
deleted file mode 100644
index 12ab35062d2..00000000000
--- a/ACE/debian/libace-tkreactor-6.4.6.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/libACE_TkReactor-*.so
diff --git a/ACE/debian/libace-tkreactor-6.4.6.lintian-overrides b/ACE/debian/libace-tkreactor-6.4.6.lintian-overrides
deleted file mode 100644
index 836f6d37a9f..00000000000
--- a/ACE/debian/libace-tkreactor-6.4.6.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-libace-tkreactor-6.4.5: no-symbols-control-file usr/lib/libACE_TkReactor-6.4.5.so
diff --git a/ACE/debian/libace-tkreactor-6.4.7.install b/ACE/debian/libace-tkreactor-6.4.7.install
new file mode 100644
index 00000000000..12ab35062d2
--- /dev/null
+++ b/ACE/debian/libace-tkreactor-6.4.7.install
@@ -0,0 +1 @@
+usr/lib/libACE_TkReactor-*.so
diff --git a/ACE/debian/libace-tkreactor-6.4.7.lintian-overrides b/ACE/debian/libace-tkreactor-6.4.7.lintian-overrides
new file mode 100644
index 00000000000..836f6d37a9f
--- /dev/null
+++ b/ACE/debian/libace-tkreactor-6.4.7.lintian-overrides
@@ -0,0 +1 @@
+libace-tkreactor-6.4.5: no-symbols-control-file usr/lib/libACE_TkReactor-6.4.5.so
diff --git a/ACE/debian/libace-tmcast-6.4.6.install b/ACE/debian/libace-tmcast-6.4.6.install
deleted file mode 100644
index e066131dea0..00000000000
--- a/ACE/debian/libace-tmcast-6.4.6.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/libACE_TMCast-*.so
diff --git a/ACE/debian/libace-tmcast-6.4.6.lintian-overrides b/ACE/debian/libace-tmcast-6.4.6.lintian-overrides
deleted file mode 100644
index fbb009770a6..00000000000
--- a/ACE/debian/libace-tmcast-6.4.6.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-libace-tmcast-6.4.5: no-symbols-control-file usr/lib/libACE_TMCast-6.4.5.so
diff --git a/ACE/debian/libace-tmcast-6.4.7.install b/ACE/debian/libace-tmcast-6.4.7.install
new file mode 100644
index 00000000000..e066131dea0
--- /dev/null
+++ b/ACE/debian/libace-tmcast-6.4.7.install
@@ -0,0 +1 @@
+usr/lib/libACE_TMCast-*.so
diff --git a/ACE/debian/libace-tmcast-6.4.7.lintian-overrides b/ACE/debian/libace-tmcast-6.4.7.lintian-overrides
new file mode 100644
index 00000000000..fbb009770a6
--- /dev/null
+++ b/ACE/debian/libace-tmcast-6.4.7.lintian-overrides
@@ -0,0 +1 @@
+libace-tmcast-6.4.5: no-symbols-control-file usr/lib/libACE_TMCast-6.4.5.so
diff --git a/ACE/debian/libace-xml-utils-6.4.6.install b/ACE/debian/libace-xml-utils-6.4.6.install
deleted file mode 100644
index 2428ec9f109..00000000000
--- a/ACE/debian/libace-xml-utils-6.4.6.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/libACE_XML_Utils-*.so
diff --git a/ACE/debian/libace-xml-utils-6.4.6.lintian-overrides b/ACE/debian/libace-xml-utils-6.4.6.lintian-overrides
deleted file mode 100644
index dfe499a9dbb..00000000000
--- a/ACE/debian/libace-xml-utils-6.4.6.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-libace-xml-utils-6.4.5: no-symbols-control-file usr/lib/libACE_XML_Utils-6.4.5.so
diff --git a/ACE/debian/libace-xml-utils-6.4.7.install b/ACE/debian/libace-xml-utils-6.4.7.install
new file mode 100644
index 00000000000..2428ec9f109
--- /dev/null
+++ b/ACE/debian/libace-xml-utils-6.4.7.install
@@ -0,0 +1 @@
+usr/lib/libACE_XML_Utils-*.so
diff --git a/ACE/debian/libace-xml-utils-6.4.7.lintian-overrides b/ACE/debian/libace-xml-utils-6.4.7.lintian-overrides
new file mode 100644
index 00000000000..dfe499a9dbb
--- /dev/null
+++ b/ACE/debian/libace-xml-utils-6.4.7.lintian-overrides
@@ -0,0 +1 @@
+libace-xml-utils-6.4.5: no-symbols-control-file usr/lib/libACE_XML_Utils-6.4.5.so
diff --git a/ACE/debian/libace-xtreactor-6.4.6.install b/ACE/debian/libace-xtreactor-6.4.6.install
deleted file mode 100644
index c53614c7208..00000000000
--- a/ACE/debian/libace-xtreactor-6.4.6.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/libACE_XtReactor-*.so
diff --git a/ACE/debian/libace-xtreactor-6.4.6.lintian-overrides b/ACE/debian/libace-xtreactor-6.4.6.lintian-overrides
deleted file mode 100644
index 683006fa589..00000000000
--- a/ACE/debian/libace-xtreactor-6.4.6.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-libace-xtreactor-6.4.5: no-symbols-control-file usr/lib/libACE_XtReactor-6.4.5.so
diff --git a/ACE/debian/libace-xtreactor-6.4.7.install b/ACE/debian/libace-xtreactor-6.4.7.install
new file mode 100644
index 00000000000..c53614c7208
--- /dev/null
+++ b/ACE/debian/libace-xtreactor-6.4.7.install
@@ -0,0 +1 @@
+usr/lib/libACE_XtReactor-*.so
diff --git a/ACE/debian/libace-xtreactor-6.4.7.lintian-overrides b/ACE/debian/libace-xtreactor-6.4.7.lintian-overrides
new file mode 100644
index 00000000000..683006fa589
--- /dev/null
+++ b/ACE/debian/libace-xtreactor-6.4.7.lintian-overrides
@@ -0,0 +1 @@
+libace-xtreactor-6.4.5: no-symbols-control-file usr/lib/libACE_XtReactor-6.4.5.so
diff --git a/ACE/debian/libacexml-6.4.6.docs b/ACE/debian/libacexml-6.4.6.docs
deleted file mode 100644
index 002855d7915..00000000000
--- a/ACE/debian/libacexml-6.4.6.docs
+++ /dev/null
@@ -1 +0,0 @@
-ACEXML/README
diff --git a/ACE/debian/libacexml-6.4.6.install b/ACE/debian/libacexml-6.4.6.install
deleted file mode 100644
index d3e912ffa51..00000000000
--- a/ACE/debian/libacexml-6.4.6.install
+++ /dev/null
@@ -1,3 +0,0 @@
-usr/lib/libACEXML_XML_Svc_Conf_Parser-*.so
-usr/lib/libACEXML-*.so
-usr/lib/libACEXML_Parser-*.so
diff --git a/ACE/debian/libacexml-6.4.6.lintian-overrides b/ACE/debian/libacexml-6.4.6.lintian-overrides
deleted file mode 100644
index 62753f80cfe..00000000000
--- a/ACE/debian/libacexml-6.4.6.lintian-overrides
+++ /dev/null
@@ -1,3 +0,0 @@
-libacexml-6.4.5: no-symbols-control-file usr/lib/libACEXML_Parser-6.4.5.so
-libacexml-6.4.5: no-symbols-control-file usr/lib/libACEXML_XML_Svc_Conf_Parser-6.4.5.so
-libacexml-6.4.5: no-symbols-control-file usr/lib/libACEXML-6.4.5.so
diff --git a/ACE/debian/libacexml-6.4.7.docs b/ACE/debian/libacexml-6.4.7.docs
new file mode 100644
index 00000000000..002855d7915
--- /dev/null
+++ b/ACE/debian/libacexml-6.4.7.docs
@@ -0,0 +1 @@
+ACEXML/README
diff --git a/ACE/debian/libacexml-6.4.7.install b/ACE/debian/libacexml-6.4.7.install
new file mode 100644
index 00000000000..d3e912ffa51
--- /dev/null
+++ b/ACE/debian/libacexml-6.4.7.install
@@ -0,0 +1,3 @@
+usr/lib/libACEXML_XML_Svc_Conf_Parser-*.so
+usr/lib/libACEXML-*.so
+usr/lib/libACEXML_Parser-*.so
diff --git a/ACE/debian/libacexml-6.4.7.lintian-overrides b/ACE/debian/libacexml-6.4.7.lintian-overrides
new file mode 100644
index 00000000000..62753f80cfe
--- /dev/null
+++ b/ACE/debian/libacexml-6.4.7.lintian-overrides
@@ -0,0 +1,3 @@
+libacexml-6.4.5: no-symbols-control-file usr/lib/libACEXML_Parser-6.4.5.so
+libacexml-6.4.5: no-symbols-control-file usr/lib/libACEXML_XML_Svc_Conf_Parser-6.4.5.so
+libacexml-6.4.5: no-symbols-control-file usr/lib/libACEXML-6.4.5.so
diff --git a/ACE/debian/libkokyu-6.4.6.docs b/ACE/debian/libkokyu-6.4.6.docs
deleted file mode 100644
index e8869c513b2..00000000000
--- a/ACE/debian/libkokyu-6.4.6.docs
+++ /dev/null
@@ -1 +0,0 @@
-Kokyu/README
diff --git a/ACE/debian/libkokyu-6.4.6.install b/ACE/debian/libkokyu-6.4.6.install
deleted file mode 100644
index 62854308f96..00000000000
--- a/ACE/debian/libkokyu-6.4.6.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/libKokyu-*.so
diff --git a/ACE/debian/libkokyu-6.4.6.lintian-overrides b/ACE/debian/libkokyu-6.4.6.lintian-overrides
deleted file mode 100644
index 73e11dec443..00000000000
--- a/ACE/debian/libkokyu-6.4.6.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-libkokyu-6.4.5: no-symbols-control-file usr/lib/libKokyu-6.4.5.so
diff --git a/ACE/debian/libkokyu-6.4.7.docs b/ACE/debian/libkokyu-6.4.7.docs
new file mode 100644
index 00000000000..e8869c513b2
--- /dev/null
+++ b/ACE/debian/libkokyu-6.4.7.docs
@@ -0,0 +1 @@
+Kokyu/README
diff --git a/ACE/debian/libkokyu-6.4.7.install b/ACE/debian/libkokyu-6.4.7.install
new file mode 100644
index 00000000000..62854308f96
--- /dev/null
+++ b/ACE/debian/libkokyu-6.4.7.install
@@ -0,0 +1 @@
+usr/lib/libKokyu-*.so
diff --git a/ACE/debian/libkokyu-6.4.7.lintian-overrides b/ACE/debian/libkokyu-6.4.7.lintian-overrides
new file mode 100644
index 00000000000..73e11dec443
--- /dev/null
+++ b/ACE/debian/libkokyu-6.4.7.lintian-overrides
@@ -0,0 +1 @@
+libkokyu-6.4.5: no-symbols-control-file usr/lib/libKokyu-6.4.5.so
diff --git a/ACE/debian/libnetsvcs-6.4.6.docs b/ACE/debian/libnetsvcs-6.4.6.docs
deleted file mode 100644
index 0b03c55b91f..00000000000
--- a/ACE/debian/libnetsvcs-6.4.6.docs
+++ /dev/null
@@ -1,2 +0,0 @@
-netsvcs/lib/README
-PROBLEM-REPORT-FORM
diff --git a/ACE/debian/libnetsvcs-6.4.6.install b/ACE/debian/libnetsvcs-6.4.6.install
deleted file mode 100644
index c7a04b16213..00000000000
--- a/ACE/debian/libnetsvcs-6.4.6.install
+++ /dev/null
@@ -1 +0,0 @@
-../../netsvcs/lib/libnetsvcs-*.so usr/lib
diff --git a/ACE/debian/libnetsvcs-6.4.6.lintian-overrides b/ACE/debian/libnetsvcs-6.4.6.lintian-overrides
deleted file mode 100644
index 6ae68da92a4..00000000000
--- a/ACE/debian/libnetsvcs-6.4.6.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-libnetsvcs-6.4.5: no-symbols-control-file usr/lib/libnetsvcs-6.4.5.so
diff --git a/ACE/debian/libnetsvcs-6.4.7.docs b/ACE/debian/libnetsvcs-6.4.7.docs
new file mode 100644
index 00000000000..0b03c55b91f
--- /dev/null
+++ b/ACE/debian/libnetsvcs-6.4.7.docs
@@ -0,0 +1,2 @@
+netsvcs/lib/README
+PROBLEM-REPORT-FORM
diff --git a/ACE/debian/libnetsvcs-6.4.7.install b/ACE/debian/libnetsvcs-6.4.7.install
new file mode 100644
index 00000000000..c7a04b16213
--- /dev/null
+++ b/ACE/debian/libnetsvcs-6.4.7.install
@@ -0,0 +1 @@
+../../netsvcs/lib/libnetsvcs-*.so usr/lib
diff --git a/ACE/debian/libnetsvcs-6.4.7.lintian-overrides b/ACE/debian/libnetsvcs-6.4.7.lintian-overrides
new file mode 100644
index 00000000000..6ae68da92a4
--- /dev/null
+++ b/ACE/debian/libnetsvcs-6.4.7.lintian-overrides
@@ -0,0 +1 @@
+libnetsvcs-6.4.5: no-symbols-control-file usr/lib/libnetsvcs-6.4.5.so
diff --git a/ACE/rpmbuild/ace-tao.spec b/ACE/rpmbuild/ace-tao.spec
index c354eb471fa..a91db76813a 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.4.6
-%define TAOVER  2.4.6
+%define ACEVER  6.4.7
+%define TAOVER  2.4.7
 
 # Conditional build
 # Default values are
diff --git a/TAO/ChangeLogs/TAO-2_4_7 b/TAO/ChangeLogs/TAO-2_4_7
new file mode 100644
index 00000000000..65d37fbae34
--- /dev/null
+++ b/TAO/ChangeLogs/TAO-2_4_7
@@ -0,0 +1,283 @@
+commit b1228f4bfd1be92b1590de65fe49c8511c2b71e1
+Author: Adam Mitz <mitza@ociweb.com>
+Date:   Tue Mar 13 10:58:36 2018 -0500
+
+    TAO test list: mark tests that won't run with CORBA/e compact
+
+commit 5a4a08e16062d6ecbf0e599fc2bdb26f103e72d3
+Author: Adam Mitz <mitza@ociweb.com>
+Date:   Mon Mar 12 11:19:23 2018 -0500
+
+    TAO NEWS for shmiop change
+
+commit 66e84f43246a74b1efadf60ff7aef1146a853c98
+Author: Adam Mitz <mitza@ociweb.com>
+Date:   Tue Mar 6 11:06:41 2018 -0600
+
+    Bug 1220 fix applied to SHMIOP (fixed for IIOP long ago).
+    
+    Also added a SHMIOP test, IPv6 compatibility, and fixed wrong indent in Synch_Invocation.cpp.
+
+commit 71a517bfb38858939cecc4e021dc3805663ff07a
+Merge: 7aadef4fc59 d4c520ce4cf
+Author: Adam Mitz <mitza@objectcomputing.com>
+Date:   Mon Feb 26 14:12:55 2018 -0600
+
+    Merge pull request #582 from mitza-oci/master
+    
+    NEWS for upcoming release
+
+commit d4c520ce4cf5fc14aa296936e6c80cccbc12757e
+Author: Adam Mitz <mitza@ociweb.com>
+Date:   Mon Feb 26 11:24:58 2018 -0600
+
+    NEWS for upcoming release
+
+commit 73307efb832657d40b3c39492a2c4ae4b0b47762
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Mon Feb 26 18:20:26 2018 +0100
+
+    Doxygen fixes and fixed some typos
+    
+        * TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.h:
+        * TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.h:
+        * TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h:
+        * TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.h:
+        * TAO/tests/Bug_2953_Regression/client.cpp:
+        * TAO/tests/Bug_2953_Regression/server.cpp:
+        * TAO/tests/Smart_Proxies/Benchmark/client.cpp:
+        * TAO/tests/Smart_Proxies/Policy/client.cpp:
+        * TAO/tests/Smart_Proxies/client.cpp:
+
+commit dded6e0e48ee7e1c6c39240d60fb0b3111ceddf2
+Author: Oliver Kellogg <okellogg@users.sourceforge.net>
+Date:   Fri Feb 23 09:05:06 2018 +0100
+
+    TAO/tests/Bug_3940_Regression/test.idl
+    - Address issue #571 comment by jwillemsen: Disable content of IDL file
+      for Borland C++ Builder. The cpp32 preprocessor apparently strips out
+      all @ characters which inhibits processing of annotations.
+
+commit 35218a474eeb88b4288df227a98f04cbf0865f8b
+Author: Oliver Kellogg <okellogg@users.sourceforge.net>
+Date:   Sun Feb 18 02:30:07 2018 +0100
+
+    Address https://github.com/DOCGroup/ACE_TAO/issues/571 :
+    Shift handling of annotation applications from lexer to parser.
+    
+    TAO/TAO_IDL/fe/idl.ll
+    - Remove rule matching annotation applications.
+    
+    TAO/TAO_IDL/fe/idl.ypp
+    - Define %type <idval> defining_id.
+    - Duplicate rule `id' as defining_id.
+      In defining_id allow for annotation applications.
+    - Substitute `id' by defining_id in following rules:
+      template_module_ref, template_module_inst, interface_decl, value_decl,
+      const_dcl, simple_declarator, struct_decl, union_decl, enum_type,
+      array_declarator, exception, component_forward_decl, component_header,
+      home_header, factory_decl, finder_decl, event_concrete_forward_decl,
+      event_abs_forward_decl, event_abs_header, event_custom_header,
+      event_plain_header.
+    - Allow for annotation applications in following rules:
+      definitions, at_least_one_definition, tpl_definitions, member_i,
+      case_branch, case_labels, enumerator, operation, init_decl,
+      porttype_decl, at_least_one_actual_parameter, actual_parameters,
+      connector_header.
+    - New rule `annotations' implements sequence of 0 or more annotation_appl.
+    - New rules annotation_appl, annotation_appl_params, annotation_appl_param
+      implement rules 225, 226, 227 from IDL 4.2 section 7.4.15.3.
+    - New rule at_least_one_annotation_appl_param implements 2nd alternative
+      on RHS of rule 226.
+    - New rule annotation_appl_named_params is auxiliary to
+      at_least_one_annotation_appl_param.
+      It implements a sequence of 0 or more annotation_appl_param.
+    
+    TAO/TAO_IDL/fe/idl.yy.cpp
+    - Regenerate from idl.ll using TAO/TAO_IDL/regen.sh with flex-2.6.4.
+    
+    TAO/TAO_IDL/fe/idl.tab.cpp
+    - Regenerate from idl.ypp using TAO/TAO_IDL/regen.sh with bison-3.0.2.
+
+commit cb29bd46571e428d1d71c860ec9010d29a3a1fe4
+Merge: 4665969af11 d14029823bf
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Fri Feb 16 16:05:33 2018 +0100
+
+    Merge pull request #573 from jwillemsen/jwi-taoidlleak
+    
+    Add new C++ compiler test for testing a feature TAO is using
+
+commit 4473a426454c16a2d7af7328778369d603d701ca
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Fri Feb 16 10:23:41 2018 +0100
+
+    Fixed typo in comment
+    
+        * TAO/tests/Bug_3683_Regression/Simple_util.h:
+
+commit 0b1e33835dcdb9397c9eeb23eef5db53908d87e0
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Fri Feb 16 10:23:28 2018 +0100
+
+    Convert to doxygen style comments
+    
+        * TAO/tests/Bug_3683_Regression/Echo.idl:
+
+commit 4665969af11545a831900244fd4ac6fa6f30a155
+Merge: cbb40b5f6f2 c8d9edf5117
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Thu Feb 15 10:32:39 2018 +0100
+
+    Merge pull request #572 from jwillemsen/jwi-taoidlleak
+    
+    Fixed memory leak when we have a wstrval
+
+commit c8d9edf5117f6aa7334bd63e351e816d4946aece
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Tue Feb 13 19:23:59 2018 +0100
+
+    Fixed memory leak when we have a wstrval
+    
+        * TAO/TAO_IDL/ast/ast_expression.cpp:
+
+commit e1f507ba668b0373e2ef3ab6fb74a9f792374fb3
+Author: Oliver Kellogg <okellogg@users.sourceforge.net>
+Date:   Sun Feb 4 19:43:06 2018 +0100
+
+    Followup to commit 3f751cb addresses
+    https://github.com/DOCGroup/ACE_TAO/pull/567#issuecomment-360504123 ,
+    
+    > [...] the Solaris/SunCC build failed because its preprocessor splits
+    > the @ from the following token:
+    >
+    > $ echo '@foo' > /tmp/foo.c && /opt/compilers/suncc5.12/bin/CC -E \
+    >   /tmp/foo.c && rm /tmp/foo.c
+    > #1 "/tmp/foo.c"
+    > @ foo
+    
+    TAO/TAO_IDL/fe/idl.ll
+    - Modify the rule matching annotations to include an optional space
+      after the '@',
+      @ ?[A-Za-z][A-Za-z0-9_]*[ \t]*(\([^)]+\))?
+
+commit be871ac59565386b582b41e48ef129d509c354fc
+Author: Oliver Kellogg <okellogg@users.sourceforge.net>
+Date:   Wed Jan 24 22:24:13 2018 +0100
+
+    Followup to PR #565: Address new conversion warning at
+      http://buildlogs.remedy.nl/win_msvc15_opendds_debug/index.html ,
+    > fe\idl.yy.cpp(1383): warning C4267: 'argument': conversion from
+    > 'size_t' to 'int'
+    
+    TAO/TAO_IDL/tao_idl_fe.mpc rule lex.yy
+    - In the sed regexes, replace the fread related substitution by an
+      #include <errno.h> substitution.
+      As a marginal cosmetic improvement, adjust the tab substitution
+      to produce 4 spaces per tab.
+    - In the error message of the else-part, increase the minimum required
+      flex version to 2.6.4.
+    
+    TAO/TAO_IDL/fe/idl.yy.cpp
+    - Regenerate using regen.sh with flex 2.6.4.
+
+commit a2f4310d1beb46927e396cbfb1f563abf390eb8f
+Author: Oliver Kellogg <okellogg@users.sourceforge.net>
+Date:   Fri Jan 19 21:43:43 2018 +0100
+
+    Follow suggestion by mitza-oci at
+                https://github.com/DOCGroup/ACE_TAO/pull/565 :
+    > Since it's a compile-only test, it shouldn't need a run_test.pl or a
+    > test.cpp (build a library instead of an executable).
+    
+    TAO/tests/Bug_3940_Regression/Bug_3940_Regression.mpc
+    - Change superproject to taolib_with_idl.
+    - Remove exename and Source_Files.
+    
+    TAO/tests/Bug_3940_Regression/test.cpp
+    TAO/tests/Bug_3940_Regression/run_test.pl
+    - Remove files.
+
+commit 383454e6ee7d814cbfa3e1758f506a90f96b7d13
+Author: Oliver Kellogg <okellogg@users.sourceforge.net>
+Date:   Wed Jan 17 22:01:45 2018 +0100
+
+    * TAO/tests/Bug_3940_Regression :
+      New test verifies that tao_idl tolerates IDL4 annotations.
+
+commit 3f751cb31255f9916a5b5ec31f572f4aa1758c96
+Author: Oliver Kellogg <okellogg@users.sourceforge.net>
+Date:   Tue Jan 16 22:09:36 2018 +0100
+
+    http://bugzilla.dre.vanderbilt.edu/show_bug.cgi?id=3940#c4
+    Attachment 1524: Patch to make tao_idl ignore IDL4 annotations
+    
+    TAO/TAO_IDL/fe/idl.ll
+    - Add rule @[A-Za-z][A-Za-z0-9_]*[ \t]*(\([^)]+\))? with action "break".
+    
+    TAO/TAO_IDL/fe/idl.tab.cpp
+    TAO/TAO_IDL/fe/idl.tab.hpp
+    TAO/TAO_IDL/fe/idl.yy.cpp
+    - In directory TAO/TAO_IDL execute script regen.sh using flex 2.6.0 and
+      bison 3.0.2.
+    
+    TAO/TAO_IDL/fe/idl.ypp
+    - Fix typo in comment.
+
+commit 2a2491926e1a1e044da01f979dcaa4e1e2032c51
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Mon Jan 15 18:14:06 2018 +0100
+
+    Removed reference to CIAO, moved to a separate repo, added msvc 14.1 (Visual Studio 2017)
+    
+        * TAO/TAO-INSTALL.html:
+
+commit 57a3da79bd35109aadaa74110f58440e4a5eab86
+Author: Oliver Kellogg <okellogg@users.sourceforge.net>
+Date:   Fri Jan 12 00:03:25 2018 +0100
+
+    - In section "Building and Installing TAO from git", mention that the
+      ACE_ROOT and TAO_ROOT env vars are set different from ACE_wrappers.
+    - Fix a few typos.
+    - Add a few missing </LI> tags.
+
+commit 6fbf5788f0589ae7cde5448baeda0d6e9b1bfc79
+Merge: ac9ffb65e75 4ac686684c6
+Author: Adam Mitz <mitza@objectcomputing.com>
+Date:   Tue Jan 2 09:36:50 2018 -0600
+
+    Merge pull request #555 from mitza-oci/singleton-restart
+    
+    ACE_Singleton should work after ACE::fini, ACE::init (fixes issue #554)
+
+commit dff4439b18379b9008ee696303be492d84d794dd
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Mon Jan 1 11:24:13 2018 +0100
+
+    Updated copyright to 2018
+    
+        * ACE/tests/ACE.bsp:
+          Deleted, not used anymore
+    
+        * ACE/COPYING:
+        * TAO/COPYING:
+
+commit 5bbbaacd283951886642a5113300f0c0543e51c0
+Author: Adam Mitz <mitza@ociweb.com>
+Date:   Thu Dec 21 10:18:10 2017 -0600
+
+    fixed issue #554 ACE_Singleton use after ACE::fini, ACE::init
+
+commit 52618c6f2a83446eb15ecd95e98e9d178a013d47
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Fri Dec 8 09:38:58 2017 +0100
+
+    Make ACE 6.4.6 and TAO 2.4.6 public
+    
+        * ACE/NEWS:
+        * ACE/bin/diff-builds-and-group-fixed-tests-only.sh:
+        * ACE/debian/debian.control:
+        * ACE/docs/Download.html:
+        * ACE/docs/bczar/bczar.html:
+        * ACE/etc/index.html:
+        * TAO/NEWS:
diff --git a/TAO/PROBLEM-REPORT-FORM b/TAO/PROBLEM-REPORT-FORM
index 7d6bc051567..de278b594bf 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.4.6
-    ACE VERSION: 6.4.6
+    TAO VERSION: 2.4.7
+    ACE VERSION: 6.4.7
 
     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 b1072b15d50..96091bea5bb 100644
--- a/TAO/VERSION
+++ b/TAO/VERSION
@@ -1,4 +1,4 @@
-This is TAO version 2.4.6, released Fri Dec 08 08:48:59 CET 2017
+This is TAO version 2.4.7, released Fri Mar 16 08:05:28 CET 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 cc44cc260f3..8b48ae5bef1 100644
--- a/TAO/tao/Version.h
+++ b/TAO/tao/Version.h
@@ -4,9 +4,9 @@
 
 #define TAO_MAJOR_VERSION 2
 #define TAO_MINOR_VERSION 4
-#define TAO_MICRO_VERSION 6
-#define TAO_BETA_VERSION 6
-#define TAO_VERSION "2.4.6"
-#define TAO_VERSION_CODE 132102
+#define TAO_MICRO_VERSION 7
+#define TAO_BETA_VERSION 7
+#define TAO_VERSION "2.4.7"
+#define TAO_VERSION_CODE 132103
 #define TAO_MAKE_VERSION_CODE(a,b,c) (((a) << 16) + ((b) << 8) + (c))
 
-- 
cgit v1.2.1


From 1a40037d09b677b680a6ecbf6f3386aec5871807 Mon Sep 17 00:00:00 2001
From: Johnny Willemsen <jwillemsen@remedy.nl>
Date: Fri, 16 Mar 2018 08:46:32 +0100
Subject: ACE/TAO x.4.7 release

    * ACE/NEWS:
    * ACE/bin/diff-builds-and-group-fixed-tests-only.sh:
    * ACE/docs/Download.html:
    * ACE/etc/index.html:
---
 ACE/NEWS                                          |  3 ++
 ACE/bin/diff-builds-and-group-fixed-tests-only.sh |  2 +-
 ACE/docs/Download.html                            | 64 +++++++++++------------
 ACE/etc/index.html                                |  1 +
 4 files changed, 37 insertions(+), 33 deletions(-)

diff --git a/ACE/NEWS b/ACE/NEWS
index a0e82cb554b..889dc0ed090 100644
--- a/ACE/NEWS
+++ b/ACE/NEWS
@@ -1,3 +1,6 @@
+USER VISIBLE CHANGES BETWEEN ACE-6.4.7 and ACE-6.4.8
+====================================================
+
 USER VISIBLE CHANGES BETWEEN ACE-6.4.6 and ACE-6.4.7
 ====================================================
 
diff --git a/ACE/bin/diff-builds-and-group-fixed-tests-only.sh b/ACE/bin/diff-builds-and-group-fixed-tests-only.sh
index cc82379e8d3..b6b3746b023 100755
--- a/ACE/bin/diff-builds-and-group-fixed-tests-only.sh
+++ b/ACE/bin/diff-builds-and-group-fixed-tests-only.sh
@@ -2,7 +2,7 @@
 
 if test -z $1; then newdate=`date -u +%Y_%m_%d`; else newdate=$1; fi
 if test -z $2; then prefix=`date -u +%Y%m%d%a`; else prefix=$2; fi
-if test -z $3; then olddate=2017_12_08; else olddate=$3; fi
+if test -z $3; then olddate=2018_03_16; else olddate=$3; fi
 if test -z $ACE_ROOT; then ACE_ROOT=..; fi
 if test -z $TAO_ROOT; then TAO_ROOT=${ACE_ROOT}/TAO; fi
 if test -z $CIAO_ROOT; then CIAO_ROOT=${TAO_ROOT}/CIAO; fi
diff --git a/ACE/docs/Download.html b/ACE/docs/Download.html
index 13e294f17d0..c134ca0621a 100644
--- a/ACE/docs/Download.html
+++ b/ACE/docs/Download.html
@@ -92,81 +92,81 @@ Windows line feeds. For all other platforms download a .gz/.bz2 package.
 </P>
 
 <UL>
-<LI> <B>Latest ACE+TAO Micro Release.</B> The latest micro release is ACE 6.4.6 and TAO 2.4.6
-(ACE+TAO x.4.5), please use the links below to download it.<P>
+<LI> <B>Latest ACE+TAO Micro Release.</B> The latest micro release is ACE 6.4.7 and TAO 2.4.7
+(ACE+TAO x.4.7), please use the links below to download it.<P>
 
 <TABLE BORDER="4">
   <TR><TH>Filename</TH><TH>Description</TH><TH>Full</TH><TH>Sources only</TH></TR>
   <TR><TD>ACE+TAO.tar.gz</TD>
       <TD>ACE+TAO (tar+gzip format)</TD>
-      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-6.4.6.tar.gz">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-6.4.6.tar.gz">FTP</A>]
+      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-6.4.7.tar.gz">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-6.4.7.tar.gz">FTP</A>]
       </TD>
-      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-6.4.6.tar.gz">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-6.4.6.tar.gz">FTP</A>]
+      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-6.4.7.tar.gz">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-6.4.7.tar.gz">FTP</A>]
       </TD>
   </TR>
   <TR><TD>ACE+TAO.tar.bz2</TD>
       <TD>ACE+TAO (tar+bzip2 format)</TD>
-      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-6.4.6.tar.bz2">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-6.4.6.tar.bz2">FTP</A>]
+      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-6.4.7.tar.bz2">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-6.4.7.tar.bz2">FTP</A>]
       </TD>
-      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-6.4.6.tar.bz2">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-6.4.6.tar.bz2">FTP</A>]
+      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-6.4.7.tar.bz2">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-6.4.7.tar.bz2">FTP</A>]
       </TD>
   </TR>
   <TR><TD>ACE+TAO.zip</TD>
       <TD>ACE+TAO (zip format)</TD>
-      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-6.4.6.zip">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-6.4.6.zip">FTP</A>]
+      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-6.4.7.zip">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-6.4.7.zip">FTP</A>]
       </TD>
-      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-6.4.6.zip">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-6.4.6.zip">FTP</A>]
+      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-6.4.7.zip">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-6.4.7.zip">FTP</A>]
       </TD>
   </TR>
   <TR><TD>ACE-html.tar.gz</TD>
       <TD>Doxygen documentation for ACE+TAO (tar+gzip format)</TD>
-      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-html-6.4.6.tar.gz">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-html-6.4.6.tar.gz">FTP</A>]
+      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-html-6.4.7.tar.gz">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-html-6.4.7.tar.gz">FTP</A>]
       </TD>
   </TR>
   <TR><TD>ACE-html.tar.bz2</TD>
       <TD>Doxygen documentation for ACE+TAO (tar+bzip2 format)</TD>
-      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-html-6.4.6.tar.bz2">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-html-6.4.6.tar.bz2">FTP</A>]
+      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-html-6.4.7.tar.bz2">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-html-6.4.7.tar.bz2">FTP</A>]
       </TD>
   </TR>
   <TR><TD>ACE-html.zip</TD>
       <TD>Doxygen documentation for ACE+TAO (zip format)</TD>
-      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-html-6.4.6.zip">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-html-6.4.6.zip">FTP</A>]
+      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-html-6.4.7.zip">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-html-6.4.7.zip">FTP</A>]
       </TD>
   </TR>
   <TR><TD>ACE.tar.gz</TD>
       <TD>ACE only (tar+gzip format)</TD>
-      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-6.4.6.tar.gz">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-6.4.6.tar.gz">FTP</A>]
+      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-6.4.7.tar.gz">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-6.4.7.tar.gz">FTP</A>]
       </TD>
-      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-src-6.4.6.tar.gz">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-src-6.4.6.tar.gz">FTP</A>]
+      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-src-6.4.7.tar.gz">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-src-6.4.7.tar.gz">FTP</A>]
       </TD>
   </TR>
   <TR><TD>ACE.tar.bz2</TD>
       <TD>ACE only (tar+bzip2 format)</TD>
-      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-6.4.6.tar.bz2">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-6.4.6.tar.bz2">FTP</A>]
+      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-6.4.7.tar.bz2">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-6.4.7.tar.bz2">FTP</A>]
       </TD>
-      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-src-6.4.6.tar.bz2">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-src-6.4.6.tar.bz2">FTP</A>]
+      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-src-6.4.7.tar.bz2">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-src-6.4.7.tar.bz2">FTP</A>]
       </TD>
   </TR>
   <TR><TD>ACE.zip</TD>
       <TD>ACE only (zip format)</TD>
-      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-6.4.6.zip">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-6.4.6.zip">FTP</A>]
+      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-6.4.7.zip">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-6.4.7.zip">FTP</A>]
       </TD>
-      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-src-6.4.6.zip">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-src-6.4.6.zip">FTP</A>]
+      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-src-6.4.7.zip">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-src-6.4.7.zip">FTP</A>]
       </TD>
   </TR>
 </TABLE>
diff --git a/ACE/etc/index.html b/ACE/etc/index.html
index 9cc1f0a1741..d8d075272fc 100644
--- a/ACE/etc/index.html
+++ b/ACE/etc/index.html
@@ -30,6 +30,7 @@
     <hr>
     We do have the documentation for previous releases
     <ul>
+      <LI><P><A HREF="6.4.7/html">6.4.7</A></P></LI>
       <LI><P><A HREF="6.4.6/html">6.4.6</A></P></LI>
       <LI><P><A HREF="6.4.5/html">6.4.5</A></P></LI>
       <LI><P><A HREF="6.4.4/html">6.4.4</A></P></LI>
-- 
cgit v1.2.1


From 16e8495dd2f69b3c89d4fcd13b8e0c3096931c41 Mon Sep 17 00:00:00 2001
From: Johnny Willemsen <jwillemsen@remedy.nl>
Date: Fri, 16 Mar 2018 16:32:16 +0100
Subject: Instead of using [0] a [0L] has to be used, that is the correct fix

    * ACE/tests/Compiler_Features_38_Test.cpp:
---
 ACE/tests/Compiler_Features_38_Test.cpp | 21 +--------------------
 1 file changed, 1 insertion(+), 20 deletions(-)

diff --git a/ACE/tests/Compiler_Features_38_Test.cpp b/ACE/tests/Compiler_Features_38_Test.cpp
index 73c40644253..0d6466479db 100644
--- a/ACE/tests/Compiler_Features_38_Test.cpp
+++ b/ACE/tests/Compiler_Features_38_Test.cpp
@@ -5,22 +5,6 @@
 
 #include "test_config.h"
 
-// g++ 4.1 can't handle this construct
-#if defined (__GNUC__) && (__GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ <= 1))
-# define ACE_DISABLE_TEST
-#endif
-
-// Visual Studio 7.1 can't handle this construct
-#if (_MSC_VER == 1310)
-# define ACE_DISABLE_TEST
-#endif
-
-// Sun Studio 5.13 and older can't handle this construct
-#if defined (__SUNPRO_CC) && (__SUNPRO_CC <= 0x5130)
-# define ACE_DISABLE_TEST
-#endif
-
-#if !defined (ACE_DISABLE_TEST)
 template <typename T>
 class Foo_T
 {
@@ -38,21 +22,18 @@ struct Foo2
   long i;
 };
 typedef Foo_T<Foo2> Foo2Seq;
-#endif /* !ACE_DISABLE_TEST */
 
 int
 run_main (int, ACE_TCHAR *[])
 {
   ACE_START_TEST (ACE_TEXT("Compiler_Features_38_Test"));
 
-#if !defined (ACE_DISABLE_TEST)
   Foo2Seq f2;
-  long const j = f2[0].i;
+  long const j = f2[0L].i;
   ACE_UNUSED_ARG(j);
 
   ACE_DEBUG ((LM_INFO,
               ACE_TEXT ("C++ support ok\n")));
-#endif /* !ACE_DISABLE_TEST */
 
   ACE_END_TEST;
 
-- 
cgit v1.2.1


From 92d0806c151f4be4735a516aecfedd81f3876196 Mon Sep 17 00:00:00 2001
From: Johnny Willemsen <jwillemsen@remedy.nl>
Date: Sun, 18 Mar 2018 10:55:07 +0100
Subject: Remove empty ipp files

    * ACE/ace/XML_Utils/XMLSchema/Traversal.ipp:
    * ACE/ace/XML_Utils/XMLSchema/TypeInfo.ipp:
    * ACE/ace/XML_Utils/XMLSchema/Types.ipp:
    * ACE/ace/XML_Utils/XMLSchema/Writer.ipp:
      Deleted.

    * ACE/ace/XML_Utils/XMLSchema/Traversal.hpp:
    * ACE/ace/XML_Utils/XMLSchema/TypeInfo.hpp:
    * ACE/ace/XML_Utils/XMLSchema/Types.hpp:
    * ACE/ace/XML_Utils/XMLSchema/Writer.hpp:
---
 ACE/ace/XML_Utils/XMLSchema/Traversal.hpp | 2 --
 ACE/ace/XML_Utils/XMLSchema/Traversal.ipp | 9 ---------
 ACE/ace/XML_Utils/XMLSchema/TypeInfo.hpp  | 1 -
 ACE/ace/XML_Utils/XMLSchema/TypeInfo.ipp  | 6 ------
 ACE/ace/XML_Utils/XMLSchema/Types.hpp     | 2 --
 ACE/ace/XML_Utils/XMLSchema/Types.ipp     | 7 -------
 ACE/ace/XML_Utils/XMLSchema/Writer.hpp    | 2 --
 ACE/ace/XML_Utils/XMLSchema/Writer.ipp    | 9 ---------
 8 files changed, 38 deletions(-)
 delete mode 100644 ACE/ace/XML_Utils/XMLSchema/Traversal.ipp
 delete mode 100644 ACE/ace/XML_Utils/XMLSchema/TypeInfo.ipp
 delete mode 100644 ACE/ace/XML_Utils/XMLSchema/Types.ipp
 delete mode 100644 ACE/ace/XML_Utils/XMLSchema/Writer.ipp

diff --git a/ACE/ace/XML_Utils/XMLSchema/Traversal.hpp b/ACE/ace/XML_Utils/XMLSchema/Traversal.hpp
index 970e0a6d3eb..3fc320640ac 100644
--- a/ACE/ace/XML_Utils/XMLSchema/Traversal.hpp
+++ b/ACE/ace/XML_Utils/XMLSchema/Traversal.hpp
@@ -69,6 +69,4 @@ namespace XMLSchema
   }
 }
 
-#include <ace/XML_Utils/XMLSchema/Traversal.ipp>
-
 #endif  // XMLSCHEMA_TRAVERSAL_HPP
diff --git a/ACE/ace/XML_Utils/XMLSchema/Traversal.ipp b/ACE/ace/XML_Utils/XMLSchema/Traversal.ipp
deleted file mode 100644
index c96910a60a5..00000000000
--- a/ACE/ace/XML_Utils/XMLSchema/Traversal.ipp
+++ /dev/null
@@ -1,9 +0,0 @@
-// file      : XMLSchema/Traversal.ipp
-// author    : Boris Kolpackov <boris@dre.vanderbilt.edu>
-
-namespace XMLSchema
-{
-  namespace Traversal
-  {
-  }
-}
diff --git a/ACE/ace/XML_Utils/XMLSchema/TypeInfo.hpp b/ACE/ace/XML_Utils/XMLSchema/TypeInfo.hpp
index 2016982b73b..75da2c30ad6 100644
--- a/ACE/ace/XML_Utils/XMLSchema/TypeInfo.hpp
+++ b/ACE/ace/XML_Utils/XMLSchema/TypeInfo.hpp
@@ -14,7 +14,6 @@ namespace XMLSchema
   };
 }
 
-#include <ace/XML_Utils/XMLSchema/TypeInfo.ipp>
 #include <ace/XML_Utils/XMLSchema/TypeInfo.tpp>
 
 #endif  // XMLSCHEMA_TYPE_INFO_HPP
diff --git a/ACE/ace/XML_Utils/XMLSchema/TypeInfo.ipp b/ACE/ace/XML_Utils/XMLSchema/TypeInfo.ipp
deleted file mode 100644
index 20cce1f97be..00000000000
--- a/ACE/ace/XML_Utils/XMLSchema/TypeInfo.ipp
+++ /dev/null
@@ -1,6 +0,0 @@
-// file      : XMLSchema/TypeInfo.ipp
-// author    : Boris Kolpackov <boris@dre.vanderbilt.edu>
-
-namespace XMLSchema
-{
-}
diff --git a/ACE/ace/XML_Utils/XMLSchema/Types.hpp b/ACE/ace/XML_Utils/XMLSchema/Types.hpp
index 9027786a834..1e947c744ce 100644
--- a/ACE/ace/XML_Utils/XMLSchema/Types.hpp
+++ b/ACE/ace/XML_Utils/XMLSchema/Types.hpp
@@ -662,6 +662,4 @@ namespace XMLSchema
   };
 }
 
-#include "ace/XML_Utils/XMLSchema/Types.ipp"
-
 #endif  // XMLSCHEMA_TYPES_HPP
diff --git a/ACE/ace/XML_Utils/XMLSchema/Types.ipp b/ACE/ace/XML_Utils/XMLSchema/Types.ipp
deleted file mode 100644
index b39e46a39ee..00000000000
--- a/ACE/ace/XML_Utils/XMLSchema/Types.ipp
+++ /dev/null
@@ -1,7 +0,0 @@
-// file      : XMLSchema/Types.ipp
-// author    : Boris Kolpackov <boris@dre.vanderbilt.edu>
-
-namespace XMLSchema
-{
-
-}
diff --git a/ACE/ace/XML_Utils/XMLSchema/Writer.hpp b/ACE/ace/XML_Utils/XMLSchema/Writer.hpp
index 781432b8fda..5a12ce2ff2a 100644
--- a/ACE/ace/XML_Utils/XMLSchema/Writer.hpp
+++ b/ACE/ace/XML_Utils/XMLSchema/Writer.hpp
@@ -151,6 +151,4 @@ namespace XMLSchema
   }
 }
 
-#include <ace/XML_Utils/XMLSchema/Writer.ipp>
-
 #endif  // XMLSCHEMA_WRITER_HPP
diff --git a/ACE/ace/XML_Utils/XMLSchema/Writer.ipp b/ACE/ace/XML_Utils/XMLSchema/Writer.ipp
deleted file mode 100644
index 98078da9298..00000000000
--- a/ACE/ace/XML_Utils/XMLSchema/Writer.ipp
+++ /dev/null
@@ -1,9 +0,0 @@
-// file      : XMLSchema/Writer.ipp
-// author    : Boris Kolpackov <boris@dre.vanderbilt.edu>
-
-namespace XMLSchema
-{
-  namespace Writer
-  {
-  }
-}
-- 
cgit v1.2.1


From 2867697ce480fda37af565f38c729a3dbc13e6ee Mon Sep 17 00:00:00 2001
From: Johnny Willemsen <jwillemsen@remedy.nl>
Date: Wed, 21 Mar 2018 08:30:59 +0100
Subject: Add get_idref that works wit a string&

    * ACE/ace/XML_Utils/XMLSchema/Types.hpp:
    * ACE/ace/XML_Utils/XSCRT/Elements.hpp:
---
 ACE/ace/XML_Utils/XMLSchema/Types.hpp |  2 --
 ACE/ace/XML_Utils/XSCRT/Elements.hpp  | 20 +++++++++++++++-----
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/ACE/ace/XML_Utils/XMLSchema/Types.hpp b/ACE/ace/XML_Utils/XMLSchema/Types.hpp
index 1e947c744ce..966c588fd3e 100644
--- a/ACE/ace/XML_Utils/XMLSchema/Types.hpp
+++ b/ACE/ace/XML_Utils/XMLSchema/Types.hpp
@@ -57,8 +57,6 @@ namespace XMLSchema
     typedef basic_string<C> Base__ ;
 
   public:
-    //    typedef ACE_Refcounted_Auto_Ptr < string, ACE_Null_Mutex > _ptr;
-
     //@@ VC6 does not inject XSCRT::Type into the scope so I have
     //   to qualify it all the time.
     //
diff --git a/ACE/ace/XML_Utils/XSCRT/Elements.hpp b/ACE/ace/XML_Utils/XSCRT/Elements.hpp
index 601e0f9f338..eeda58c424a 100644
--- a/ACE/ace/XML_Utils/XSCRT/Elements.hpp
+++ b/ACE/ace/XML_Utils/XSCRT/Elements.hpp
@@ -213,6 +213,20 @@ namespace XSCRT
       }
     }
 
+    Type* get_idref (const std::basic_string<ACE_TCHAR>& name)
+    {
+      std::map<std::basic_string<ACE_TCHAR>, XSCRT::Type*>::iterator i =
+          this->idref_map_.find(name);
+      if (i != idref_map_.end())
+      {
+        return i->second;
+      }
+      else
+      {
+        return 0;
+      }
+    }
+
     Type* get_idref (const wchar_t *name)
     {
       std::basic_string<ACE_TCHAR> name_string (ACE_TEXT_WCHAR_TO_TCHAR(name));
@@ -228,8 +242,7 @@ namespace XSCRT
       }
     }
 
-
-    void set_idref (std::basic_string<ACE_TCHAR> name, Type* new_idref)
+    void set_idref (const std::basic_string<ACE_TCHAR>& name, Type* new_idref)
     {
       this->idref_map_.insert(std::pair<std::basic_string<ACE_TCHAR>,Type*>(name, new_idref));
       return;
@@ -267,9 +280,6 @@ namespace XSCRT
   public:
     // Trait for marshaling a FundamentalType X
     typedef X CDR_Type__;
-#if !defined (__BORLANDC__) || (__BORLANDC__ >= 0x620)
-    typedef ACE_Refcounted_Auto_Ptr < FundamentalType, ACE_Null_Mutex > _ptr;
-#endif /* !__BORLANDC__ */
 
     FundamentalType ()
     {
-- 
cgit v1.2.1


From 4e39b7db8eed8cddbb4ec1a97ae2870f842f7976 Mon Sep 17 00:00:00 2001
From: Johnny Willemsen <jwillemsen@remedy.nl>
Date: Wed, 21 Mar 2018 11:22:24 +0100
Subject: Documentation improvements

    * ACE/docs/index.html:
    * ACE/docs/msvc_notes.txt:
---
 ACE/docs/index.html     | 8 ++++----
 ACE/docs/msvc_notes.txt | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/ACE/docs/index.html b/ACE/docs/index.html
index fde8d24d2ec..fac33571284 100644
--- a/ACE/docs/index.html
+++ b/ACE/docs/index.html
@@ -19,12 +19,12 @@ ask. <P>
 <h3>ACE Documentation</h3>
 
 <ul>
-  <li><a href="http://www.cs.wustl.edu/~schmidt/ACE-overview.html">Overview of ACE</a> -
+  <li><a href="http://www.dre.vanderbilt.edu/~schmidt/ACE-overview.html">Overview of ACE</a> -
       a high-level view.
   <li><A
-      HREF="http://www.cs.wustl.edu/~schmidt/ACE-documentation.html">ACE online documentation</a>.
+      HREF="http://www.dre.vanderbilt.edu/~schmidt/ACE-documentation.html">ACE online documentation</a>.
   <li><A
-  <LI><A HREF="http://www.cs.wustl.edu/~schmidt/ACE/">Books on ACE</A>.
+  <LI><A HREF="http://www.dre.vanderbilt.edu/~schmidt/ACE/">Books on ACE</A>.
 </ul>
 
 <hr>
@@ -43,7 +43,7 @@ ask. <P>
 <h3>Technical Papers and Tutorials</h3>
 
 <ul>
-  <li><a href="http://www.cs.wustl.edu/~schmidt/ACE-papers.html">Technical Papers</a> -
+  <li><a href="http://www.dre.vanderbilt.edu/ACE-papers.html">Technical Papers</a> -
       Postscript versions of many ACE papers.
   <li>Tutorial on C++ Network Programming with Patterns, Frameworks, and ACE<a href="http://www.cs.wustl.edu/~schmidt/PDF/ACE-tutorial.pdf">[pdf]</a>
       <a href="http://www.cs.wustl.edu/~schmidt/ACE-tutorial.ps.gz">[ps.gz]</a>
diff --git a/ACE/docs/msvc_notes.txt b/ACE/docs/msvc_notes.txt
index 6594fa079fc..65a48f01292 100644
--- a/ACE/docs/msvc_notes.txt
+++ b/ACE/docs/msvc_notes.txt
@@ -14,7 +14,7 @@ main two are Debug and Release.  Debug produces libraries and
 executables with debugging symbols and doesn't enable inlining.  The
 Release configuration enables optimizations and leaves out debugging
 symbols.  All projects contain both configurations. If you want to
-build static or mfc versions of th elibrary you need to use different
+build static or mfc versions of the library you need to use different
 project and solution files. Project files with _Static extension
 denote workspaces for building static libraries.
 
@@ -131,4 +131,4 @@ required.  One thing you might notice is that TAO_IDL will display a message
 if ACE_ROOT isn't set, but it is only a problem if the IDL file includes
 <orb.idl> and you don't use -I to specify where orb.idl is.
 
-*/
\ No newline at end of file
+*/
-- 
cgit v1.2.1


From c3ba4e68c86219610841d08d0506c8bbd66c3034 Mon Sep 17 00:00:00 2001
From: Johnny Willemsen <jwillemsen@remedy.nl>
Date: Sun, 25 Mar 2018 18:26:25 +0200
Subject: Minor improvements to the XML utils classes

    * ACE/ace/UUID.h:
    * ACE/ace/XML_Utils/XMLSchema/id_map.hpp:
    * ACE/ace/XML_Utils/XSCRT/Elements.hpp:
---
 ACE/ace/UUID.h                         |  2 +-
 ACE/ace/XML_Utils/XMLSchema/id_map.hpp | 26 ++++++++++----------------
 ACE/ace/XML_Utils/XSCRT/Elements.hpp   | 18 ++++++------------
 3 files changed, 17 insertions(+), 29 deletions(-)

diff --git a/ACE/ace/UUID.h b/ACE/ace/UUID.h
index 1e9671214d1..5ed3877da89 100644
--- a/ACE/ace/UUID.h
+++ b/ACE/ace/UUID.h
@@ -267,7 +267,7 @@ namespace ACE_Utils
 
     bool destroy_lock_;
 
-    /// Initalization state of the generator.
+    /// Initialization state of the generator.
     bool is_init_;
   };
 
diff --git a/ACE/ace/XML_Utils/XMLSchema/id_map.hpp b/ACE/ace/XML_Utils/XMLSchema/id_map.hpp
index 6cdcbe45a13..559d461665f 100644
--- a/ACE/ace/XML_Utils/XMLSchema/id_map.hpp
+++ b/ACE/ace/XML_Utils/XMLSchema/id_map.hpp
@@ -89,7 +89,6 @@
       {
         throw NULL_PTR_Entry();
       }
-        return;
     }
 
     // Add an IDREF to the IDREF map
@@ -103,7 +102,6 @@
       {
         throw NULL_PTR_Entry();
       }
-      return;
     }
 
     void resolve_single_idref (const std::basic_string<ACE_TCHAR>& idref, ::XSCRT::Type * element)
@@ -124,27 +122,23 @@
     //Note: The pointer is of type "XSCRT::Type*"
     void resolve_idref ( void )
     {
-      //Declare iterators to navigate the maps
-      ID_Map::id_iterator id_iterator;
-      ID_Map::idref_iterator idref_iterator;
-
-      for (idref_iterator = this->idref_map_.begin();
+      // Declare iterators to navigate the maps
+      for (ID_Map::idref_iterator idref_iterator = this->idref_map_.begin();
            idref_iterator != this->idref_map_.end();
            ++idref_iterator)
       {
         //Find the ID that matches the IDREF element
-        id_iterator = this->id_map_.find(idref_iterator->first);
+        ID_Map::id_iterator id_iterator = this->id_map_.find(idref_iterator->first);
         if (id_iterator != this->id_map_.end())
         {
-          //Add the IDREF identifier and the reference to the
-          //identified object
+          // Add the IDREF identifier and the reference to the
+          // identified object
           std::basic_string<ACE_TCHAR> temp_id = id_iterator->first;
           idref_iterator->second->set_idref(temp_id, id_iterator->second);
         }
         else
         {
-          std::basic_string<ACE_TCHAR> temp (idref_iterator->first);
-          throw Unresolved_IDREF(temp);
+          throw Unresolved_IDREF(idref_iterator->first);
         }
       }
     }
@@ -156,11 +150,11 @@
     }
 
     private:
-    //id_map_: maps the ID string to the element with the
-    //         ID attribute
+    /// Maps the ID string to the element with the
+    /// ID attribute
     ID_MAP id_map_;
-    //idref_map_: multimap that maps the IDREF string to the
-    //            element with the IDREF attribute
+    /// Multimap that maps the IDREF string to the
+    /// element with the IDREF attribute
     IDREF_MAP idref_map_;
   };
 
diff --git a/ACE/ace/XML_Utils/XSCRT/Elements.hpp b/ACE/ace/XML_Utils/XSCRT/Elements.hpp
index eeda58c424a..9c60b881c36 100644
--- a/ACE/ace/XML_Utils/XSCRT/Elements.hpp
+++ b/ACE/ace/XML_Utils/XSCRT/Elements.hpp
@@ -28,7 +28,6 @@ namespace XSCRT
   class Type
   {
   public:
-
     virtual ~Type (void)
     {
     }
@@ -152,8 +151,7 @@ namespace XSCRT
         map_ = std::auto_ptr<Map_> (new Map_);
       }
 
-      if (!map_->insert (
-            std::pair<IdentityProvider const*, Type*> (&id, t)).second)
+      if (!map_->insert (std::pair<IdentityProvider const*, Type*> (&id, t)).second)
       {
         throw 1;
       }
@@ -197,12 +195,11 @@ namespace XSCRT
       return 0;
     }
 
-    //Get and set methods for the idref_map_ data member
+    /// Get and set methods for the idref_map_ data member
     Type* get_idref (const char* name)
     {
       std::basic_string<ACE_TCHAR> name_string (ACE_TEXT_CHAR_TO_TCHAR(name));
-      std::map<std::basic_string<ACE_TCHAR>, XSCRT::Type*>::iterator i =
-          this->idref_map_.find(name_string);
+      std::map<std::basic_string<ACE_TCHAR>, XSCRT::Type*>::iterator i = this->idref_map_.find(name_string);
       if (i != idref_map_.end())
       {
         return i->second;
@@ -215,8 +212,7 @@ namespace XSCRT
 
     Type* get_idref (const std::basic_string<ACE_TCHAR>& name)
     {
-      std::map<std::basic_string<ACE_TCHAR>, XSCRT::Type*>::iterator i =
-          this->idref_map_.find(name);
+      std::map<std::basic_string<ACE_TCHAR>, XSCRT::Type*>::iterator i = this->idref_map_.find(name);
       if (i != idref_map_.end())
       {
         return i->second;
@@ -230,8 +226,7 @@ namespace XSCRT
     Type* get_idref (const wchar_t *name)
     {
       std::basic_string<ACE_TCHAR> name_string (ACE_TEXT_WCHAR_TO_TCHAR(name));
-      std::map<std::basic_string<ACE_TCHAR>, XSCRT::Type*>::iterator i =
-          this->idref_map_.find(name_string);
+      std::map<std::basic_string<ACE_TCHAR>, XSCRT::Type*>::iterator i = this->idref_map_.find(name_string);
       if (i != idref_map_.end())
       {
         return i->second;
@@ -245,12 +240,11 @@ namespace XSCRT
     void set_idref (const std::basic_string<ACE_TCHAR>& name, Type* new_idref)
     {
       this->idref_map_.insert(std::pair<std::basic_string<ACE_TCHAR>,Type*>(name, new_idref));
-      return;
     }
 
   private:
 
-    //Data member to handle unbounded IDREF attributes and elements
+    // Data member to handle unbounded IDREF attributes and elements
     std::map<std::basic_string<ACE_TCHAR>, XSCRT::Type*> idref_map_;
 
     Type* container_;
-- 
cgit v1.2.1


From 9850ed266139718f636331a75db49f9605b62e6a Mon Sep 17 00:00:00 2001
From: Johnny Willemsen <jwillemsen@remedy.nl>
Date: Sun, 25 Mar 2018 20:36:36 +0200
Subject: Remove workarounds for vc6 and old gcc versions

    * ACE/ace/XML_Utils/XSCRT/Elements.hpp:
---
 ACE/ace/XML_Utils/XSCRT/Elements.hpp | 138 -----------------------------------
 1 file changed, 138 deletions(-)

diff --git a/ACE/ace/XML_Utils/XSCRT/Elements.hpp b/ACE/ace/XML_Utils/XSCRT/Elements.hpp
index 9c60b881c36..dcf8844eb65 100644
--- a/ACE/ace/XML_Utils/XSCRT/Elements.hpp
+++ b/ACE/ace/XML_Utils/XSCRT/Elements.hpp
@@ -322,13 +322,6 @@ namespace XSCRT
     X x_;
   };
 
-#if !((defined (__GNUC__) && (__GNUC__ == 3 && (__GNUC_MINOR__ < 3))) || \
- (defined (__BORLANDC__) && (__BORLANDC__ < 0x620)) || \
- (defined (__SUNPRO_CC) && (__SUNPRO_CC <= 0x5100)))
-
-  // Stuff for normal compilers.
-  //
-
   // Specialization for `signed char'
   //
   //
@@ -395,137 +388,6 @@ namespace XSCRT
     x_ = static_cast<unsigned char> (t);
   }
 
-#else
-
-  // Stuff for broken VC6 & gcc < 3.3. Don't like what you see - use better
-  // compiler!
-  //
-
-  // Specialization for signed char.
-  //
-  template <>
-  class FundamentalType<signed char> : public Type
-  {
-  public:
-    FundamentalType ()
-    {
-    }
-
-    template<typename C>
-    FundamentalType (XML::Element<C> const& e)
-    {
-      std::basic_stringstream<C> s;
-      s << e.value ();
-
-      short t;
-      s >> t;
-
-      x_ = static_cast<signed char> (t);
-    }
-
-    template<typename C>
-    FundamentalType (XML::Attribute<C> const& a)
-    {
-      std::basic_stringstream<C> s;
-      s << a.value ();
-
-      short t;
-      s >> t;
-
-      x_ = static_cast<signed char> (t);
-    }
-
-    FundamentalType (signed char const& x)
-        : x_ (x)
-    {
-    }
-
-    FundamentalType&
-    operator= (signed char const& x)
-    {
-      x_ = x;
-      return *this;
-    }
-
-  public:
-    operator signed char const& () const
-    {
-      return x_;
-    }
-
-    operator signed char& ()
-    {
-      return x_;
-    }
-
-  protected:
-    signed char x_;
-  };
-
-  // Specialization for unsigned char.
-  //
-  template <>
-  class FundamentalType<unsigned char> : public Type
-  {
-  public:
-    FundamentalType ()
-    {
-    }
-
-    template<typename C>
-    FundamentalType (XML::Element<C> const& e)
-    {
-      std::basic_stringstream<C> s;
-      s << e.value ();
-
-      unsigned short t;
-      s >> t;
-
-      x_ = static_cast<unsigned char> (t);
-    }
-
-    template<typename C>
-    FundamentalType (XML::Attribute<C> const& a)
-    {
-      std::basic_stringstream<C> s;
-      s << a.value ();
-
-      unsigned short t;
-      s >> t;
-
-      x_ = static_cast<unsigned char> (t);
-    }
-
-    FundamentalType (unsigned char const& x)
-        : x_ (x)
-    {
-    }
-
-    FundamentalType&
-    operator= (unsigned char const& x)
-    {
-      x_ = x;
-      return *this;
-    }
-
-  public:
-    operator unsigned char const& () const
-    {
-      return x_;
-    }
-
-    operator unsigned char& ()
-    {
-      return x_;
-    }
-
-  protected:
-    unsigned char x_;
-  };
-
-#endif
-
-
   // Specialization for bool.
   //
   //
-- 
cgit v1.2.1


From 1d3807c4da1e3cadf16b71192d2e41fac3488814 Mon Sep 17 00:00:00 2001
From: David Ward <david.ward@ll.mit.edu>
Date: Sun, 25 Mar 2018 19:03:15 -0400
Subject: Explicitly require Data::Dumper Perl module to build RPM packages

In Fedora, this Perl module is located in a separate package that
may not be installed automatically in a minimal build environment
(for example, when building packages with Mock [1]). This module
is used by MPC during the build.

This change adds the virtual package name "perl(Data::Dumper)" to
the BuildRequires: tag, which ensures that the package containing
this module is installed for any RPM-based distribution. This was
tested with the openSUSE Build Service.

[1]: https://github.com/rpm-software-management/mock/wiki
---
 ACE/rpmbuild/ace-tao.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ACE/rpmbuild/ace-tao.spec b/ACE/rpmbuild/ace-tao.spec
index a91db76813a..de43de6d99a 100644
--- a/ACE/rpmbuild/ace-tao.spec
+++ b/ACE/rpmbuild/ace-tao.spec
@@ -112,7 +112,7 @@ BuildRequires:  zlib-devel
 BuildRequires:  bzip2
 %endif
 
-BuildRequires:  perl
+BuildRequires:  perl perl(Data::Dumper)
 
 %if %{?_with_fltk:1}%{!?_with_fltk:0}
 BuildRequires:  fltk-devel
-- 
cgit v1.2.1


From 9910eb31a3e742a9734b526b27370cc8280a1ac8 Mon Sep 17 00:00:00 2001
From: David Ward <david.ward@ll.mit.edu>
Date: Sun, 25 Mar 2018 19:03:25 -0400
Subject: Improve test for RHEL or CentOS in RPM packaging

The %{rhel_version} and %{centos_version} RPM macros are specific
to the openSUSE Build Service. Use the %{rhel} macro to test for
these distributions instead, which supports local builds.
---
 ACE/rpmbuild/ace-tao.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ACE/rpmbuild/ace-tao.spec b/ACE/rpmbuild/ace-tao.spec
index de43de6d99a..e7cd5110617 100644
--- a/ACE/rpmbuild/ace-tao.spec
+++ b/ACE/rpmbuild/ace-tao.spec
@@ -83,7 +83,7 @@ BuildRoot:    %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %define _extension .gz
 
-%if 0%{?fedora} || 0%{?rhel_version} || 0%{?centos_version}
+%if 0%{?fedora} || 0%{?rhel}
 BuildRequires: redhat-rpm-config elfutils sendmail
 %endif
 
-- 
cgit v1.2.1


From 4ad608f47c5b15468dee6384823312a9425b4e44 Mon Sep 17 00:00:00 2001
From: David Ward <david.ward@ll.mit.edu>
Date: Sun, 25 Mar 2018 19:03:34 -0400
Subject: Remove unused file ACE/rpmbuild/ace-tao-macros.patch

---
 ACE/rpmbuild/ace-tao-macros.patch | 59 ---------------------------------------
 1 file changed, 59 deletions(-)
 delete mode 100644 ACE/rpmbuild/ace-tao-macros.patch

diff --git a/ACE/rpmbuild/ace-tao-macros.patch b/ACE/rpmbuild/ace-tao-macros.patch
deleted file mode 100644
index ca494dfa5c4..00000000000
--- a/ACE/rpmbuild/ace-tao-macros.patch
+++ /dev/null
@@ -1,59 +0,0 @@
---- ACE_wrappers/include/makeinclude/wrapper_macros.GNU.ORIG	2008-11-18 16:12:14.000000000 -0800
-+++ ACE_wrappers/include/makeinclude/wrapper_macros.GNU	2008-11-23 10:16:32.000000000 -0800
-@@ -299,13 +299,13 @@
- 
- #### Set up the build ACE version in case the platform_macros.GNU wants it.
- ifeq (cmd,$(findstring cmd,$(SHELL)))
--ACE_MAJOR_VERSION := $(shell awk "/ACE_MAJOR_VERSION/ { print $$3}" ${ACE_ROOT}/ace/Version.h)
--ACE_MINOR_VERSION := $(shell awk "/ACE_MINOR_VERSION/ { print $$3}" ${ACE_ROOT}/ace/Version.h)
--ACE_BETA_VERSION := $(shell awk "/ACE_BETA_VERSION/ { print $$3}" ${ACE_ROOT}/ace/Version.h)
--else
--ACE_MAJOR_VERSION := $(shell awk '/ACE_MAJOR_VERSION/ { print $$3}' ${ACE_ROOT}/ace/Version.h)
--ACE_MINOR_VERSION := $(shell awk '/ACE_MINOR_VERSION/ { print $$3}' ${ACE_ROOT}/ace/Version.h)
--ACE_BETA_VERSION := $(shell awk '/ACE_BETA_VERSION/ { print $$3}' ${ACE_ROOT}/ace/Version.h)
-+ACE_MAJOR_VERSION := $(shell awk "/ACE_MAJOR_VERSION/ { print $$3}" ${ACE_ROOT}/include/ace/Version.h)
-+ACE_MINOR_VERSION := $(shell awk "/ACE_MINOR_VERSION/ { print $$3}" ${ACE_ROOT}/include/ace/Version.h)
-+ACE_BETA_VERSION := $(shell awk "/ACE_BETA_VERSION/ { print $$3}" ${ACE_ROOT}/include/ace/Version.h)
-+else
-+ACE_MAJOR_VERSION := $(shell awk '/ACE_MAJOR_VERSION/ { print $$3}' ${ACE_ROOT}/include/ace/Version.h)
-+ACE_MINOR_VERSION := $(shell awk '/ACE_MINOR_VERSION/ { print $$3}' ${ACE_ROOT}/include/ace/Version.h)
-+ACE_BETA_VERSION := $(shell awk '/ACE_BETA_VERSION/ { print $$3}' ${ACE_ROOT}/include/ace/Version.h)
- endif
- 
- # Define some variables to silence warnings
-@@ -381,9 +381,11 @@
- IDL_SERVER_TSRC_EXT ?= S_T.cpp
- 
- ifeq (,$(findstring -I$(ACE_ROOT),$(INCLDIRS)))
--  INCLDIRS        += -I$(ACE_ROOT)
-+ifneq ("$(ACE_ROOT)","/usr")
-+  INCLDIRS        += -I$(ACE_ROOT)/include
- endif
--INSINC          ?= $(ACE_ROOT)/ace
-+endif
-+INSINC          ?= $(ACE_ROOT)/include/ace
- INSLIB          ?= $(ACE_ROOT)/lib
- INSMAN          ?= $(ACE_ROOT)/man
- ifeq (,$(findstring -L$(INSLIB),$(LDFLAGS)))
---- ACE_wrappers/TAO/rules.tao.GNU.ORIG	2008-11-23 10:13:02.000000000 -0800
-+++ ACE_wrappers/TAO/rules.tao.GNU	2008-11-22 20:43:49.000000000 -0800
-@@ -138,13 +138,13 @@
- # with different minor or major or beta versions to fail.
- #
- ifeq (cmd,$(findstring cmd,$(SHELL)))
--TAO_MAJOR_VERSION := $(shell awk "/TAO_MAJOR_VERSION/ { print $$3}" ${TAO_ROOT}/tao/Version.h)
--TAO_MINOR_VERSION := $(shell awk "/TAO_MINOR_VERSION/ { print $$3}" ${TAO_ROOT}/tao/Version.h)
--TAO_BETA_VERSION := $(shell awk "/TAO_BETA_VERSION/ { print $$3}" ${TAO_ROOT}/tao/Version.h)
-+TAO_MAJOR_VERSION := $(shell awk "/TAO_MAJOR_VERSION/ { print $$3}" ${TAO_ROOT}/include/tao/Version.h)
-+TAO_MINOR_VERSION := $(shell awk "/TAO_MINOR_VERSION/ { print $$3}" ${TAO_ROOT}/include/tao/Version.h)
-+TAO_BETA_VERSION := $(shell awk "/TAO_BETA_VERSION/ { print $$3}" ${TAO_ROOT}/include/tao/Version.h)
- else
--TAO_MAJOR_VERSION := $(shell awk '/TAO_MAJOR_VERSION/ { print $$3}' ${TAO_ROOT}/tao/Version.h)
--TAO_MINOR_VERSION := $(shell awk '/TAO_MINOR_VERSION/ { print $$3}' ${TAO_ROOT}/tao/Version.h)
--TAO_BETA_VERSION := $(shell awk '/TAO_BETA_VERSION/ { print $$3}' ${TAO_ROOT}/tao/Version.h)
-+TAO_MAJOR_VERSION := $(shell awk '/TAO_MAJOR_VERSION/ { print $$3}' ${TAO_ROOT}/include/tao/Version.h)
-+TAO_MINOR_VERSION := $(shell awk '/TAO_MINOR_VERSION/ { print $$3}' ${TAO_ROOT}/include/tao/Version.h)
-+TAO_BETA_VERSION := $(shell awk '/TAO_BETA_VERSION/ { print $$3}' ${TAO_ROOT}/include/tao/Version.h)
- endif
- # Version number of the libraries
- #
-- 
cgit v1.2.1


From be271a0a0fd77a77cbfd35c989abdbb84bd537d4 Mon Sep 17 00:00:00 2001
From: David Ward <david.ward@ll.mit.edu>
Date: Sun, 25 Mar 2018 19:03:44 -0400
Subject: Synchronize ACE/debian with contents of Debian source repository

Incorporate changes from the Debian source repository [1], but keep
the package version current (and where the package version is wrong,
correct it). Also fix corrupted version checks for external package
dependencies.

This does not introduce additional scripts from the repository that
are unused when building packages.

[1]: git://anonscm.debian.org/pkg-ace/pkg-ace.git
---
 ACE/debian/ACE-DPKG.mwc                            |   29 +
 ACE/debian/TOREMOVE                                |   25 -
 ACE/debian/ace-netsvcs.doc-base                    |   10 +
 ACE/debian/ace-netsvcs.docs                        |    3 +
 ACE/debian/ace-netsvcs.install                     |    2 +
 ACE/debian/ace-netsvcs.manpages                    |    1 +
 ACE/debian/ace.dsc                                 |   10 -
 ACE/debian/changelog                               | 1324 ++++++++++++++++++++
 ACE/debian/control                                 |  367 ++++++
 ACE/debian/debian.changelog                        | 1324 --------------------
 ACE/debian/debian.compat                           |    1 -
 ACE/debian/debian.control                          |  367 ------
 ACE/debian/debian.rules                            |  118 --
 ACE/debian/get-orig-source.sh                      |   33 +
 ACE/debian/libace-6.4.7.lintian-overrides          |   12 +-
 .../libace-flreactor-6.4.7.lintian-overrides       |    2 +-
 .../libace-foxreactor-6.4.7.lintian-overrides      |    2 +-
 ACE/debian/libace-htbp-6.4.7.lintian-overrides     |    2 +-
 ACE/debian/libace-inet-6.4.7.lintian-overrides     |    4 +-
 ACE/debian/libace-inet-ssl-6.4.7.lintian-overrides |    4 +-
 ACE/debian/libace-qtreactor-6.4.7.install          |    1 -
 .../libace-qtreactor-6.4.7.lintian-overrides       |    1 -
 ACE/debian/libace-qtreactor-dev.install            |    3 -
 ACE/debian/libace-qtreactor-dev.lintian-overrides  |    1 -
 ACE/debian/libace-rmcast-6.4.7.lintian-overrides   |    2 +-
 ACE/debian/libace-ssl-6.4.7.lintian-overrides      |    6 +-
 .../libace-tkreactor-6.4.7.lintian-overrides       |    2 +-
 ACE/debian/libace-tmcast-6.4.7.lintian-overrides   |    2 +-
 .../libace-xml-utils-6.4.7.lintian-overrides       |    2 +-
 .../libace-xtreactor-6.4.7.lintian-overrides       |    2 +-
 ACE/debian/libacexml-6.4.7.lintian-overrides       |    6 +-
 ACE/debian/libkokyu-6.4.7.lintian-overrides        |    2 +-
 ACE/debian/libnetsvcs-6.4.7.lintian-overrides      |    2 +-
 ACE/debian/rules                                   |  115 ++
 ACE/debian/source/format                           |    1 +
 ACE/debian/source/lintian-overrides                |    3 +
 36 files changed, 1914 insertions(+), 1877 deletions(-)
 create mode 100644 ACE/debian/ACE-DPKG.mwc
 delete mode 100644 ACE/debian/TOREMOVE
 create mode 100644 ACE/debian/ace-netsvcs.doc-base
 create mode 100644 ACE/debian/ace-netsvcs.docs
 create mode 100644 ACE/debian/ace-netsvcs.install
 create mode 100644 ACE/debian/ace-netsvcs.manpages
 delete mode 100644 ACE/debian/ace.dsc
 create mode 100644 ACE/debian/changelog
 create mode 100644 ACE/debian/control
 delete mode 100644 ACE/debian/debian.changelog
 delete mode 100644 ACE/debian/debian.compat
 delete mode 100644 ACE/debian/debian.control
 delete mode 100644 ACE/debian/debian.rules
 create mode 100755 ACE/debian/get-orig-source.sh
 delete mode 100644 ACE/debian/libace-qtreactor-6.4.7.install
 delete mode 100644 ACE/debian/libace-qtreactor-6.4.7.lintian-overrides
 delete mode 100644 ACE/debian/libace-qtreactor-dev.install
 delete mode 100644 ACE/debian/libace-qtreactor-dev.lintian-overrides
 create mode 100755 ACE/debian/rules
 create mode 100644 ACE/debian/source/format
 create mode 100644 ACE/debian/source/lintian-overrides

diff --git a/ACE/debian/ACE-DPKG.mwc b/ACE/debian/ACE-DPKG.mwc
new file mode 100644
index 00000000000..b7e05296932
--- /dev/null
+++ b/ACE/debian/ACE-DPKG.mwc
@@ -0,0 +1,29 @@
+workspace {
+  exclude {
+    performance-tests
+
+    examples
+    ACEXML/examples
+    ASNMP
+
+    tests
+    Kokyu/tests
+    ACEXML/tests
+    apps/gperf/tests
+    apps/drwho
+    apps/Gateway
+    apps/AWS
+    apps/JAWS
+    apps/JAWS2
+    apps/JAWS3
+    apps/mkcsregdb
+    apps/soreduce
+
+    websvcs
+    contrib
+    protocols/tests
+    protocols/examples
+
+    netsvcs/clients
+  }
+}
diff --git a/ACE/debian/TOREMOVE b/ACE/debian/TOREMOVE
deleted file mode 100644
index b2ceb242f5a..00000000000
--- a/ACE/debian/TOREMOVE
+++ /dev/null
@@ -1,25 +0,0 @@
-TAO/orbsvcs/orbsvcs/LB_ORTS.cpp
-TAO/orbsvcs/orbsvcs/SecurityLevel3S.cpp
-TAO/orbsvcs/orbsvcs/SecurityLevel3S.h
-TAO/orbsvcs/orbsvcs/RtecEventCommS.inl
-TAO/orbsvcs/orbsvcs/RtecUDPAdminS_T.h
-TAO/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.h
-TAO/orbsvcs/orbsvcs/RtecEventCommS.cpp
-TAO/orbsvcs/orbsvcs/GSSUPS.cpp
-TAO/orbsvcs/orbsvcs/RtecEventChannelAdminS.inl
-TAO/orbsvcs/orbsvcs/GSSUPS.h
-TAO/orbsvcs/orbsvcs/RtecDefaultEventDataS.h
-TAO/orbsvcs/orbsvcs/RtecEventCommS.h
-TAO/orbsvcs/orbsvcs/RtecUDPAdminS.cpp
-TAO/orbsvcs/orbsvcs/RtecEventChannelAdminS.cpp
-TAO/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.h
-TAO/orbsvcs/orbsvcs/RtecDefaultEventDataS.inl
-TAO/orbsvcs/orbsvcs/CSIIOPS.cpp
-TAO/orbsvcs/orbsvcs/RtecEventChannelAdminS.h
-TAO/orbsvcs/orbsvcs/RtecUDPAdminS.inl
-TAO/orbsvcs/orbsvcs/RtecEventCommS_T.h
-TAO/orbsvcs/orbsvcs/CSIIOPS.h
-TAO/orbsvcs/orbsvcs/RtecDefaultEventDataS.cpp
-TAO/orbsvcs/orbsvcs/CSIS.h
-TAO/orbsvcs/orbsvcs/CSIS.cpp
-TAO/orbsvcs/orbsvcs/RtecUDPAdminS.h
diff --git a/ACE/debian/ace-netsvcs.doc-base b/ACE/debian/ace-netsvcs.doc-base
new file mode 100644
index 00000000000..9e20176dac6
--- /dev/null
+++ b/ACE/debian/ace-netsvcs.doc-base
@@ -0,0 +1,10 @@
+Document: ace-netsvcs
+Title: ACE network services
+Author: Douglas C. Schmidt and his research group
+Abstract: This document describes the ACE network services: naming, time,
+ token, and logging services.
+Section: Programming/C++
+
+Format: html
+Index: /usr/share/doc/ace-netsvcs/ACE-netsvcs.html
+Files: /usr/share/doc/ace-netsvcs/*.html
diff --git a/ACE/debian/ace-netsvcs.docs b/ACE/debian/ace-netsvcs.docs
new file mode 100644
index 00000000000..307913e25f2
--- /dev/null
+++ b/ACE/debian/ace-netsvcs.docs
@@ -0,0 +1,3 @@
+PROBLEM-REPORT-FORM
+netsvcs/servers/README
+netsvcs/ACE-netsvcs.html
diff --git a/ACE/debian/ace-netsvcs.install b/ACE/debian/ace-netsvcs.install
new file mode 100644
index 00000000000..61f06619abb
--- /dev/null
+++ b/ACE/debian/ace-netsvcs.install
@@ -0,0 +1,2 @@
+../../netsvcs/servers/ace_netsvcs usr/bin
+../../netsvcs/servers/svc.conf* usr/share/ace-netsvcs
diff --git a/ACE/debian/ace-netsvcs.manpages b/ACE/debian/ace-netsvcs.manpages
new file mode 100644
index 00000000000..43bf0f7a731
--- /dev/null
+++ b/ACE/debian/ace-netsvcs.manpages
@@ -0,0 +1 @@
+debian/ace_netsvcs.1
diff --git a/ACE/debian/ace.dsc b/ACE/debian/ace.dsc
deleted file mode 100644
index 5e386aaf397..00000000000
--- a/ACE/debian/ace.dsc
+++ /dev/null
@@ -1,10 +0,0 @@
-Format: 1.0
-Source: ACE+src-6.4.7
-Version: 2.4.7
-Binary: ace
-Maintainer: Johnny Willemsen  <jwillemsen@remedy.nl>
-Architecture: any
-Build-Depends: gcc, make, g++, debhelper (>= 5), dpkg-dev, libssl-dev (>= 0.9.7d), dpatch (>= 2.0.10), libxt-dev (>= 4.3.0), libfltk1.1-dev (>= 1.1.4), libqt4-dev (>= 4.4~rc1-4), tk-dev, docbook-to-man, autoconf, automake, libtool, autotools-dev, doxygen, graphviz, libfox-1.6-dev
-Files:
- 65b34001c9605f056713a7e146b052d1 46346654 ACE-src-6.4.7.tar.gz
-
diff --git a/ACE/debian/changelog b/ACE/debian/changelog
new file mode 100644
index 00000000000..ed34c59f384
--- /dev/null
+++ b/ACE/debian/changelog
@@ -0,0 +1,1324 @@
+ace (6.4.5+dfsg-1) unstable; urgency=medium
+
+  [ Johnny Willemsen ]
+  * New upstream version:
+    - fixes FTBFS with GCC-7. Closes: #853299.
+    - can use openssl 1.1. Closes: #851424.
+    - fixes GNU/FreeBSD FTBFS. Closes: #823592.
+  * Cleanup packaging:
+    - re-enable PIE. Closes: #859350.
+    - remove Marek from uploaders.
+
+  [ Thomas Girard ]
+  * Remove Pau from uploaders.
+  * Fix repackaging process by removing bashism.
+  * Remove QtReactor until it gets ported to Qt5. Closes: #874813.
+  * Remove d/p/37-remove-google-tracking.diff, no longer needed.
+  * Bump Standards-Version: to 4.1.0.
+
+ -- Thomas Girard <thomas.g.girard@free.fr>  Sat, 16 Sep 2017 17:29:35 +0200
+
+ace (6.3.3+dfsg-1.2) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Build against libssl1.0.2 (Closes: #828229).
+  * Merge build-indep rules into build-arch rules so it builds with -A as it
+    did before (Closes: #806602).
+
+ -- Sebastian Andrzej Siewior <sebastian@breakpoint.cc>  Sat, 14 Jan 2017 13:47:41 +0000
+
+ace (6.3.3+dfsg-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix FTBFS in kfreebsd.  Closes: #825709
+
+ -- Mattia Rizzolo <mattia@debian.org>  Fri, 01 Jul 2016 05:43:35 +0000
+
+ace (6.3.3+dfsg-1) unstable; urgency=medium
+
+  [ Pau Garcia i Quiles ]
+  * New upstream version
+
+  [ Peter Michael Green ]
+  * Add patch to remove use of sslv3 methods which are no longer provided by
+    the Debian openssl package.
+
+  [ Thomas Girard ]
+  * Integrate fix from Kurt Roeckx <kurt@roeckx.be> thru patch from
+    Peter Michael Green <plugwash@raspbian.org> to remove use of sslv3.
+    Thanks to both of them. Closes: #804326.
+
+ -- Thomas Girard <thomas.g.girard@free.fr>  Sun, 15 Nov 2015 11:30:34 +0100
+
+ace (6.3.2+dfsg-1) unstable; urgency=medium
+
+  * New upstream version
+  * Use new ChangeLog filename and location instead of the old
+    <root>/ChangeLog
+  * Update get-orig-source.sh to remove .gitignore files (reported upstream)
+  * Delete stale doxygen_sqlite3.db file left by recent versions of Doxygen
+  * Update standards to 3.9.6.1 (no changes needed)
+
+ -- Pau Garcia i Quiles <pgquiles@elpauer.org>  Thu, 02 Jul 2015 21:53:49 +0200
+
+ace (6.3.0+dfsg-1) UNRELEASED; urgency=medium
+
+  * New upstream version
+  * Update standards to 3.9.6.0 (no changes needed)
+
+ -- Pau Garcia i Quiles <pgquiles@elpauer.org>  Sat, 15 Nov 2014 01:47:59 +0100
+
+ace (6.2.8+dfsg-1) unstable; urgency=medium
+
+  * New upstream version
+  * Drop patch 25-versioned_so.diff (applied upstream)
+  * Drop patch 36-fix-typos.diff (applied upstream)
+  * Drop patch 38-fix-predictable-filename-in-tmp.diff (applied upstream)
+  * Drop patch largefile.diff (applied upstream)
+
+ -- Pau Garcia i Quiles <pgquiles@elpauer.org>  Wed, 01 Oct 2014 19:27:00 +0200
+
+ace (6.2.7+dfsg-2) unstable; urgency=medium
+
+  * Add patch 38-fix-predictable-filename-in-tmp. Closes: #760709
+
+ -- Pau Garcia i Quiles <pgquiles@elpauer.org>  Sun, 07 Sep 2014 14:35:23 +0200
+
+ace (6.2.7+dfsg-1) unstable; urgency=low
+
+  [ Johnny Willemsen ]
+  * New upstream release. Closes: #746825, #724774, #734393
+
+  [ Pau Garcia i Quiles ]
+  * Enable hardening
+  * Add Large File Support
+  * Add lintian overrides for safe-to-be-ignored issues
+  * Add patch 36-fix-typos (submitted upstream)
+  * Add patch 37-remove-google-tracking
+  * Update standards to 3.9.5.0
+  * Repack upstream source using get-orig-source.sh and add usage note to
+    README.source
+  * Remove all TAO-related stuff due to DFSG-incompatibility
+  * Remove deprecated DM-Upload-Allowed field
+
+ -- Pau Garcia i Quiles <pgquiles@elpauer.org>  Sun, 29 Jun 2014 12:40:36 +0200
+
+ace (6.1.7-1) UNRELEASED; urgency=low
+
+  [ Pau Garcia i Quiles ]
+  * New upstream release
+  * Add new library ACE XML_Utils (packages: libace-xml-utils-{6.1.3,dev})
+    (adds a build-depenency on xerces3)
+
+  [ Johnny Willemsen ]
+  * Integrate most Debian changes into upstream repo, hence drop no longer
+    relevant patches.
+  * Ship and use TAO_ACE.mwc; this simplify makefile generation, compilation,
+    and installation.
+
+  [ Thomas Girard ]
+  * debian/README.source: update instructions.
+  * debian/patches/15-use-lzo2.diff: rework this patch.
+  * debian/fix_doxygen.sh: adapt to latest changes.
+  * debian/patches/reduce-doxygen-doc.diff: regenerate.
+  * debian/control lintian fixes:
+    o Bump Standards-Version: to 3.9.4.
+    o Tighen dependency on debhelper to be on par with debian/compat.
+    o Drop obsolete DM-Upload-Allowed: section. For the record, details
+      on how to do this now is available from:
+      https://lists.debian.org/debian-devel-announce/2012/09/msg00008.html
+  * Add *_RLECompressor and ACE_Compressor libraries.
+
+ -- Thomas Girard <thomas.g.girard@free.fr>  Tue, 01 Jan 2013 14:53:42 +0100
+
+ace (6.1.2-1) experimental; urgency=low
+
+  * New upstream release.
+  * debian/patches/16-ace-inet-pkgconfig-files.diff: drop, integrated.
+  * debian/patches/prevent_doxygen_ace_manpages.diff: ditto.
+  * debian/patches/reduce-doxygen-doc.diff: reworked since HTMLHelp is
+    no longer generated.
+  * debian/patches/20-versioned_libs.diff: refreshed.
+  * debian/patches/34-bts386713.diff: refreshed.
+  * debian/patches/92-default-ACE_ROOT.diff: refreshed.
+
+ -- Thomas Girard <thomas.g.girard@free.fr>  Sat, 16 Jun 2012 20:51:01 +0200
+
+ace (6.0.3+dfsg-0.2) unstable; urgency=low
+
+  * NMU to rebuild with up-to-date tool chain (closes: #723856)
+
+ -- Barak A. Pearlmutter <bap@debian.org>  Tue, 08 Oct 2013 10:24:20 +0100
+
+ace (6.0.3+dfsg-0.1) unstable; urgency=low
+
+  * NMU with maintainers blessing.
+  * Remove upstream files with nonfree licence (closes: #697848) or
+    without source (closes: #697847):
+    - repack the orig tarball by removing:
+        bin/LabVIEW_RT/*.exe
+        examples/{C++NPv2,C++NPv1,APG}/
+        TAO/
+    - debian/control: drop all packages named *tao*
+    - debian/rules: drop everything related to tao
+    - remove all hunks applying to TAO files in patch
+    - reduce-doxygen-doc.diff
+    - drop patch 34-bts386713.diff since it applies only to TAO files.
+    - debian/copyright: remove copyright entries of TAO/, and of the
+      directories under examples/ that have been removed.
+  * Bump version in build-dependency on debhelper to >=9 since we are using
+    debhelper compatibility level 9.
+
+ -- Ralf Treinen <treinen@debian.org>  Wed, 23 Jan 2013 21:27:40 +0100
+
+ace (6.0.3-5) unstable; urgency=low
+
+  * debian/control:
+    o define Build-Depends-Indep: for documentation generation.
+    o Build-Depends on dpkg-dev >= 1.16.2 to have dpkg-buildpackage -B
+      correctly invoke build-arch then binary-arch. Closes: #657844.
+  * debian/libace-dev.README.Debian: mention how to make ACE Service
+    Configuration work in Debian. Closes: #656040.
+
+ -- Thomas Girard <thomas.g.girard@free.fr>  Fri, 30 Mar 2012 20:03:40 +0200
+
+ace (6.0.3-4) unstable; urgency=low
+
+  * Remove work-around for arm now that g++-4.6 ICE is fixed.
+    Closes: #653642, #654743.
+  * Really ensure doxygen is not being run when invoking build-arch.
+    Closes: #657844.
+
+ -- Thomas Girard <thomas.g.girard@free.fr>  Sat, 04 Feb 2012 17:24:25 +0100
+
+ace (6.0.3-3) unstable; urgency=low
+
+  * Build with g++-4.4 on armel to work-around #644722. Closes: #644826.
+    Thanks to Peter Green for the report and work-around investigation.
+  * debian/lib{ace,tao}-dev.install, debian/tao-utils.install: perform brace
+    expansion instead of letting debhelper do it "due to an accident". Helped
+    removing no longer needed expansions.
+  * debian/control: move transitional packages to section oldlibs, priority
+    extra, as per lintian warning recommendation.
+
+ -- Thomas Girard <thomas.g.girard@free.fr>  Wed, 28 Dec 2011 10:46:18 +0100
+
+ace (6.0.3-2) unstable; urgency=low
+
+  * Upload to unstable.
+  * Remove the build part in build %: make rule. GNU make 3.82 doesn't
+    like it. Should fix the FTBFS seen on experimental/amd64 where make 3.82
+    is installed.
+  * debian/rules: prevent long generation of doxygen documentation in arch-dep
+    build by defining binary-arch: and binary-indep: targets. This requires
+    switching to debhelper level 9.
+  * debian/rules: overriding dh_fixperm for needed packages only.
+    Closes: #636028.
+  * debian/*.examples: move examples here.
+  * debian/ace-netsvcs.doc-base: remove extra space at end of document field.
+
+ -- Thomas Girard <thomas.g.girard@free.fr>  Sat, 30 Jul 2011 21:38:07 +0200
+
+ace (6.0.3-1) experimental; urgency=low
+
+  [ Thomas Girard ]
+  * Drop obsolete patch multiarch.dpatch.
+  * Really install NEWS file with libace-ssl.
+  * Convert to format 3.0 (quilt):
+    o Drop dpatch dependency
+    o Do not repackage upstream tarball
+    o rework patches 90 and 91 so that they can be applied before building
+  * Convert debian/rules to debhelper level 8.
+  * Convert patches to DEP3 format.
+  * debian/watch: use ACE+TAO-src-*.tar.bz2 since we don't package CIAO.
+  * Port to GNU/Hurd.
+  * Make tao-idl and tao-ifr depend on g++; we need cpp for preprocessing.
+  * Change descriptions to match new binary names.
+  * Replace Conflicts:/Replaces: with Breaks:/Replaces:, following lintian
+    recommendation.
+  * Register ace-netsvcs documentation with doc-base (again, thanks lintian).
+
+  [ Pau Garcia i Quiles ]
+  * New upstream patch release. Closes: #628572.
+  * Drop patch 11-promote-QtResource-to-qt4
+
+ -- Thomas Girard <thomas.g.girard@free.fr>  Wed, 27 Jul 2011 15:34:32 +0200
+
+ace (6.0.1-3) unstable; urgency=low
+
+  * Convert to format 3.0 (quilt):
+    o Drop dpatch dependency
+    o Do not repackage upstream tarball
+  * Convert debian/rules to debhelper level 8.
+  * Port to GNU/Hurd.
+  * debian/watch: use ACE+TAO-src-*.tar.bz2 since we don't package CIAO.
+  * debian/patches/multiarch.dpatch: change detection of librt.so to use
+    getconf so that it does not break with multiarch locations.
+    Closes: #629657.
+  * debian/NEWS.Debian: mention that SSL v2 was removed from Debian
+    packages.
+  * Enhance package descriptions. Thanks to Gerfried Fuchs for the
+    report, and to Justin B Rye from debian-l10n-english@ for
+    his changes. Closes: #599549.
+
+ -- Thomas Girard <thomas.g.girard@free.fr>  Mon, 20 Jun 2011 21:05:52 +0200
+
+ace (6.0.1-2) unstable; urgency=low
+
+  [ Thomas Girard ]
+  * Import into git.
+  * debian/control: change Vcs-* accordingly.
+  * Restore lost changelog entries, thanks to git!
+  * Add DM-Upload-Allowed: yes to debian/control.
+  * Bump Standards-Version: to 3.9.2.
+
+  [ Pau Garcia i Quiles ]
+  * Disable SSLv2 by adding patch 35_disable_sslv2 (Closes: #622074)
+
+ -- Thomas Girard <thomas.g.girard@free.fr>  Sun, 01 May 2011 13:02:17 +0200
+
+ace (6.0.1-1) unstable; urgency=low
+
+  [ Pau Garcia i Quiles ]
+  * New upstream release
+  * Drop patch 12-add-DESTDIR-to-MPC (applied upstream)
+  * Drop patch 13-add-QtReactor-export (applied upstream)
+  * Drop patch 14-fix-tcl-flags (applied upstream)
+  * Drop patch 16-fix-pidl-install (applied upstream)
+  * Update patch 11-promote-QtResource-to-qt4
+  * Update patch 15-fix-lzo-flags
+  * Update patch 34-bts386713
+  * Require debhelper >= 7 (it was already required, in practice)
+  * Register documentation with doc-base
+  * Explicitly set source format 1.0 until we move to 3.0
+  * Package ACE_INet and ACE_INet_SSL
+
+  [ Thomas Girard ]
+  * Build-depend on Tcl/Tk >= 8.5.
+
+ -- Pau Garcia i Quiles <pgquiles@elpauer.org>  Sun, 20 Feb 2011 16:33:13 +0100
+
+ace (6.0.0-1) experimental; urgency=low
+
+  * New upstream release:
+    o use new make install target.
+    o remove generator_pkgconfig.sh, no longer needed.
+    o new binary renaming:
+      - LoadManager => tao_loadmanager
+      - LoadMonitor => tao_loadmonitor
+      - ImplRepo_Service => tao_imr_locator
+      - ImR_Activator => tao_imr_activator
+      - IFR_Service => tao_ifr_service
+      - Fault_Detector => tao_fault_detector
+      - Fault_Notifier => tao_fault_notifier
+      - Scheduling_Service => tao_cosscheduling
+      - Dump_Schedule => tao_dump_schedule
+    o remove libACE_gperf_lib.
+    o remove patches that were merged upstream:
+      - 11-create-ace_qt4reactor-mpb.dpatch
+      - 12-create-config_kfreebsd.dpatch
+      - 16-rename-tao-programs.dpatch
+      - 24-add-missing-headers.dpatch
+      - 25-remove-duplicate-files.dpatch
+      - 47-change-netsvcs.dpatch
+      - 48-fix-doxygen-cross-links.dpatch
+    o remove useless patches:
+      - 10-fix-prj-install.dpatch
+      - 19-gcc43.dpatch
+    o rework existing patches:
+      - 20-versioned_libs.dpatch, for versioned_so=2
+      - 34-bts386713.dpatch
+      - 90-patch-mpc-basedir.dpatch
+    o new patches or scripts:
+      - 12-add-DESTDIR-to-MPC.dpatch, to add and use DESTDIR in make install
+      - 13-add-QtReactor_export.h.dpatch, to add a missing header in
+        libace-qtreactor-dev package.
+      - 16-fix-pidl-install.dpatch, to add missing .pidl files.
+      - fix_doxygen.sh, to regenerate the patch for Doxygen reduction.
+  * Bump Standards-Version: to 3.9.1.
+
+ -- Thomas Girard <thomas.g.girard@free.fr>  Thu, 06 Jan 2011 07:39:04 +0100
+
+ace (5.7.7-4) unstable; urgency=high
+  [ Marek Brudka ]
+  * Synchronized *.pc with *.so and created transitional tags. Closes: #598169
+
+ -- Marek Brudka <mbrudka@aster.pl>  Mon, 27 Sep 2010 20:36:00 +0200
+
+ace (5.7.7-3) unstable; urgency=low
+  [ Marek Brudka ]
+  * Configuration file for KFreeBSD created. Closes: #591586.
+  * Restored pkgconfig files. Closes: #591610.
+  * Provided manpages for tao_catior, tao_nslist, tao_nsdel,
+    tao_nsadd, ace_netsvcs.
+
+  [ Thomas Girard ]
+  * Disable -fvisibility=hidden on armel since it does not seem to work on
+    that platform. Closes: #593225.
+
+ -- Thomas Girard <thomas.g.girard@free.fr>  Tue, 07 Sep 2010 20:04:20 +0200
+
+ace (5.7.7-2) unstable; urgency=low
+
+  * Rebuild with sid tk-dev build-dependency. Closes: #590512.
+
+ -- Thomas Girard <thomas.g.girard@free.fr>  Mon, 02 Aug 2010 23:49:01 +0200
+
+ace (5.7.7-1) unstable; urgency=low
+
+  [ Thomas Girard ]
+  * Add Marek to Uploaders: field.
+  * Remove dependencies on autotools; these are no longer needed now that we
+    have agreed to move back to the traditional compilation method.
+  * Add bzip2 and lzo ZIOP implementation.
+  * New patch: 20-versioned_libs.dpatch, to generate libraries with names
+    following libACE-5.7.7.so pattern instead of libACE.so.5.7.7.
+  * Rename binaries and packages to follow what is used in RPMs.
+  * Move $ACE_ROOT to /usr/lib/ace.
+
+  [ Marek Brudka ]
+  * New upstream release:
+    o add libACE_gperf, libACE_ETCL and libACE_Monitor_Control to libace
+    o add headers and libraries for Monitor, ZIOP, ETCL to libtao package
+    o renamed gperf-ace to ace_gperf to follow the upstream convention
+    o renamed utilities (ns{add,del,list} to tao_ns{add,del,list}) in tao-utils
+      to follow the upstream changes
+  * Change compilation back to traditional ACE+TAO build method:
+    o adapt existing Debian build mechanism
+    o remove patches no longer needed because of this switch
+    o use MPC generated makefiles
+    o install build result using MPC/prj_install.pl and .ins files
+    o temporarily excluded logWalker from build
+  * New patch: 10-fix-prj-install to work-around a problem installing files
+  * Added PerlACE to mpc-ace. Closes: #522557
+  * Created patch to reduce the size of doxygen doc. Closes: #562164
+  * Created patch to fix cross references in doxygen tags
+  * Created libnetsvcs packages. Closes: #466137. Addresses: LP#185285
+  * Moved IDL fiels from /usr/include into /usr/share/idl
+
+  [ Pau Garcia i Quiles ]
+  * New upstream release
+  * Add dependency on ${misc:Depends}
+  * Add new libraries and update patch 34-bts386713 accordingly
+  * Update patch 02-qt4 (partially fixed upstream)
+  * Drop patch 05-autoconf-fox (fixed upstream)
+  * Drop patch 06-fix-kokyu-mpc (fixed upstream)
+  * Drop patch 07-autoconf-fix-gperf (fixed upstream)
+  * Drop patch 08-fix-perl-shebang (fixed upstream)
+  * Drop patch 10-fix-fox-resource-export (fixed upstream)
+  * Drop patch 11-fix-fox-reactor.dpatch (fixed upstream)
+  * Update patch 12-fix-fox-include
+  * Drop patch 13-fix-fox-errors (fixed upstream except for the #include, which
+    I have now merged in 12-fix-fox-include)
+  * Drop patch 14-autoconf-tao (fixed upstream)
+  * Drop patch 15-fix-fltk-include (fixed upstream)
+  * Drop patch 17-protect-mpc-path (fixed upstream)
+  * Drop patch 18-fix-bswap-detection (fixed upstream)
+  * Update patch 19-gcc43
+  * Drop patch 20-fix-iostream-detection (fixed upstream)
+  * Drop patch 22-remove-Ge-doc (fixed upstream)
+  * Drop patch 23-add-sh-shebang (fixed upstream)
+  * Update patch 24-add-missing-headers (WORK IN PROGRESS)
+  * Update patch 34-bts386713
+  * Drop patch 49-missing-template (fixed upstream)
+  * Update patch 90-patch-mpc-basedir
+  * Update patch 91-patch-dg-basedir
+  * Add patch 93-hack-to-fix-libtoolize
+  * Add patch 94-build-crosscompile
+  * Add patch 95-build-ace-for-tao
+  * Add patch 96-build-athena3d
+  * Remove DH_COMPAT definition from the debian/rules file, it's already in
+    debian/compat
+  * Fix fox-config location, detection method has changed since 5.6.3
+
+ -- Thomas Girard <thomas.g.girard@free.fr>  Sun, 23 May 2010 16:58:42 +0200
+
+ace (5.6.3-6) unstable; urgency=low
+
+  [ Thomas Girard ]
+  * Remove obsolete maintainers:
+    - Konstantinos Margaritis <markos@debian.org>
+    - Brian Nelson <pyro@debian.org>
+    Closes: #521487.
+  * Bump Standards-Version: to 3.8.3.
+  * Remove erroneous #define ACE_SCANDIR_CMP_USES_CONST_VOIDPTR in config.h;
+    causing diagnostics to FTBFS. Closes: #552899.
+  * Remove extra ACLOCAL_AMFLAGS from already existing Makefile.am; causing
+    recent aclocal to abort. Thanks to Pau Garcia i Quiles for the patch.
+    Closes: #518735.
+  * Add README.source.
+  * Add Pau Garcia i Quiles to the list of maintainers.
+  * Fix many issues spotted by lintian.
+
+  [ Pau Garcia i Quiles ]
+  * Add new patches:
+    - Remove duplicate files from .mpc files so that Makefile.am files do
+      not have duplicates
+    - Run autoupdate and autoreconf in the ACE and TAO directories in order
+      to update from libtool 1.5 (what upstream uses) to libtool 2.2
+
+ -- Thomas Girard <thomas.g.girard@free.fr>  Sun, 13 Dec 2009 11:47:50 +0100
+
+ace (5.6.3-5) unstable; urgency=low
+
+  * Do not ship MPC config files in both mpc-ace and libace-dev packages;
+    they're meant to be only in mpc-ace. Make mpc-ace Replaces: the bogus
+    previous upload. Closes: #484718.
+  * Bump Standards-Version: to 3.8.0.
+
+ -- Thomas Girard <thomas.g.girard@free.fr>  Fri, 13 Jun 2008 21:52:28 +0000
+
+ace (5.6.3-4) unstable; urgency=low
+
+  * Add the following missing programs to libace-dev:
+    o $ACE_ROOT/bin/generate_export_file.pl
+    o $ACE_ROOT/bin/split-cpp
+    o $ACE_ROOT/bin/g++dep
+    o $ACE_ROOT/bin/add_rel_link.sh
+  * Move DependencyGenerator from mpc-ace to libace-dev.
+  * New patch, 22-remove-Ge-doc.dpatch, to remove documentation for
+    tao_idl -Ge flag that no longer works. Thanks to Pascal Giard for
+    reporting this.
+  * Remove PACKAGE_* definitions from /usr/include/ace/config.h. Thanks to
+    Pascal Giard for reporting this.
+  * Remove pre-etch Conflicts: and Replaces: information.
+  * Add missing headers found with cmp-installation.sh. Closes: #481088.
+
+ -- Thomas Girard <thomas.g.girard@free.fr>  Sat, 24 May 2008 15:47:01 +0000
+
+ace (5.6.3-3) unstable; urgency=low
+
+  * Pass full path to fox-config-1.6 instead of trying to detect fox-config
+    since fox-config is an alternative. Should fix multiple FTBFS.
+  * Enable IPv6 again. Disabling it was a mistake: it does work. But on an
+    IPv4 only host one need to specify the end-point to use, e.g. :
+      Naming_Service -ORBEndPoint iiop://localhost:1234
+
+ -- Thomas Girard <thomas.g.girard@free.fr>  Thu, 24 Apr 2008 18:27:07 +0000
+
+ace (5.6.3-2) unstable; urgency=low
+
+  * Add missing libfox-1.6-dev build dependency. Thanks to Bastian Blank for
+    the report. Closes: #476822.
+  * Build depend on libqt4-dev (>= 4.4~rc1-4) to fix FTBFS. Thanks to
+    Martin Zobel-Helas for the report and to Sune Vuorela for the fix.
+    Closes: #476505.
+  * Add platform_macros.GNU.in and have autotools handle it so that it's
+    possible to ship rules.*.GNU. Closes: #469843, #469845.
+  * Remove doxygen-generated files we don't need.
+  * (Build-)Depend on tk-dev instead of tk8.4-dev.
+  * Rework debian/patches/05-autoconf-fox.dpatch not to link against too
+    many libs.
+  * Restore doxygen build-dependency.
+
+ -- Thomas Girard <thomas.g.girard@free.fr>  Tue, 22 Apr 2008 18:23:46 +0000
+
+ace (5.6.3-1) unstable; urgency=low
+
+  * New upstream release:
+    o missing os_include/os_byteswap.h is included. Closes: #469844.
+  * Upload to unstable.
+  * New packages: libace-foxreactor and libtao-foxresource, integrating
+    with the FOX toolkit.
+  * Build doxygen again.
+  * Rewrite debian/copyright, following proposal from:
+    http://wiki.debian.org/Proposals/CopyrightFormat
+  * Add a watch file.
+
+ -- Thomas Girard <thomas.g.girard@free.fr>  Sat, 12 Apr 2008 17:10:14 +0000
+
+ace (5.6.2-1) experimental; urgency=low
+
+  * New upstream release.
+  * Generate .am files instead of patching them; hence drop:
+    o patches/02-tao-sonames-release-am.dpatch
+    o tao-sonames-release-am.sh
+  * Fix DEB_BUILD_OPTIONS=noopt.
+  * Add zlib1g-dev and libzzip-dev build dependencies.
+  * Enable symbol visibility.
+  * Manually add missing some autoconf tests to reduce differences against
+    regular ACE build method.
+  * Do not generate doxygen; it fails now.
+
+ -- Thomas Girard <thomas.g.girard@free.fr>  Sun, 06 Jan 2008 21:05:37 +0100
+
+ace (5.5.9-1) experimental; urgency=low
+
+  * New upstream release. We now use the -src.tar.bz2 tarball, hence:
+      o generate autotools stuff at compile time
+      o huge patches/06-bootstrap is dropped
+  * Fix broken libtao-tkresource package.
+  * Drop no longer needed patches:
+      o 03-compile-lifecycle
+      o 04-compile-ftrt
+      o 07-ace-tao-ssliop-refcount
+  * New patches:
+      o 02-qt4 to switch to Qt4
+      o 02-fltk-no-gl to avoid linking with libfltk_gl
+      o 03-g++-new-throws to prevent autoconfiguration from eating all
+        memory testing whether std::bad_alloc is thrown
+  * Disable patch 20-check-_REENTRANT; it's not needed when using autotools
+    method. Closes: #420216.
+  * Update patch 34-bts386713.
+  * Use debian/compat instead of DH_COMPAT.
+  * Drop no longer needed dpkg-dev tightened build-dependency since it is
+    available in etch.
+  * Generate doxygen documentation. Closes: #391011.
+  * Enable ACE reactor notification queue.
+  * Move $ACE_ROOT/bin/MakeProjectCreator/config files into libace-dev.
+  * Install $TAO_ROOT/MPC files into libtao-dev.
+
+ -- Thomas Girard <thomas.g.girard@free.fr>  Tue, 17 Jul 2007 22:50:36 +0200
+
+ace (5.5.6-2) experimental; urgency=low
+
+  * debian/control: fix broken Conflicts: fields. Package split for
+    libtao-orbsvcs happened in libtao-orbsvcs1.4.7c2a 5.4.7-11 and this should
+    not be changed.
+
+ -- Thomas Girard <thomas.g.girard@free.fr>  Fri, 23 Mar 2007 18:38:41 +0000
+
+ace (5.5.6-1) experimental; urgency=low
+
+  Thomas Girard:
+    * New upstream release. Closes: #381647.
+    * Switch to the autotools method. Consequences:
+       o CIAO packages are dropped for now
+       o static libraries are removed as well
+       o IPv6 is disabled again
+    * Drop obsolete patches and scripts.
+    * We no longer ship TAO_ORB_Options.1 in libtao-orbsvcs.
+    * debian/patches/01-change-tao-sonames.dpatch: enable TAO_VERSION_NAME
+      propagation from configure, and use it for TAO libraries.
+    * debian/patches/02-tao-sonames-release-am.dpatch: diff on Makefile.am
+      after application of the 01-change-tao-sonames patch.
+    * debian/patches/03-compile-lifecycle.dpatch: enables LifeCycle
+      compilation.
+    * debian/patches/04-compile-ftrt.dpatch: enables FTRT_EventService
+      compilation.
+    * debian/patches/07-ace-tao-ssliop-refcount.dpatch: fix ssliop reference
+      counting problem.
+
+  Konstantinos Margaritis:
+    * changed URL in copyright to new one.
+
+ -- Thomas Girard <thomas.g.girard@free.fr>  Thu, 15 Mar 2007 22:12:29 +0000
+
+ace (5.4.7-13) unstable; urgency=low
+
+  * Rename packages:
+    o libace5.4.7c2a to libace5.4.7ldbl (Closes: #430244)
+    o libtao1.4.7c2a to libtao1.4.7ldbl (Closes: #430307)
+    for ldbl128 transition.
+  * Use debian/compat instead of DH_COMPAT.
+
+ -- Thomas Girard <thomas.g.girard@free.fr>  Thu, 06 Sep 2007 09:52:34 +0000
+
+ace (5.4.7-12) unstable; urgency=low
+
+  * debian/control: tao-naming recommends tao-utils (Closes: #393032).
+  * debian/libtao-dev.install: add libTAO.so symlink (Closes: #396303).
+  * debian/patches/20-check-_REENTRANT.dpatch: do not automatically
+    define _REENTRANT (Closes: #380739).
+
+ -- Thomas Girard <thomas.g.girard@free.fr>  Sun,  5 Nov 2006 11:14:00 +0100
+
+ace (5.4.7-11) unstable; urgency=low
+
+  * debian/control: package HTBP, the protocol over HTTP tunneling library.
+  * debian/control: split libace into libace + libace-ssl.
+  * debian/control: move binaries in their own tao-* packages.
+  * debian/patches/34-bts386713.dpatch: dlopen() TAO libraries using their
+    full name (Closes: #386713).
+  * debian/generate_pkgconfig.sh: generate .pc files (Closes: #367480).
+
+ -- Thomas Girard <thomas.g.girard@free.fr>  Sat, 23 Sep 2006 15:02:12 +0200
+
+ace (5.4.7-10) unstable; urgency=low
+
+  * debian/rules: fix and honor DEB_BUILD_OPTIONS.
+  * debian/libace-dev.install: drop QoS header files as QoS in not compiled
+    in.
+  * debian/*.install: fix empty wildcard expansion that produce errors when
+    DH_COMPAT is 5.
+  * debian/libtao-dev.install: do not distribute include files from TAO_IDL.
+    They are not needed and don't get installed when using the autotools
+    method.
+  * debian/rules: rename mwc.pl and mpc.pl to mwc-ace and mpc-ace.
+  * debian/ace-config*,debian/tao-config*: dropped. These files were no
+    longer installed.
+  * debian/libace-dev.install: don't install ace-config and tao-config
+    manpages either (Closes: #367478).
+  * debian/control: relax mpc-ace dependencies. This package now installs
+    without pulling any ACE library. Thanks to Alex Bodnaru for noticing.
+  * debian/control: simplify packages synopsis and descriptions.
+  * debian/control: drop xerces dependency (Closes: #378605). Xerces is
+    only needed by DAnCE, which is not packaged yet.
+  * debian/libace-dev.install: remove generate_export_file.pl for now.
+  * patches/31-gcc-4.1-fix.dpatch: add other type-punned fixes taken from
+    upstream.
+  * debian/mpc.sgml: new man page.
+  * debian/patches/32-bug1770-fix.dpatch,33-bug1805-fix.dpatch: backport
+    two patches for SSL wrappers.
+
+ -- Thomas Girard <thomas.g.girard@free.fr>  Thu, 20 Jul 2006 20:55:53 +0200
+
+ace (5.4.7-9) unstable; urgency=low
+
+  * debian/patches/28-bug2222-fix.dpatch, debian/patches/29-bug2262.dpatch:
+    backport upstream fixes.
+  * debian/patches/31-gcc-4.1-fix.dpatch: fix "dereferencing type-punned
+    pointers" gcc 4.1 warning.
+  * debian/patches/30-Env_Value-template-specialization-fix.dpatch:
+    backport template specialization fix (Closes: #358898).
+  * debian/patches/20-debian-compiler-definitions.dpatch: downgrade
+    optimization flag from `-O3' to `-O2'.
+  * debian/rules: add ${perl:Depends} for mpc-ace package.
+  * debian/control: make a new package, libciao-doc.
+  * debian/libtao-dev.install: add missing pkg-config file for ImR_Client
+    library.
+
+ -- Thomas Girard <thomas.g.girard@free.fr>  Wed, 29 Mar 2006 22:14:53 +0200
+
+ace (5.4.7-8) unstable; urgency=low
+
+  * debian/copy_template_sources.sh: add missing files to `libtao-dev'
+    package. Thanks to Arren and Bernhard Seibold for reporting this.
+  * debian/patches/23-PortableGroup-exceptions-propagation.dpatch,
+    debian/patches/24-collocated-oneway+SYNC_WITH_SERVER-fix.dpatch,
+    debian/patches/25-TypeCode-equivalent-fix.dpatch,
+    debian/patches/26-union-_default-fix.dpatch,
+    debian/patches/27-bug2225-fix.dpatch: backport various upstream
+    fixes.
+  * debian/control: tighten build dependency from `xlibs-dev' to
+    `libxt-dev'. (Closes: #346607).
+
+ -- Thomas Girard <thomas.g.girard@free.fr>  Fri, 13 Jan 2006 17:15:37 +0200
+
+ace (5.4.7-7) unstable; urgency=low
+
+  * debian/config/config.h: add IPv6 support. Thanks to David Hausheer
+    for the report and the fix. (Closes: #341988)
+  * debian/patches/23-TTY_IO-compilation-fix.dpatch: new patch to work
+    around `struct termios` platform-specific fields. (Closes: #342328).
+  * debian/patches/84-skip-DAnCE-compilation.dpatch: completely disable
+    DAnCE compilation, since we don't package it. (Closes: #336020).
+  * Really close fixed in NMU bugs (Closes: #324271, #339142).
+
+ -- Konstantinos Margaritis <markos@debian.org>  Mon, 19 Dec 2005 13:40:48 +0200
+
+ace (5.4.7-6) unstable; urgency=low
+
+  * debian/control: consolidate package descriptions.
+  * debian/patches/16-g++4-visibility-tweaks.dpatch:
+    Backport upstream tweaks for g++ 4 visibility feature and disable
+    visibility hiding for now. (Closes: #324271).
+  * debian/rules: g++ 4.0.2 was ICE'ing on #pragma once. This is no
+    longer true as of g++-4.0_4.0.2-4, so we can use g++4 again. For the
+    record, another possible fix was to #define ACE_LACKS_PRAGMA_ONCE in
+    `$ACE_ROOT/ace/config.h`.
+  * Add `c2a` suffix to all libs for libstdc++ allocator change.
+    (Closes: #339142).
+
+ -- Thomas Girard <thomas.g.girard@free.fr>  Fri, 18 Nov 2005 20:23:59 +0100
+
+ace (5.4.7-5) unstable; urgency=low
+
+  * Force gcc 3.4 for all arches, seems gcc 4.0 produces errors on all of
+    them. (Closes: #333981)
+
+ -- Konstantinos Margaritis <markos@debian.org>  Wed, 12 Oct 2005 03:26:14 +0300
+
+ace (5.4.7-4) unstable; urgency=medium
+
+  * Rebuilt package for the Qt C++ transition. (Closes: #327926).
+  * Also, gcc 4.0 is buggy in some arches, use g++-3.4 on them instead.
+    Update: Even on i386, cpp-4.0 produces Internal Compiler Errors(ICEs). For
+    this reason, cpp-3.4 will be used instead (but with gcc/g++ 4.0.
+
+ -- Konstantinos Margaritis <markos@debian.org>  Mon, 4 Oct 2005 03:21:20 +0300
+
+ace (5.4.7-3) unstable; urgency=low
+
+  * Fixed (another) missing build-dependency. (Closes: #323630)
+    (this is getting irritating :-)
+
+ -- Konstantinos Margaritis <markos@debian.org>  Thu, 18 Aug 2005 10:29:48 +0300
+
+ace (5.4.7-2) unstable; urgency=low
+
+  * Fixed missing build-dependency in the .dsc file. (Closes: #323181)
+
+ -- Konstantinos Margaritis <markos@debian.org>  Tue, 16 Aug 2005 01:09:09 +0300
+
+ace (5.4.7-1) unstable; urgency=low
+
+  * Thomas Girard <thomas.g.girard@free.fr>
+    - New upstream release. (Closes: #317488)
+    - Package names were changed to include the full library soname.
+      (Closes: #288161)
+    - debian/control: libtao-{xt,qt}reactor are now called
+      libtao-{xt,qt}resource. Also add libtao-{fl,tk}resource.
+    - debian/control: add new package libace-tmcast5.4.7.
+  * Konstantinos Margaritis
+    - Now use the .bz2 version of the original tarball to save space.
+
+ -- Konstantinos Margaritis <markos@debian.org>  Fri, 12 Aug 2005 12:45:13 +0300
+
+ace (5.4.2.1.0-4) unstable; urgency=high
+
+    * Thomas Girard <thomas.g.girard@free.fr>
+      - debian/control:
+        o libacexml-dev depends on libace-dev.
+        o libkokyu-dev depends on libace-dev.
+        o libtao-dev depends on libtao1.4.
+        o normalize Depends: and Build-Depends: sections.
+      - debian/ace-config.1 debian/tao-config.1: fix hyphenation problem
+        reported by lintian.
+      - debian/libciao-dev.install: add missing .idl and .pidl files.
+        (Closes: #307258)
+
+ -- Thomas Girard <thomas.g.girard@free.fr>  Mon,  2 May 2005 19:30:01 +0200
+
+ace (5.4.2.1.0-3) unstable; urgency=high
+
+  * Thomas Girard <thomas.g.girard@free.fr>
+    - debian/patches/84-mpc-honour-soversion.dpatch: new patch from
+      upstream to honour the `version' keyword for libraries.
+    - debian/patches/17-fix-tao-encode_value-memory-leak: new patch
+      from upstream to fix a potential memory leak.
+    - debian/mpc-ace.install: add depgen.pl. (Closes: #289157)
+    - debian/tao_idl: new script that automatically sets ACE_ROOT and
+      TAO_ROOT environment variables. (Closes: #289158)
+    - debian/rules: unbreak gperf-ace. (Closes: #294338)
+    - debian/remove_reactor_dups.sh: new script to ensure that duplicate
+      reactor header files get deleted. (Closes: #294660)
+    - debian/patches/21-always-inline.dpatch, debian/config.h: Always
+      define __ACE_INLINE__, and remove the inline option from the MPC
+      generated GNUmakefiles. Thanks to Marek Brudka for reporting this and
+      for providing the fix. (Closes: #290114)
+    - debian/patches/18-fix-trader-twiddle-operator.dpatch: backport
+      fix to correct operator ~ in trader constraints.
+    - debian/patches/19-fix-taoidl-fd-leak.dpatch: backport a fix to
+      close open file.
+    - debian/control: lib{ace,tao}qtreactor-dev packages depend on
+      libqt3-mt-dev.
+    - debian/libtao-orbsvcs1.4.install:
+      o Add FT_ReplicationManager.
+      o Add Fault_Detector and Fault_Notifier.
+    - debian/control:
+      o mpc-ace is in devel section.
+      o lib{ace,tao}-{fl,tk,qt,xt}reactor-dev are in libdevel section.
+    - debian/tao_ifr: new wrapper script that automatically sets ACE_ROOT
+      and TAO_ROOT environment variables.
+    - debian/libtao-orbsvcs1.4.manpages: add TAO_ORB_Options.1 manpage.
+
+ -- Thomas Girard <thomas.g.girard@free.fr>  Wed, 30 Mar 2005 23:24:40 +0200
+
+ace (5.4.2.1.0-2) unstable; urgency=medium
+
+  * Konstantinos Margaritis <markos@debian.org>
+    - Changed dependency of libfltk1-dev in libace-flreactor-dev to
+    libfltk1.1-dev (Closes: #289287)
+    - Added Uploaders field in control.
+
+ -- Konstantinos Margaritis <markos@debian.org>  Sat,  8 Jan 2005 22:39:05 +0200
+
+ace (5.4.2.1.0-1) unstable; urgency=low
+
+  * Thomas Girard <thomas.g.girard@free.fr>
+    - Much lintian cleaning.
+    - Integrate upstream MPC patch to honour `libout' and `install' keywords.
+    - Repackage FTRT_EventChannel.
+    - Bug 242881 was closed in the previous upload. (Closes: #242881)
+    - debian/control: libtao-dev should depend on libace-dev.
+      (Closes: #277052)
+    - debian/{Basic,Event,Notify,RTEvent}_Logging_Service.sgml: new man pages.
+    - debian/rules: add docbook-to-man calls.
+  * Raphael Bossek <bossekr@debian.org>
+    - debian/config/debian.features: MPC configuration for Debian GNU/Linux added
+    - debian/config/platform_macros.GNU: Removed due to introduction of
+      debian.features files. This file will be generated
+    - debian/rules: Uses dpatch. Simplified clean target by removing temporary
+      ACE_wrappers subdirectory. Install ace-config and tao-config scripts
+      with executable bit set (Closes: #278522, #278523)
+    - debian/control: Added new reactor packages. Removed depricated
+      suggestions on ace+tao-utilities. Added libssl-dev as recommendation for
+      libace-dev. Added suggestions for pkg-config
+    - Upgrade to latest version of TAO (Closes: #265238)
+    - debian/pkgconfig-ace, debian/pkgconfig-tao, debian/ace.pc.in,
+      debian/tao.pc.in: Support for pkg-config added
+    - debian/libace-dev.links: Added sym-link for /usr/share/ace/lib and
+      /usr/share/ace/bin/generate_export_file.pl
+    - debian/*.docs, debian/*.manpages: Added source directory ACE_wrappers as prefix
+    - debian/libace-dev.install: Added ACE_wrappers/bin/generate_export_file.pl
+
+ -- Thomas Girard <thomas.g.girard@free.fr>  Mon, 18 Oct 2004 13:35:56 +0200
+
+ace (5.4.2.1-1) unstable; urgency=low
+
+  * Thomas Girard <thomas.g.girard@free.fr>
+    - New upstream release. (Closes: #243062)
+    - Do not link against Xt libs. (Closes: #251477)
+    - As such, libace-dev does not need to depend on libxt-dev nor xlibs-dev
+      (Closes: #253226)
+    - Add MPC.
+    - Patch ACE_IOStream to support g++ 3.3. (Closes: #243473)
+    - Patch MPC to honour `libout' and `install' keywords in GNUmakefile
+      generation. See DOC Bug#1915.
+    - Backport a fix to NotifyLoggingService from CVS.
+    - Make %S work in ACE_DEBUG.
+  * Konstantinos Margaritis
+    - Fixed missed path for libACE.so.5.4.2 in dh_shlibdeps
+    - Fixed incorrect timestamp of original archive (1970 etc).
+
+ -- Konstantinos Margaritis <markos@debian.org>  Thu,  2 Sep 2004 23:04:56 +0200
+
+ace (5.4.0.1-1.1) unstable; urgency=low
+
+  * Fixed ACE_NDEBUG configuration of ACE. (Closes: #242881)
+  * Build-depends on libqt3-headers removed qt_reactor not set.
+  * System capabilities will be determined by including <unistd.h> in
+    <ace/config.h>.
+
+ -- Raphael Bossek <bossekr@debian.org>  Thu,  8 Apr 2004 15:37:24 +0200
+
+ace (5.4.0.1-1) unstable; urgency=low
+
+  * KM: release to fix the timestamp errors in the upstream source.
+
+ -- Konstantinos Margaritis <markos@debian.org>  Sun, 29 Feb 2004 21:11:14 +0200
+
+ace (5.4-3) unstable; urgency=low
+
+  * KM: backported fixes from CVS to fix 64-bit pointer to int casting in
+    orbsvcs/RTCosScheduling files. This is to fix FTBFS bug in 64-bit archs,
+    until 5.4.1 is released (mid-march).
+    Closes: #233890
+
+ -- Konstantinos Margaritis <markos@debian.org>  Wed, 28 Feb 2004 15:53:30 +0200
+
+ace (5.4-2) unstable; urgency=low
+
+  * KM: Includes patch from Raphael Bossek <bossekr@debian.org> to handle
+    bug in tao_idl to use ACE_GPERF instead of plain gperf.
+  * BN: libace-dev now suggests libtao-dev instead of the non-existing tao
+    package. (Closes: #233488)
+  * BN: prepended a "-" to the chmod commands in debian/rules so that they
+    don't fail if used repeatedly.
+
+ -- Brian Nelson <pyro@debian.org>  Wed, 18 Feb 2004 02:23:07 -0800
+
+ace (5.4-1) unstable; urgency=low
+
+  * KM: new upstream release
+  * KM: Now builds also ACE+SSL library, Kokyu and CIAO libs.
+  * KM: Due to the orbsvcs executables we can't have 2 different versions
+    of the libtao-orbsvcs1.x package, so we have to replace. This doesn't apply
+    for libace5.x, libtao1.x or the rest of the libs.
+  * Closes: #229134 (fixed dependencies).
+
+ -- Konstantinos Margaritis <markos@debian.org>  Sun, 25 Jan 2004 13:33:20 +0200
+
+ace (5.3.1-8) unstable; urgency=low
+
+  * KM: Included the .pidl files in libtao-dev package. These
+    were needed by some .idl files. (Closes: #213568)
+
+ -- Konstantinos Margaritis <markos@debian.org>  Wed, 29 Oct 2003 23:46:01 +0200
+
+ace (5.3.1-7) unstable; urgency=low
+
+  * BN: Changed maintainer to "Debian ACE+TAO maintainers
+    <pkg-ace-devel@lists.alioth.debian.org>" and moved myself to the
+    Uploaders.
+  * KM: Fixed conflicting file "/usr/bin/catior" by changing the name to
+    tao-catior in libtao-dev. (Closes: #214421)
+
+ -- Brian Nelson <pyro@debian.org>  Thu,  9 Oct 2003 15:05:12 -0700
+
+ace (5.3.1-6) unstable; urgency=low
+
+  * Added the ORB services .idl files that were left out from the
+    libtao-orbsvcs-dev package. (Closes: #213568)
+
+ -- Konstantinos Margaritis <markos@debian.org>  Sun,  5 Oct 2003 12:31:21 +0300
+
+ace (5.3.1-5) unstable; urgency=low
+
+  * Regenerated .diff.gz so that it is no longer broken (Closes: #211501)
+  * Back out Debian-specific change in the way that CosNamingC.h is
+    included in TAO/utils/nslist/nslist.cpp.  I'm not sure why this was
+    changed in the first place, but it broke the build. (Closes: #213611)
+
+ -- Brian Nelson <pyro@debian.org>  Wed,  1 Oct 2003 10:28:54 -0700
+
+ace (5.3.1-4) unstable; urgency=low
+
+  * Moved the manpages back to -dev packages to follow policy.
+  * Now mostly lintian clean.
+  * provided manpages for a few executables.
+
+ -- Konstantinos Margaritis <markos@debian.org>  Wed, 17 Sep 2003 11:43:55 +0300
+
+ace (5.3.1-3) unstable; urgency=low
+
+  * Updated to new standards version 3.6.1
+  * Fixed the section of a couple of packages.
+  * Now the getrlimit, etc functions are always defined
+    as ints. g++ 3.x does not complain anymore (Closes: #104681).
+
+ -- Konstantinos Margaritis <markos@debian.org>  Tue, 16 Sep 2003 10:31:03 +0300
+
+ace (5.3.1-2) unstable; urgency=low
+
+  * Now the following TAO packages are created:
+    libtao1.3.1, libtao-dev, libtao-doc, libtao-orbsvcs1.3.1,
+    libtao-orbsvcs-dev.
+  * Also included ACEXML library in two separate packages:
+    libacexml5.3.1, libacexml-dev.
+  * Full doxygen documentation not included due to size concerns.
+    (Closes: #108749).
+  * tao-config included in libtao-dev. (Closes: #159234).
+  * All -dev packages carry their respective examples in full and
+    uncompressed. (Closes: #52145, #76967).
+  * libACE.a is compiled with thread support enabled. (Closes: #126717).
+    dbbalancer now builds successfully with -static.
+  * Moved all manpages to respective -doc pagkaces. (Closes: #73044).
+
+ -- Konstantinos Margaritis <markos@debian.org>  Tue,  9 Sep 2003 10:41:14 +0300
+
+ace (5.3.1-1) unstable; urgency=low
+
+  * New upstream release
+  * New maintainers for the package, Brian Nelson <pyro@debian.org> and
+    Konstantinos Margaritis <markos@debian.org> (Closes #199768)
+  * Removed build-dependency on versioned g++
+  * Bumped up standards version to 3.6.0
+  * Dropped version string from -dev package name
+  * libace-dev: downgrade tao to suggests (where did tao go anyway?)
+  * Use debian/compat for debhelper versioning
+  * Use dh_install instead of dh_movefiles, and dh_link instead of manual
+    ln.  The debian/rules file is a lot less hairy now.
+  * Reinstated a libace-doc package (Closes: #192338)
+  * Added symlinks to /usr/share/ace so that this directory can serve as
+    $ACE_ROOT.  Added a corresponding note to the README.Debian
+    file. (Closes: #80329)
+  * Removed the /usr/lib/libACE.so.5 and libACE_RMCast.so.5 symlinks, and
+    made the package names match the sonames.  The sonames now include the
+    full version string, so ACE libs of different versions from now on
+    should coexist nicely, even though upstream doesn't use a proper
+    versioning scheme.  (Closes: #147741)
+
+ -- Brian Nelson <pyro@debian.org>  Fri, 15 Aug 2003 00:15:59 -0700
+
+ace (5.2.4-1.2) unstable; urgency=low
+
+  * fix to previous NMU
+  * (Closes: #190792)
+
+ -- Konstantinos Margaritis <markos@debian.org>  Sat, 26 Apr 2003 19:18:49 +0300
+
+ace (5.2.4-1.1) unstable; urgency=low
+
+  * gcc-3.2 transition, NMU patch by Andreas Metzler <ametzler@debian.org>
+  * (Closes: #188328)
+
+ -- Konstantinos Margaritis <markos@debian.org>  Fri, 11 Apr 2003 23:25:38 +0200
+
+ace (5.2.4-1) unstable; urgency=low
+
+  * New upstream.
+  * Incorporated below change from Goswin.  (Closes: #159236)
+
+ -- Ossama Othman <ossama@valinor.ece.uci.edu>  Sun, 15 Sep 2002 14:14:06 -0700
+
+ace (5.2.1-1.1) unstable; urgency=low
+
+  * debian/control: libace5.2-dev recommends tao
+  * ace-config: export ACE_ROOT
+              make -f /usr/share/ace/ace-config.GNU
+                test for tao-confg
+                unset MAKEs env vars to prevent extranous output
+  * debian/rules: install platform macros in
+        $(ACE_PREFIX)/share/ace/include/makeinclude/
+
+ -- Goswin Brederlow <goswin.brederlow@student.uni-tuebingen.de>  Mon, 02 Sep 2002 02:37:25 +0200
+
+ace (5.2.1-1) unstable; urgency=low
+
+  * New upstream.
+  * Pulled in updated g++ configuration header and Linux Makefile rules
+    for ACE.  They allow implicit template instantiation to occur.
+  * Disabled support for the ACE_XT_Reactor.  Most folks never use it.
+
+ -- Ossama Othman <ossama@debian.org>  Mon, 25 Feb 2002 13:15:25 -0800
+
+ace (5.1.8-7) unstable; urgency=low
+
+  * Really removed the flex/lex checks in configure.in.
+
+ -- Ossama Othman <ossama@debian.org>  Wed, 28 Nov 2001 15:30:59 -0800
+
+ace (5.1.8-6) unstable; urgency=low
+
+  * Added "libtool" to Build-Depend field, and run libtoolize in `rules'
+    file to pull in links to recent config.sub, config.guess and
+    ltmain.sh revisions.  (Closes: #120141)
+  * Removed local autoconf test that checks if new() throws exception
+    on failure.  The test caused build hosts to come to a crawl.  g++
+    does indeed throw an exception.
+    Just configure that explicitly.  (Closes: #90731)
+  * Removed flex and yacc checks in configure.in.  They aren't necessary
+    to build ACE.
+  * Closed bug related to gcc internal compiler error.  (Closes: #85230)
+  * Removed unnecessary g++ dependency in control file.  (Closes: #84405)
+  * Added missing xlibs-dev dependency to libace5.1-dev package.
+
+ -- Ossama Othman <ossama@debian.org>  Mon, 26 Nov 2001 16:53:33 -0800
+
+ace (5.1.8-5.1) unstable; urgency=high
+
+  * NMU
+  * Added the missing build dependencies on flex and xlibs-dev.
+    (closes: #101170)
+
+ -- Adrian Bunk <bunk@fs.tum.de>  Sat, 10 Nov 2001 01:17:53 +0100
+
+ace (5.1.8-5) unstable; urgency=low
+
+  * libace5.1 and libace5.1-dev now conflict with their corresponding ACE
+    5.0 debian packages, since both sets of packages have files with the
+    same name.  libace5.1-dev also conflicts with libace4.6-dev.  (#74031)
+  * Added xlib6g-dev to the list of build dependencies.  The X11 libraries
+    aren't strictly necessary to build ACE, but the Debian packages enable
+    ACE's XtReactor support.
+  * Updated `README.Debian'.  The Debian ACE packages are no longer built
+    using experimental ACE Configuration Project distributions.  They are
+    built using the upstream distribution's autoconf support (contributed
+    by the ACE Configuration Project).
+
+ -- Ossama Othman <ossama@debian.org>  Thu,  5 Oct 2000 17:35:56 -0700
+
+ace (5.1.8-4) unstable; urgency=low
+
+  * Updated configure script from new upstream since it detects the CDROM
+    and STREAMS ioctl conflict in current kernels and glibc 2.1.94.  This
+    fixes a seg fault that would occur in ACE applications that use the
+    ACE_Reactor.
+
+ -- Ossama Othman <ossama@debian.org>  Wed,  4 Oct 2000 14:43:48 -0700
+
+ace (5.1.8-3) unstable; urgency=low
+
+  * Rebuilt against glibc 2.1.94 (pre-2.2).
+
+ -- Ossama Othman <ossama@debian.org>  Fri, 29 Sep 2000 12:40:39 -0700
+
+ace (5.1.8-2) unstable; urgency=low
+
+  * Added missing Build-Depends and Build-Depends-Indep fields to the
+    control file.  (#70113)
+  * Corrected `debian/rules' so that it doesn't erase the installed
+    `config-all.h' header.
+
+ -- Ossama Othman <ossama@debian.org>  Sat, 23 Sep 2000 09:54:26 -0700
+
+ace (5.1.8-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Ossama Othman <ossama@debian.org>  Fri, 25 Aug 2000 15:45:01 -0700
+
+ace (5.0.7-4) frozen unstable; urgency=low
+
+  * Rebuilt the packages so that they get installed in the unstable
+    distribution archive, in addition to the frozen one.  (#58366)
+
+ -- Ossama Othman <ossama@debian.org>  Wed, 24 May 2000 15:15:21 -0700
+
+ace (5.0.7-3) frozen; urgency=high
+
+  * Updated libtool related files from latest libtool multi-language
+    branch snapshot.  Regenerated the configure script.  It now has the
+    appropriate deplibs regex.  Apparently, there was a problem with M4
+    quoting in the last package upload.  (#63932)
+  * Explicitly enable C++ exception support.  A fix to the configure
+    script caused this to be necessary since the configure script disables
+    exception handling by default.
+  * Updated `debian/rules' file to use debhelper v2 support.
+  * Updated download location in `debian/copyright'.
+
+ -- Ossama Othman <ossama@debian.org>  Fri, 19 May 2000 15:05:30 -0700
+
+ace (5.0.7-2) frozen; urgency=low
+
+  * Updated `acewindex.html' file so that it is no longer empty.  (#50704)
+  * Updated `ACE_Log_Msg.3' man page so that important information is
+    included when it is generated.  This patch was incorporated upstream.
+    (#51224)
+  * Replaced configure script and related files with current upstream
+    configure script.  Patched OS.{h,i} with llseek/lseek64 related
+    upstream fixes.  This should correct the lseek64 and llseek problems
+    encountered in the m68k port.  (#50094, #51074)
+  * Updated ace-config.in with latest upstream since the previous one was
+    missing a "-lACE" in the library list.
+  * Fixed "--infodir" and "--mandir" configure script options in `rules'
+    file.  They incorrectly used a the actual install prefix instead of
+    the debian package install prefix.  This fixes a problem where the
+    gperf-ace documentation wasn't being registered doc-base.
+
+ -- Ossama Othman <ossama@debian.org>  Mon, 17 Jan 2000 18:39:18 -0800
+
+ace (5.0.7-1) unstable; urgency=low
+
+  * New upstream.
+  * Enabled C++ template repository during build.  This will reduce
+    the size of the resulting binaries by about 20%.
+  * Updated copyright file.  (updated distribution terms contain
+    suggestions contributed by Richard M. Stallman)
+  * FHS updates.
+  * Added versioned shlibs dependencies via "-V" option for dh_makeshlibs.
+    This is important since new versions of libACE are not always binary
+    compatible with previous versions.
+  * Updated libace5.0-dev to use package dh_installinfo to install
+    gperf-ace.info file.
+  * Minor update to ACE documentation index.html file.
+  * Added ACE man pages in HTML format.
+
+ -- Ossama Othman <ossama@debian.org>  Fri, 29 Oct 1999 21:13:10 -0500
+
+ace (4.6.44-1) unstable; urgency=low
+
+  * New upstream.
+
+ -- Ossama Othman <ossama@debian.org>  Tue, 13 Jul 1999 20:23:11 -0500
+
+ace (4.6.42-1) unstable; urgency=low
+
+  * New upstream.
+
+ -- Ossama Othman <ossama@debian.org>  Sat, 26 Jun 1999 15:46:16 -0500
+
+ace (4.6.37-1) unstable; urgency=low
+
+  * New upstream.
+  * Added doc-base support.
+
+ -- Ossama Othman <ossama@debian.org>  Tue, 27 Apr 1999 13:28:53 -0500
+
+ace (4.6.31-2) unstable; urgency=low
+
+  * Removed clone.1 man page since ACE clone utility isn't needed
+    for the Debian packages.
+
+ -- Ossama Othman <ossama@debian.org>  Mon, 22 Mar 1999 14:47:50 -0600
+
+ace (4.6.31-1) unstable; urgency=low
+
+  * New upstream beta.
+  * Added ACE PROBLEM-REPORT-FORM to each package. (#34455)
+  * Rebuilt against glibc 2.1.  (#34573)
+  * Added check for struct siginfo_t in signal.h.  Thanks to
+    Konstantinos Margaritis <kmargar@cc.uoa.gr> for pointing this
+    configuration bug out. (#34678)
+
+ -- Ossama Othman <ossama@debian.org>  Sun, 24 Jan 1999 15:49:04 -0500
+
+ace (4.6.15-1) unstable; urgency=low
+
+  * Updated to ACE release 4.6.15.
+
+ -- Ossama Othman <ossama@debian.org>  Sat, 16 Jan 1999 18:47:25 -0500
+
+ace (4.6.13-1) unstable; urgency=low
+
+  * Updated to ACE release 4.6.13.
+
+ -- Ossama Othman <ossama@debian.org>  Thu, 14 Jan 1999 19:54:41 -0500
+
+ace (4.6.12-2) unstable; urgency=low
+
+  * Forgot to change libace4.6-dev dependency from version 4.6.7 to 4.6.12.
+
+ -- Ossama Othman <ossama@debian.org>  Thu, 14 Jan 1999 02:47:13 -0500
+
+ace (4.6.12-1) unstable; urgency=low
+
+  * Updated to ACE release 4.6.12.
+
+ -- Ossama Othman <ossama@debian.org>  Thu, 14 Jan 1999 01:17:16 -0500
+
+ace (4.6.7-1) unstable; urgency=low
+
+  * Force libtool to link "-lpthread" into ACE's inter-library dependencies
+    since the configure script detects that the "-pthread" flag can be used
+    which make it unneccessary to explicitly link to "-lpthread."  However, we
+    want the "-lpthread" dependency since not all users or programs use the
+    "-pthread" compiler flag.
+  * Fixed packaging bug where run-time library package tried to install/remove
+    the gperf-ace info file.
+  * Updated to ACE release 4.6.7.
+
+ -- Ossama Othman <ossama@debian.org>  Tue, 15 Dec 1998 16:29:10 -0500
+
+ace (4.6.5-3) unstable; urgency=low
+
+  * Enabled ACE debugging macros.
+  * Enabled ACE logging macros (LM_DEBUG and LM_INFO).
+
+ -- Ossama Othman <ossama@debian.org>  Tue,  8 Dec 1998 14:22:02 -0500
+
+ace (4.6.5-2) unstable; urgency=low
+
+  * Released ace-4.6.5-2 packages.
+  * gperf files (gperf, gperf.1 and gperf.info) will be installed as gperf-ace
+    to prevent conflicts with the existing Cygnus based gperf package.
+  * Corrected libACE compile list by removing template sources from the
+    libACE "SOURCES" make variable.
+
+ -- Ossama Othman <ossama@debian.org>  Thu,  3 Dec 1998 15:59:06 -0500
+
+ace (4.6.5-1) unstable; urgency=low
+
+  * Released ace-4.6.5-1 packages
+
+ -- Ossama Othman <othman@astrosun.tn.cornell.edu>  Tue,  1 Dec 1998 16:09:49 -0500
+
+ace (4.6.4-2) unstable; urgency=low
+
+  * Added libnsl to library check for t_accept() (not a Debian issue).
+  * Moved all pre-processor related lines to the first column of the M4 block
+    so that they will be in the first column of their respective test programs.
+  * Made definition of ACE_HAS_NONSTATIC_OBJECT_MANAGER a configure script
+    option since there was no working autoconf test for it.
+
+ -- Ossama Othman <othman@astrosun.tn.cornell.edu>  Mon, 30 Nov 1998 17:24:49 -0500
+
+ace (4.6.4-1) unstable; urgency=low
+
+  * Added "install-info" commands to postinst and prerm scripts.
+  * Added a "modernized" gperf.info to the distribution.
+  * Added "#ifndef" guards to PACKAGE, VERSION, DEBUG and NDEBUG macros in
+    acconfig.h to prevent redefinition when using ACE with a package that
+    defines them.
+  * Added Env_Value_T.cpp to list of template sources to be installed.
+  * Moved ace-config script to "-dev" package.
+  * Added gperf to the distribution.
+
+ -- Ossama Othman <othman@astrosun.tn.cornell.edu>  Fri, 13 Nov 1998 16:02:32 -0500
+
+ace (4.6.3-2) unstable; urgency=low
+
+  * Released ace-4.6.3-2 packages.
+  * Corrected ace-config and configure scripts so that the X11 libraries are
+    displayed correctly by the ace-config script.
+
+ -- Ossama Othman <othman@astrosun.tn.cornell.edu>  Thu, 12 Nov 1998 17:24:11 -0500
+
+ace (4.6.3-1) unstable; urgency=low
+
+  * Initial Release.
+
+ -- Ossama Othman <othman@astrosun.tn.cornell.edu>  Thu, 12 Nov 1998 13:13:59 -0500
+
diff --git a/ACE/debian/control b/ACE/debian/control
new file mode 100644
index 00000000000..f9fc99c8e62
--- /dev/null
+++ b/ACE/debian/control
@@ -0,0 +1,367 @@
+Source: ace
+Section: devel
+Priority: optional
+Maintainer: Debian ACE+TAO maintainers <pkg-ace-devel@lists.alioth.debian.org>
+Uploaders: Thomas Girard <thomas.g.girard@free.fr>, Johnny Willemsen <jwillemsen@remedy.nl>
+Build-Depends: debhelper, libssl-dev, libxt-dev (>= 4.3.0), libfltk1.1-dev (>= 1.1.4), tk-dev (>= 8.5), libfox-1.6-dev, docbook-to-man, libxerces-c-dev
+Build-Depends-Indep: doxygen, graphviz
+Standards-Version: 4.1.1
+Vcs-Git: git://anonscm.debian.org/pkg-ace/pkg-ace.git
+Vcs-Browser: https://anonscm.debian.org/gitweb/?p=pkg-ace/pkg-ace.git;a=summary
+Homepage: http://www.dre.vanderbilt.edu/~schmidt/ACE.html
+
+Package: mpc-ace
+Architecture: all
+Depends: ${perl:Depends}, ${misc:Depends}
+Recommends: make
+Replaces: libace-dev (= 5.6.3-4)
+Suggests: libace-dev, pkg-config
+Description: makefile, project, and workspace creator
+ This package contains the Makefile, Project, and Workspace Creator (MPC)
+ as distributed with the ACE toolkit.
+ .
+ MPC generates platform- and compiler-specific files to automate the
+ compilation process.
+ .
+ The following programs are included:
+  * mpc-ace: generates project files for a single target
+  * mwc-ace: generates workspace files for a set of projects
+
+Package: libace-6.4.7
+Architecture: any
+Section: libs
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: C++ network programming framework
+ This package contains the ADAPTIVE Communication Environment (ACE)
+ framework.
+ .
+ It provides platform independent C++ wrappers for all forms of IPC,
+ thread- and process-management routines, and much more.
+ .
+ Moreover, it defines patterns for common communication tasks.
+  * Reactor: handles event demultiplexing and dispatching
+  * Proactor: for asynchronous I/O driven programs
+
+Package: libace-dev
+Architecture: any
+Section: libdevel
+Depends: libace-6.4.7 (= ${binary:Version}), ${misc:Depends}
+Suggests: libace-doc, pkg-config
+Replaces: mpc-ace (<< 5.6.3-4)
+Description: C++ network programming framework - development files
+ This package contains the header files and static library for the ACE
+ framework.
+
+Package: libace-doc
+Architecture: all
+Section: doc
+Depends: ${misc:Depends}
+Suggests: libace-dev
+Recommends: doc-base
+Description: C++ network programming framework - documentation
+ This package contains the ACE overview documentation, tutorials,
+ examples, and information regarding upstream development.
+
+Package: libace-ssl-6.4.7
+Architecture: any
+Section: libs
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: ACE secure socket layer library
+ This package contains wrappers that integrate the OpenSSL library in
+ the ACE framework.
+
+Package: libace-ssl-dev
+Architecture: any
+Section: libdevel
+Depends: libace-ssl-6.4.7 (= ${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.4.7
+Architecture: any
+Section: libs
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: ACE reliable multicast library
+ The RMCast library is a reliable source-ordered multicast protocol
+ implementation.
+ .
+ It uses sequence numbers on messages to ensure ordering, loss
+ detection, and suppression of duplicates.
+
+Package: libace-rmcast-dev
+Architecture: any
+Section: libdevel
+Depends: libace-rmcast-6.4.7 (= ${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.4.7
+Architecture: any
+Section: libs
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: ACE transactional multicast library
+ The TMCast library is a transactional multicast protocol
+ implementation.
+ .
+ Each message is delivered to multicast group members as a
+ transaction: an atomic, consistent, and isolated action.
+
+Package: libace-tmcast-dev
+Architecture: any
+Section: libdevel
+Depends: libace-tmcast-6.4.7 (= ${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.4.7
+Architecture: any
+Section: libs
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: ACE protocol over HTTP tunneling library
+ The HTTP Tunneling, Bidirectional, Protocol (HTBP) library enables
+ the writing of stream-based protocols over HTTP.
+ .
+ This allows clients behind a firewall to establish a connection with
+ outbound servers using the HTTP protocol.
+
+Package: libace-htbp-dev
+Architecture: any
+Section: libdevel
+Depends: libace-htbp-6.4.7 (= ${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.4.7
+Architecture: any
+Section: libs
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: ACE Inet protocol library
+ This package provides an ACE addon library for clients (and possibly
+ servers at some point) using Inet protocols, such as HTTP or FTP.
+
+Package: libace-inet-dev
+Architecture: any
+Section: libdevel
+Depends: libace-inet-6.4.7 (= ${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.4.7
+Architecture: any
+Section: libs
+Depends: libace-inet-6.4.7, libace-ssl-6.4.7, ${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
+ HTTPS or FTPS.
+
+Package: libace-inet-ssl-dev
+Architecture: any
+Section: libdevel
+Depends: libace-inet-ssl-6.4.7 (= ${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.
+
+Package: ace-gperf
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Breaks: gperf-ace (<< 5.7.7-1)
+Replaces: gperf-ace (<< 5.7.7-1)
+Description: ACE perfect hash function generator
+ ace_gperf is the ACE version of gperf.
+ .
+ Both ace_gperf and gperf were written by the same author, and have
+ basically the same options and functionality. ace_gperf simply takes
+ advantage of some of the features provided by the ACE library.
+
+Package: libacexml-6.4.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
+Replaces: libace-dev (<< 5.7.7-4)
+Depends: libacexml-6.4.7 (= ${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.4.7
+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 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.4.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.4.7
+Architecture: any
+Section: libs
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: ACE scheduling and dispatching library
+ Kokyu is a library designed to provide flexible scheduling and
+ dispatching services.
+ .
+ Currently it provides real-time scheduling and dispatching services
+ for TAO real-time CORBA Event Service.
+
+Package: libkokyu-dev
+Architecture: any
+Section: libdevel
+Depends: libkokyu-6.4.7 (= ${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.4.7
+Architecture: any
+Section: libs
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: ACE-GUI reactor integration for Xt
+ 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
+ with a specific toolkit. By using these reactors, your GUI
+ application can remain single threaded yet still respond to both GUI
+ events, such as button presses, and your own application events.
+ .
+ The ACE_XtReactor extends both the ACE_Select_Reactor and the X
+ Toolkit library function XtWaitForMultipleEvents().
+
+Package: libace-xtreactor-dev
+Architecture: any
+Section: libdevel
+Depends: libace-xtreactor-6.4.7 (= ${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.4.7
+Architecture: any
+Section: libs
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: ACE-GUI reactor integration for Tk
+ 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
+ with a specific toolkit. By using these reactors, your GUI
+ application can remain single threaded yet still respond to both GUI
+ events, such as button presses, and your own application events.
+ .
+ The ACE_TkReactor provides reactor functionality around the popular
+ Tcl/Tk library. The underlying Tcl/Tk method used is
+ Tcl_DoOneEvent().
+
+Package: libace-tkreactor-dev
+Architecture: any
+Section: libdevel
+Depends: libace-tkreactor-6.4.7 (= ${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.4.7
+Architecture: any
+Section: libs
+Depends: ${shlibs:Depends}, ${misc:Depends}
+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
+ with a specific toolkit. By using these reactors, your GUI
+ application can remain single threaded yet still respond to both GUI
+ events, such as button presses, and your own application events.
+ .
+ The ACE_FlReactor integrates with the FastLight toolkit's Fl::wait()
+ method.
+
+Package: libace-flreactor-dev
+Architecture: any
+Section: libdevel
+Depends: libace-flreactor-6.4.7 (= ${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.4.7
+Architecture: any
+Section: libs
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: ACE-GUI reactor integration for FOX
+ 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
+ with a specific toolkit. By using these reactors, your GUI
+ application can remain single threaded yet still respond to both GUI
+ events, such as button presses, and your own application events.
+ .
+ The ACE_FoxReactor integrates with the FOX toolkit.
+
+Package: libace-foxreactor-dev
+Architecture: any
+Section: libdevel
+Depends: libace-foxreactor-6.4.7 (= ${binary:Version}), libace-dev (= ${binary:Version}), libfox-1.6-dev, ${misc:Depends}
+Description: ACE-GUI reactor integration for FOX - development files
+ This package contains header files and static library for the ACE-FOX
+ reactor integration.
+
+Package: ace-netsvcs
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: ACE network service implementations
+ ACE network services provide reusable components for common
+ distributed system tasks such as logging, naming, locking, and time
+ synchronization.
+ .
+ This package contains driver programs and example configuration
+ files to link the various ACE network services together, either
+ statically or dynamically, and form complete server programs.
+
+Package: libnetsvcs-6.4.7
+Architecture: any
+Section: libs
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: ACE network service implementations - libraries
+ ACE network services provide reusable components for common
+ distributed system tasks such as logging, naming, locking, and time
+ synchronization.
+ .
+ This package contains runtime libraries for ACE network services.
+
+Package: libnetsvcs-dev
+Architecture: any
+Section: libdevel
+Depends: libnetsvcs-6.4.7 (= ${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
+ synchronization.
+ .
+ This package contains header files and static library for the ACE
+ network services library.
diff --git a/ACE/debian/debian.changelog b/ACE/debian/debian.changelog
deleted file mode 100644
index ed34c59f384..00000000000
--- a/ACE/debian/debian.changelog
+++ /dev/null
@@ -1,1324 +0,0 @@
-ace (6.4.5+dfsg-1) unstable; urgency=medium
-
-  [ Johnny Willemsen ]
-  * New upstream version:
-    - fixes FTBFS with GCC-7. Closes: #853299.
-    - can use openssl 1.1. Closes: #851424.
-    - fixes GNU/FreeBSD FTBFS. Closes: #823592.
-  * Cleanup packaging:
-    - re-enable PIE. Closes: #859350.
-    - remove Marek from uploaders.
-
-  [ Thomas Girard ]
-  * Remove Pau from uploaders.
-  * Fix repackaging process by removing bashism.
-  * Remove QtReactor until it gets ported to Qt5. Closes: #874813.
-  * Remove d/p/37-remove-google-tracking.diff, no longer needed.
-  * Bump Standards-Version: to 4.1.0.
-
- -- Thomas Girard <thomas.g.girard@free.fr>  Sat, 16 Sep 2017 17:29:35 +0200
-
-ace (6.3.3+dfsg-1.2) unstable; urgency=medium
-
-  * Non-maintainer upload.
-  * Build against libssl1.0.2 (Closes: #828229).
-  * Merge build-indep rules into build-arch rules so it builds with -A as it
-    did before (Closes: #806602).
-
- -- Sebastian Andrzej Siewior <sebastian@breakpoint.cc>  Sat, 14 Jan 2017 13:47:41 +0000
-
-ace (6.3.3+dfsg-1.1) unstable; urgency=medium
-
-  * Non-maintainer upload.
-  * Fix FTBFS in kfreebsd.  Closes: #825709
-
- -- Mattia Rizzolo <mattia@debian.org>  Fri, 01 Jul 2016 05:43:35 +0000
-
-ace (6.3.3+dfsg-1) unstable; urgency=medium
-
-  [ Pau Garcia i Quiles ]
-  * New upstream version
-
-  [ Peter Michael Green ]
-  * Add patch to remove use of sslv3 methods which are no longer provided by
-    the Debian openssl package.
-
-  [ Thomas Girard ]
-  * Integrate fix from Kurt Roeckx <kurt@roeckx.be> thru patch from
-    Peter Michael Green <plugwash@raspbian.org> to remove use of sslv3.
-    Thanks to both of them. Closes: #804326.
-
- -- Thomas Girard <thomas.g.girard@free.fr>  Sun, 15 Nov 2015 11:30:34 +0100
-
-ace (6.3.2+dfsg-1) unstable; urgency=medium
-
-  * New upstream version
-  * Use new ChangeLog filename and location instead of the old
-    <root>/ChangeLog
-  * Update get-orig-source.sh to remove .gitignore files (reported upstream)
-  * Delete stale doxygen_sqlite3.db file left by recent versions of Doxygen
-  * Update standards to 3.9.6.1 (no changes needed)
-
- -- Pau Garcia i Quiles <pgquiles@elpauer.org>  Thu, 02 Jul 2015 21:53:49 +0200
-
-ace (6.3.0+dfsg-1) UNRELEASED; urgency=medium
-
-  * New upstream version
-  * Update standards to 3.9.6.0 (no changes needed)
-
- -- Pau Garcia i Quiles <pgquiles@elpauer.org>  Sat, 15 Nov 2014 01:47:59 +0100
-
-ace (6.2.8+dfsg-1) unstable; urgency=medium
-
-  * New upstream version
-  * Drop patch 25-versioned_so.diff (applied upstream)
-  * Drop patch 36-fix-typos.diff (applied upstream)
-  * Drop patch 38-fix-predictable-filename-in-tmp.diff (applied upstream)
-  * Drop patch largefile.diff (applied upstream)
-
- -- Pau Garcia i Quiles <pgquiles@elpauer.org>  Wed, 01 Oct 2014 19:27:00 +0200
-
-ace (6.2.7+dfsg-2) unstable; urgency=medium
-
-  * Add patch 38-fix-predictable-filename-in-tmp. Closes: #760709
-
- -- Pau Garcia i Quiles <pgquiles@elpauer.org>  Sun, 07 Sep 2014 14:35:23 +0200
-
-ace (6.2.7+dfsg-1) unstable; urgency=low
-
-  [ Johnny Willemsen ]
-  * New upstream release. Closes: #746825, #724774, #734393
-
-  [ Pau Garcia i Quiles ]
-  * Enable hardening
-  * Add Large File Support
-  * Add lintian overrides for safe-to-be-ignored issues
-  * Add patch 36-fix-typos (submitted upstream)
-  * Add patch 37-remove-google-tracking
-  * Update standards to 3.9.5.0
-  * Repack upstream source using get-orig-source.sh and add usage note to
-    README.source
-  * Remove all TAO-related stuff due to DFSG-incompatibility
-  * Remove deprecated DM-Upload-Allowed field
-
- -- Pau Garcia i Quiles <pgquiles@elpauer.org>  Sun, 29 Jun 2014 12:40:36 +0200
-
-ace (6.1.7-1) UNRELEASED; urgency=low
-
-  [ Pau Garcia i Quiles ]
-  * New upstream release
-  * Add new library ACE XML_Utils (packages: libace-xml-utils-{6.1.3,dev})
-    (adds a build-depenency on xerces3)
-
-  [ Johnny Willemsen ]
-  * Integrate most Debian changes into upstream repo, hence drop no longer
-    relevant patches.
-  * Ship and use TAO_ACE.mwc; this simplify makefile generation, compilation,
-    and installation.
-
-  [ Thomas Girard ]
-  * debian/README.source: update instructions.
-  * debian/patches/15-use-lzo2.diff: rework this patch.
-  * debian/fix_doxygen.sh: adapt to latest changes.
-  * debian/patches/reduce-doxygen-doc.diff: regenerate.
-  * debian/control lintian fixes:
-    o Bump Standards-Version: to 3.9.4.
-    o Tighen dependency on debhelper to be on par with debian/compat.
-    o Drop obsolete DM-Upload-Allowed: section. For the record, details
-      on how to do this now is available from:
-      https://lists.debian.org/debian-devel-announce/2012/09/msg00008.html
-  * Add *_RLECompressor and ACE_Compressor libraries.
-
- -- Thomas Girard <thomas.g.girard@free.fr>  Tue, 01 Jan 2013 14:53:42 +0100
-
-ace (6.1.2-1) experimental; urgency=low
-
-  * New upstream release.
-  * debian/patches/16-ace-inet-pkgconfig-files.diff: drop, integrated.
-  * debian/patches/prevent_doxygen_ace_manpages.diff: ditto.
-  * debian/patches/reduce-doxygen-doc.diff: reworked since HTMLHelp is
-    no longer generated.
-  * debian/patches/20-versioned_libs.diff: refreshed.
-  * debian/patches/34-bts386713.diff: refreshed.
-  * debian/patches/92-default-ACE_ROOT.diff: refreshed.
-
- -- Thomas Girard <thomas.g.girard@free.fr>  Sat, 16 Jun 2012 20:51:01 +0200
-
-ace (6.0.3+dfsg-0.2) unstable; urgency=low
-
-  * NMU to rebuild with up-to-date tool chain (closes: #723856)
-
- -- Barak A. Pearlmutter <bap@debian.org>  Tue, 08 Oct 2013 10:24:20 +0100
-
-ace (6.0.3+dfsg-0.1) unstable; urgency=low
-
-  * NMU with maintainers blessing.
-  * Remove upstream files with nonfree licence (closes: #697848) or
-    without source (closes: #697847):
-    - repack the orig tarball by removing:
-        bin/LabVIEW_RT/*.exe
-        examples/{C++NPv2,C++NPv1,APG}/
-        TAO/
-    - debian/control: drop all packages named *tao*
-    - debian/rules: drop everything related to tao
-    - remove all hunks applying to TAO files in patch
-    - reduce-doxygen-doc.diff
-    - drop patch 34-bts386713.diff since it applies only to TAO files.
-    - debian/copyright: remove copyright entries of TAO/, and of the
-      directories under examples/ that have been removed.
-  * Bump version in build-dependency on debhelper to >=9 since we are using
-    debhelper compatibility level 9.
-
- -- Ralf Treinen <treinen@debian.org>  Wed, 23 Jan 2013 21:27:40 +0100
-
-ace (6.0.3-5) unstable; urgency=low
-
-  * debian/control:
-    o define Build-Depends-Indep: for documentation generation.
-    o Build-Depends on dpkg-dev >= 1.16.2 to have dpkg-buildpackage -B
-      correctly invoke build-arch then binary-arch. Closes: #657844.
-  * debian/libace-dev.README.Debian: mention how to make ACE Service
-    Configuration work in Debian. Closes: #656040.
-
- -- Thomas Girard <thomas.g.girard@free.fr>  Fri, 30 Mar 2012 20:03:40 +0200
-
-ace (6.0.3-4) unstable; urgency=low
-
-  * Remove work-around for arm now that g++-4.6 ICE is fixed.
-    Closes: #653642, #654743.
-  * Really ensure doxygen is not being run when invoking build-arch.
-    Closes: #657844.
-
- -- Thomas Girard <thomas.g.girard@free.fr>  Sat, 04 Feb 2012 17:24:25 +0100
-
-ace (6.0.3-3) unstable; urgency=low
-
-  * Build with g++-4.4 on armel to work-around #644722. Closes: #644826.
-    Thanks to Peter Green for the report and work-around investigation.
-  * debian/lib{ace,tao}-dev.install, debian/tao-utils.install: perform brace
-    expansion instead of letting debhelper do it "due to an accident". Helped
-    removing no longer needed expansions.
-  * debian/control: move transitional packages to section oldlibs, priority
-    extra, as per lintian warning recommendation.
-
- -- Thomas Girard <thomas.g.girard@free.fr>  Wed, 28 Dec 2011 10:46:18 +0100
-
-ace (6.0.3-2) unstable; urgency=low
-
-  * Upload to unstable.
-  * Remove the build part in build %: make rule. GNU make 3.82 doesn't
-    like it. Should fix the FTBFS seen on experimental/amd64 where make 3.82
-    is installed.
-  * debian/rules: prevent long generation of doxygen documentation in arch-dep
-    build by defining binary-arch: and binary-indep: targets. This requires
-    switching to debhelper level 9.
-  * debian/rules: overriding dh_fixperm for needed packages only.
-    Closes: #636028.
-  * debian/*.examples: move examples here.
-  * debian/ace-netsvcs.doc-base: remove extra space at end of document field.
-
- -- Thomas Girard <thomas.g.girard@free.fr>  Sat, 30 Jul 2011 21:38:07 +0200
-
-ace (6.0.3-1) experimental; urgency=low
-
-  [ Thomas Girard ]
-  * Drop obsolete patch multiarch.dpatch.
-  * Really install NEWS file with libace-ssl.
-  * Convert to format 3.0 (quilt):
-    o Drop dpatch dependency
-    o Do not repackage upstream tarball
-    o rework patches 90 and 91 so that they can be applied before building
-  * Convert debian/rules to debhelper level 8.
-  * Convert patches to DEP3 format.
-  * debian/watch: use ACE+TAO-src-*.tar.bz2 since we don't package CIAO.
-  * Port to GNU/Hurd.
-  * Make tao-idl and tao-ifr depend on g++; we need cpp for preprocessing.
-  * Change descriptions to match new binary names.
-  * Replace Conflicts:/Replaces: with Breaks:/Replaces:, following lintian
-    recommendation.
-  * Register ace-netsvcs documentation with doc-base (again, thanks lintian).
-
-  [ Pau Garcia i Quiles ]
-  * New upstream patch release. Closes: #628572.
-  * Drop patch 11-promote-QtResource-to-qt4
-
- -- Thomas Girard <thomas.g.girard@free.fr>  Wed, 27 Jul 2011 15:34:32 +0200
-
-ace (6.0.1-3) unstable; urgency=low
-
-  * Convert to format 3.0 (quilt):
-    o Drop dpatch dependency
-    o Do not repackage upstream tarball
-  * Convert debian/rules to debhelper level 8.
-  * Port to GNU/Hurd.
-  * debian/watch: use ACE+TAO-src-*.tar.bz2 since we don't package CIAO.
-  * debian/patches/multiarch.dpatch: change detection of librt.so to use
-    getconf so that it does not break with multiarch locations.
-    Closes: #629657.
-  * debian/NEWS.Debian: mention that SSL v2 was removed from Debian
-    packages.
-  * Enhance package descriptions. Thanks to Gerfried Fuchs for the
-    report, and to Justin B Rye from debian-l10n-english@ for
-    his changes. Closes: #599549.
-
- -- Thomas Girard <thomas.g.girard@free.fr>  Mon, 20 Jun 2011 21:05:52 +0200
-
-ace (6.0.1-2) unstable; urgency=low
-
-  [ Thomas Girard ]
-  * Import into git.
-  * debian/control: change Vcs-* accordingly.
-  * Restore lost changelog entries, thanks to git!
-  * Add DM-Upload-Allowed: yes to debian/control.
-  * Bump Standards-Version: to 3.9.2.
-
-  [ Pau Garcia i Quiles ]
-  * Disable SSLv2 by adding patch 35_disable_sslv2 (Closes: #622074)
-
- -- Thomas Girard <thomas.g.girard@free.fr>  Sun, 01 May 2011 13:02:17 +0200
-
-ace (6.0.1-1) unstable; urgency=low
-
-  [ Pau Garcia i Quiles ]
-  * New upstream release
-  * Drop patch 12-add-DESTDIR-to-MPC (applied upstream)
-  * Drop patch 13-add-QtReactor-export (applied upstream)
-  * Drop patch 14-fix-tcl-flags (applied upstream)
-  * Drop patch 16-fix-pidl-install (applied upstream)
-  * Update patch 11-promote-QtResource-to-qt4
-  * Update patch 15-fix-lzo-flags
-  * Update patch 34-bts386713
-  * Require debhelper >= 7 (it was already required, in practice)
-  * Register documentation with doc-base
-  * Explicitly set source format 1.0 until we move to 3.0
-  * Package ACE_INet and ACE_INet_SSL
-
-  [ Thomas Girard ]
-  * Build-depend on Tcl/Tk >= 8.5.
-
- -- Pau Garcia i Quiles <pgquiles@elpauer.org>  Sun, 20 Feb 2011 16:33:13 +0100
-
-ace (6.0.0-1) experimental; urgency=low
-
-  * New upstream release:
-    o use new make install target.
-    o remove generator_pkgconfig.sh, no longer needed.
-    o new binary renaming:
-      - LoadManager => tao_loadmanager
-      - LoadMonitor => tao_loadmonitor
-      - ImplRepo_Service => tao_imr_locator
-      - ImR_Activator => tao_imr_activator
-      - IFR_Service => tao_ifr_service
-      - Fault_Detector => tao_fault_detector
-      - Fault_Notifier => tao_fault_notifier
-      - Scheduling_Service => tao_cosscheduling
-      - Dump_Schedule => tao_dump_schedule
-    o remove libACE_gperf_lib.
-    o remove patches that were merged upstream:
-      - 11-create-ace_qt4reactor-mpb.dpatch
-      - 12-create-config_kfreebsd.dpatch
-      - 16-rename-tao-programs.dpatch
-      - 24-add-missing-headers.dpatch
-      - 25-remove-duplicate-files.dpatch
-      - 47-change-netsvcs.dpatch
-      - 48-fix-doxygen-cross-links.dpatch
-    o remove useless patches:
-      - 10-fix-prj-install.dpatch
-      - 19-gcc43.dpatch
-    o rework existing patches:
-      - 20-versioned_libs.dpatch, for versioned_so=2
-      - 34-bts386713.dpatch
-      - 90-patch-mpc-basedir.dpatch
-    o new patches or scripts:
-      - 12-add-DESTDIR-to-MPC.dpatch, to add and use DESTDIR in make install
-      - 13-add-QtReactor_export.h.dpatch, to add a missing header in
-        libace-qtreactor-dev package.
-      - 16-fix-pidl-install.dpatch, to add missing .pidl files.
-      - fix_doxygen.sh, to regenerate the patch for Doxygen reduction.
-  * Bump Standards-Version: to 3.9.1.
-
- -- Thomas Girard <thomas.g.girard@free.fr>  Thu, 06 Jan 2011 07:39:04 +0100
-
-ace (5.7.7-4) unstable; urgency=high
-  [ Marek Brudka ]
-  * Synchronized *.pc with *.so and created transitional tags. Closes: #598169
-
- -- Marek Brudka <mbrudka@aster.pl>  Mon, 27 Sep 2010 20:36:00 +0200
-
-ace (5.7.7-3) unstable; urgency=low
-  [ Marek Brudka ]
-  * Configuration file for KFreeBSD created. Closes: #591586.
-  * Restored pkgconfig files. Closes: #591610.
-  * Provided manpages for tao_catior, tao_nslist, tao_nsdel,
-    tao_nsadd, ace_netsvcs.
-
-  [ Thomas Girard ]
-  * Disable -fvisibility=hidden on armel since it does not seem to work on
-    that platform. Closes: #593225.
-
- -- Thomas Girard <thomas.g.girard@free.fr>  Tue, 07 Sep 2010 20:04:20 +0200
-
-ace (5.7.7-2) unstable; urgency=low
-
-  * Rebuild with sid tk-dev build-dependency. Closes: #590512.
-
- -- Thomas Girard <thomas.g.girard@free.fr>  Mon, 02 Aug 2010 23:49:01 +0200
-
-ace (5.7.7-1) unstable; urgency=low
-
-  [ Thomas Girard ]
-  * Add Marek to Uploaders: field.
-  * Remove dependencies on autotools; these are no longer needed now that we
-    have agreed to move back to the traditional compilation method.
-  * Add bzip2 and lzo ZIOP implementation.
-  * New patch: 20-versioned_libs.dpatch, to generate libraries with names
-    following libACE-5.7.7.so pattern instead of libACE.so.5.7.7.
-  * Rename binaries and packages to follow what is used in RPMs.
-  * Move $ACE_ROOT to /usr/lib/ace.
-
-  [ Marek Brudka ]
-  * New upstream release:
-    o add libACE_gperf, libACE_ETCL and libACE_Monitor_Control to libace
-    o add headers and libraries for Monitor, ZIOP, ETCL to libtao package
-    o renamed gperf-ace to ace_gperf to follow the upstream convention
-    o renamed utilities (ns{add,del,list} to tao_ns{add,del,list}) in tao-utils
-      to follow the upstream changes
-  * Change compilation back to traditional ACE+TAO build method:
-    o adapt existing Debian build mechanism
-    o remove patches no longer needed because of this switch
-    o use MPC generated makefiles
-    o install build result using MPC/prj_install.pl and .ins files
-    o temporarily excluded logWalker from build
-  * New patch: 10-fix-prj-install to work-around a problem installing files
-  * Added PerlACE to mpc-ace. Closes: #522557
-  * Created patch to reduce the size of doxygen doc. Closes: #562164
-  * Created patch to fix cross references in doxygen tags
-  * Created libnetsvcs packages. Closes: #466137. Addresses: LP#185285
-  * Moved IDL fiels from /usr/include into /usr/share/idl
-
-  [ Pau Garcia i Quiles ]
-  * New upstream release
-  * Add dependency on ${misc:Depends}
-  * Add new libraries and update patch 34-bts386713 accordingly
-  * Update patch 02-qt4 (partially fixed upstream)
-  * Drop patch 05-autoconf-fox (fixed upstream)
-  * Drop patch 06-fix-kokyu-mpc (fixed upstream)
-  * Drop patch 07-autoconf-fix-gperf (fixed upstream)
-  * Drop patch 08-fix-perl-shebang (fixed upstream)
-  * Drop patch 10-fix-fox-resource-export (fixed upstream)
-  * Drop patch 11-fix-fox-reactor.dpatch (fixed upstream)
-  * Update patch 12-fix-fox-include
-  * Drop patch 13-fix-fox-errors (fixed upstream except for the #include, which
-    I have now merged in 12-fix-fox-include)
-  * Drop patch 14-autoconf-tao (fixed upstream)
-  * Drop patch 15-fix-fltk-include (fixed upstream)
-  * Drop patch 17-protect-mpc-path (fixed upstream)
-  * Drop patch 18-fix-bswap-detection (fixed upstream)
-  * Update patch 19-gcc43
-  * Drop patch 20-fix-iostream-detection (fixed upstream)
-  * Drop patch 22-remove-Ge-doc (fixed upstream)
-  * Drop patch 23-add-sh-shebang (fixed upstream)
-  * Update patch 24-add-missing-headers (WORK IN PROGRESS)
-  * Update patch 34-bts386713
-  * Drop patch 49-missing-template (fixed upstream)
-  * Update patch 90-patch-mpc-basedir
-  * Update patch 91-patch-dg-basedir
-  * Add patch 93-hack-to-fix-libtoolize
-  * Add patch 94-build-crosscompile
-  * Add patch 95-build-ace-for-tao
-  * Add patch 96-build-athena3d
-  * Remove DH_COMPAT definition from the debian/rules file, it's already in
-    debian/compat
-  * Fix fox-config location, detection method has changed since 5.6.3
-
- -- Thomas Girard <thomas.g.girard@free.fr>  Sun, 23 May 2010 16:58:42 +0200
-
-ace (5.6.3-6) unstable; urgency=low
-
-  [ Thomas Girard ]
-  * Remove obsolete maintainers:
-    - Konstantinos Margaritis <markos@debian.org>
-    - Brian Nelson <pyro@debian.org>
-    Closes: #521487.
-  * Bump Standards-Version: to 3.8.3.
-  * Remove erroneous #define ACE_SCANDIR_CMP_USES_CONST_VOIDPTR in config.h;
-    causing diagnostics to FTBFS. Closes: #552899.
-  * Remove extra ACLOCAL_AMFLAGS from already existing Makefile.am; causing
-    recent aclocal to abort. Thanks to Pau Garcia i Quiles for the patch.
-    Closes: #518735.
-  * Add README.source.
-  * Add Pau Garcia i Quiles to the list of maintainers.
-  * Fix many issues spotted by lintian.
-
-  [ Pau Garcia i Quiles ]
-  * Add new patches:
-    - Remove duplicate files from .mpc files so that Makefile.am files do
-      not have duplicates
-    - Run autoupdate and autoreconf in the ACE and TAO directories in order
-      to update from libtool 1.5 (what upstream uses) to libtool 2.2
-
- -- Thomas Girard <thomas.g.girard@free.fr>  Sun, 13 Dec 2009 11:47:50 +0100
-
-ace (5.6.3-5) unstable; urgency=low
-
-  * Do not ship MPC config files in both mpc-ace and libace-dev packages;
-    they're meant to be only in mpc-ace. Make mpc-ace Replaces: the bogus
-    previous upload. Closes: #484718.
-  * Bump Standards-Version: to 3.8.0.
-
- -- Thomas Girard <thomas.g.girard@free.fr>  Fri, 13 Jun 2008 21:52:28 +0000
-
-ace (5.6.3-4) unstable; urgency=low
-
-  * Add the following missing programs to libace-dev:
-    o $ACE_ROOT/bin/generate_export_file.pl
-    o $ACE_ROOT/bin/split-cpp
-    o $ACE_ROOT/bin/g++dep
-    o $ACE_ROOT/bin/add_rel_link.sh
-  * Move DependencyGenerator from mpc-ace to libace-dev.
-  * New patch, 22-remove-Ge-doc.dpatch, to remove documentation for
-    tao_idl -Ge flag that no longer works. Thanks to Pascal Giard for
-    reporting this.
-  * Remove PACKAGE_* definitions from /usr/include/ace/config.h. Thanks to
-    Pascal Giard for reporting this.
-  * Remove pre-etch Conflicts: and Replaces: information.
-  * Add missing headers found with cmp-installation.sh. Closes: #481088.
-
- -- Thomas Girard <thomas.g.girard@free.fr>  Sat, 24 May 2008 15:47:01 +0000
-
-ace (5.6.3-3) unstable; urgency=low
-
-  * Pass full path to fox-config-1.6 instead of trying to detect fox-config
-    since fox-config is an alternative. Should fix multiple FTBFS.
-  * Enable IPv6 again. Disabling it was a mistake: it does work. But on an
-    IPv4 only host one need to specify the end-point to use, e.g. :
-      Naming_Service -ORBEndPoint iiop://localhost:1234
-
- -- Thomas Girard <thomas.g.girard@free.fr>  Thu, 24 Apr 2008 18:27:07 +0000
-
-ace (5.6.3-2) unstable; urgency=low
-
-  * Add missing libfox-1.6-dev build dependency. Thanks to Bastian Blank for
-    the report. Closes: #476822.
-  * Build depend on libqt4-dev (>= 4.4~rc1-4) to fix FTBFS. Thanks to
-    Martin Zobel-Helas for the report and to Sune Vuorela for the fix.
-    Closes: #476505.
-  * Add platform_macros.GNU.in and have autotools handle it so that it's
-    possible to ship rules.*.GNU. Closes: #469843, #469845.
-  * Remove doxygen-generated files we don't need.
-  * (Build-)Depend on tk-dev instead of tk8.4-dev.
-  * Rework debian/patches/05-autoconf-fox.dpatch not to link against too
-    many libs.
-  * Restore doxygen build-dependency.
-
- -- Thomas Girard <thomas.g.girard@free.fr>  Tue, 22 Apr 2008 18:23:46 +0000
-
-ace (5.6.3-1) unstable; urgency=low
-
-  * New upstream release:
-    o missing os_include/os_byteswap.h is included. Closes: #469844.
-  * Upload to unstable.
-  * New packages: libace-foxreactor and libtao-foxresource, integrating
-    with the FOX toolkit.
-  * Build doxygen again.
-  * Rewrite debian/copyright, following proposal from:
-    http://wiki.debian.org/Proposals/CopyrightFormat
-  * Add a watch file.
-
- -- Thomas Girard <thomas.g.girard@free.fr>  Sat, 12 Apr 2008 17:10:14 +0000
-
-ace (5.6.2-1) experimental; urgency=low
-
-  * New upstream release.
-  * Generate .am files instead of patching them; hence drop:
-    o patches/02-tao-sonames-release-am.dpatch
-    o tao-sonames-release-am.sh
-  * Fix DEB_BUILD_OPTIONS=noopt.
-  * Add zlib1g-dev and libzzip-dev build dependencies.
-  * Enable symbol visibility.
-  * Manually add missing some autoconf tests to reduce differences against
-    regular ACE build method.
-  * Do not generate doxygen; it fails now.
-
- -- Thomas Girard <thomas.g.girard@free.fr>  Sun, 06 Jan 2008 21:05:37 +0100
-
-ace (5.5.9-1) experimental; urgency=low
-
-  * New upstream release. We now use the -src.tar.bz2 tarball, hence:
-      o generate autotools stuff at compile time
-      o huge patches/06-bootstrap is dropped
-  * Fix broken libtao-tkresource package.
-  * Drop no longer needed patches:
-      o 03-compile-lifecycle
-      o 04-compile-ftrt
-      o 07-ace-tao-ssliop-refcount
-  * New patches:
-      o 02-qt4 to switch to Qt4
-      o 02-fltk-no-gl to avoid linking with libfltk_gl
-      o 03-g++-new-throws to prevent autoconfiguration from eating all
-        memory testing whether std::bad_alloc is thrown
-  * Disable patch 20-check-_REENTRANT; it's not needed when using autotools
-    method. Closes: #420216.
-  * Update patch 34-bts386713.
-  * Use debian/compat instead of DH_COMPAT.
-  * Drop no longer needed dpkg-dev tightened build-dependency since it is
-    available in etch.
-  * Generate doxygen documentation. Closes: #391011.
-  * Enable ACE reactor notification queue.
-  * Move $ACE_ROOT/bin/MakeProjectCreator/config files into libace-dev.
-  * Install $TAO_ROOT/MPC files into libtao-dev.
-
- -- Thomas Girard <thomas.g.girard@free.fr>  Tue, 17 Jul 2007 22:50:36 +0200
-
-ace (5.5.6-2) experimental; urgency=low
-
-  * debian/control: fix broken Conflicts: fields. Package split for
-    libtao-orbsvcs happened in libtao-orbsvcs1.4.7c2a 5.4.7-11 and this should
-    not be changed.
-
- -- Thomas Girard <thomas.g.girard@free.fr>  Fri, 23 Mar 2007 18:38:41 +0000
-
-ace (5.5.6-1) experimental; urgency=low
-
-  Thomas Girard:
-    * New upstream release. Closes: #381647.
-    * Switch to the autotools method. Consequences:
-       o CIAO packages are dropped for now
-       o static libraries are removed as well
-       o IPv6 is disabled again
-    * Drop obsolete patches and scripts.
-    * We no longer ship TAO_ORB_Options.1 in libtao-orbsvcs.
-    * debian/patches/01-change-tao-sonames.dpatch: enable TAO_VERSION_NAME
-      propagation from configure, and use it for TAO libraries.
-    * debian/patches/02-tao-sonames-release-am.dpatch: diff on Makefile.am
-      after application of the 01-change-tao-sonames patch.
-    * debian/patches/03-compile-lifecycle.dpatch: enables LifeCycle
-      compilation.
-    * debian/patches/04-compile-ftrt.dpatch: enables FTRT_EventService
-      compilation.
-    * debian/patches/07-ace-tao-ssliop-refcount.dpatch: fix ssliop reference
-      counting problem.
-
-  Konstantinos Margaritis:
-    * changed URL in copyright to new one.
-
- -- Thomas Girard <thomas.g.girard@free.fr>  Thu, 15 Mar 2007 22:12:29 +0000
-
-ace (5.4.7-13) unstable; urgency=low
-
-  * Rename packages:
-    o libace5.4.7c2a to libace5.4.7ldbl (Closes: #430244)
-    o libtao1.4.7c2a to libtao1.4.7ldbl (Closes: #430307)
-    for ldbl128 transition.
-  * Use debian/compat instead of DH_COMPAT.
-
- -- Thomas Girard <thomas.g.girard@free.fr>  Thu, 06 Sep 2007 09:52:34 +0000
-
-ace (5.4.7-12) unstable; urgency=low
-
-  * debian/control: tao-naming recommends tao-utils (Closes: #393032).
-  * debian/libtao-dev.install: add libTAO.so symlink (Closes: #396303).
-  * debian/patches/20-check-_REENTRANT.dpatch: do not automatically
-    define _REENTRANT (Closes: #380739).
-
- -- Thomas Girard <thomas.g.girard@free.fr>  Sun,  5 Nov 2006 11:14:00 +0100
-
-ace (5.4.7-11) unstable; urgency=low
-
-  * debian/control: package HTBP, the protocol over HTTP tunneling library.
-  * debian/control: split libace into libace + libace-ssl.
-  * debian/control: move binaries in their own tao-* packages.
-  * debian/patches/34-bts386713.dpatch: dlopen() TAO libraries using their
-    full name (Closes: #386713).
-  * debian/generate_pkgconfig.sh: generate .pc files (Closes: #367480).
-
- -- Thomas Girard <thomas.g.girard@free.fr>  Sat, 23 Sep 2006 15:02:12 +0200
-
-ace (5.4.7-10) unstable; urgency=low
-
-  * debian/rules: fix and honor DEB_BUILD_OPTIONS.
-  * debian/libace-dev.install: drop QoS header files as QoS in not compiled
-    in.
-  * debian/*.install: fix empty wildcard expansion that produce errors when
-    DH_COMPAT is 5.
-  * debian/libtao-dev.install: do not distribute include files from TAO_IDL.
-    They are not needed and don't get installed when using the autotools
-    method.
-  * debian/rules: rename mwc.pl and mpc.pl to mwc-ace and mpc-ace.
-  * debian/ace-config*,debian/tao-config*: dropped. These files were no
-    longer installed.
-  * debian/libace-dev.install: don't install ace-config and tao-config
-    manpages either (Closes: #367478).
-  * debian/control: relax mpc-ace dependencies. This package now installs
-    without pulling any ACE library. Thanks to Alex Bodnaru for noticing.
-  * debian/control: simplify packages synopsis and descriptions.
-  * debian/control: drop xerces dependency (Closes: #378605). Xerces is
-    only needed by DAnCE, which is not packaged yet.
-  * debian/libace-dev.install: remove generate_export_file.pl for now.
-  * patches/31-gcc-4.1-fix.dpatch: add other type-punned fixes taken from
-    upstream.
-  * debian/mpc.sgml: new man page.
-  * debian/patches/32-bug1770-fix.dpatch,33-bug1805-fix.dpatch: backport
-    two patches for SSL wrappers.
-
- -- Thomas Girard <thomas.g.girard@free.fr>  Thu, 20 Jul 2006 20:55:53 +0200
-
-ace (5.4.7-9) unstable; urgency=low
-
-  * debian/patches/28-bug2222-fix.dpatch, debian/patches/29-bug2262.dpatch:
-    backport upstream fixes.
-  * debian/patches/31-gcc-4.1-fix.dpatch: fix "dereferencing type-punned
-    pointers" gcc 4.1 warning.
-  * debian/patches/30-Env_Value-template-specialization-fix.dpatch:
-    backport template specialization fix (Closes: #358898).
-  * debian/patches/20-debian-compiler-definitions.dpatch: downgrade
-    optimization flag from `-O3' to `-O2'.
-  * debian/rules: add ${perl:Depends} for mpc-ace package.
-  * debian/control: make a new package, libciao-doc.
-  * debian/libtao-dev.install: add missing pkg-config file for ImR_Client
-    library.
-
- -- Thomas Girard <thomas.g.girard@free.fr>  Wed, 29 Mar 2006 22:14:53 +0200
-
-ace (5.4.7-8) unstable; urgency=low
-
-  * debian/copy_template_sources.sh: add missing files to `libtao-dev'
-    package. Thanks to Arren and Bernhard Seibold for reporting this.
-  * debian/patches/23-PortableGroup-exceptions-propagation.dpatch,
-    debian/patches/24-collocated-oneway+SYNC_WITH_SERVER-fix.dpatch,
-    debian/patches/25-TypeCode-equivalent-fix.dpatch,
-    debian/patches/26-union-_default-fix.dpatch,
-    debian/patches/27-bug2225-fix.dpatch: backport various upstream
-    fixes.
-  * debian/control: tighten build dependency from `xlibs-dev' to
-    `libxt-dev'. (Closes: #346607).
-
- -- Thomas Girard <thomas.g.girard@free.fr>  Fri, 13 Jan 2006 17:15:37 +0200
-
-ace (5.4.7-7) unstable; urgency=low
-
-  * debian/config/config.h: add IPv6 support. Thanks to David Hausheer
-    for the report and the fix. (Closes: #341988)
-  * debian/patches/23-TTY_IO-compilation-fix.dpatch: new patch to work
-    around `struct termios` platform-specific fields. (Closes: #342328).
-  * debian/patches/84-skip-DAnCE-compilation.dpatch: completely disable
-    DAnCE compilation, since we don't package it. (Closes: #336020).
-  * Really close fixed in NMU bugs (Closes: #324271, #339142).
-
- -- Konstantinos Margaritis <markos@debian.org>  Mon, 19 Dec 2005 13:40:48 +0200
-
-ace (5.4.7-6) unstable; urgency=low
-
-  * debian/control: consolidate package descriptions.
-  * debian/patches/16-g++4-visibility-tweaks.dpatch:
-    Backport upstream tweaks for g++ 4 visibility feature and disable
-    visibility hiding for now. (Closes: #324271).
-  * debian/rules: g++ 4.0.2 was ICE'ing on #pragma once. This is no
-    longer true as of g++-4.0_4.0.2-4, so we can use g++4 again. For the
-    record, another possible fix was to #define ACE_LACKS_PRAGMA_ONCE in
-    `$ACE_ROOT/ace/config.h`.
-  * Add `c2a` suffix to all libs for libstdc++ allocator change.
-    (Closes: #339142).
-
- -- Thomas Girard <thomas.g.girard@free.fr>  Fri, 18 Nov 2005 20:23:59 +0100
-
-ace (5.4.7-5) unstable; urgency=low
-
-  * Force gcc 3.4 for all arches, seems gcc 4.0 produces errors on all of
-    them. (Closes: #333981)
-
- -- Konstantinos Margaritis <markos@debian.org>  Wed, 12 Oct 2005 03:26:14 +0300
-
-ace (5.4.7-4) unstable; urgency=medium
-
-  * Rebuilt package for the Qt C++ transition. (Closes: #327926).
-  * Also, gcc 4.0 is buggy in some arches, use g++-3.4 on them instead.
-    Update: Even on i386, cpp-4.0 produces Internal Compiler Errors(ICEs). For
-    this reason, cpp-3.4 will be used instead (but with gcc/g++ 4.0.
-
- -- Konstantinos Margaritis <markos@debian.org>  Mon, 4 Oct 2005 03:21:20 +0300
-
-ace (5.4.7-3) unstable; urgency=low
-
-  * Fixed (another) missing build-dependency. (Closes: #323630)
-    (this is getting irritating :-)
-
- -- Konstantinos Margaritis <markos@debian.org>  Thu, 18 Aug 2005 10:29:48 +0300
-
-ace (5.4.7-2) unstable; urgency=low
-
-  * Fixed missing build-dependency in the .dsc file. (Closes: #323181)
-
- -- Konstantinos Margaritis <markos@debian.org>  Tue, 16 Aug 2005 01:09:09 +0300
-
-ace (5.4.7-1) unstable; urgency=low
-
-  * Thomas Girard <thomas.g.girard@free.fr>
-    - New upstream release. (Closes: #317488)
-    - Package names were changed to include the full library soname.
-      (Closes: #288161)
-    - debian/control: libtao-{xt,qt}reactor are now called
-      libtao-{xt,qt}resource. Also add libtao-{fl,tk}resource.
-    - debian/control: add new package libace-tmcast5.4.7.
-  * Konstantinos Margaritis
-    - Now use the .bz2 version of the original tarball to save space.
-
- -- Konstantinos Margaritis <markos@debian.org>  Fri, 12 Aug 2005 12:45:13 +0300
-
-ace (5.4.2.1.0-4) unstable; urgency=high
-
-    * Thomas Girard <thomas.g.girard@free.fr>
-      - debian/control:
-        o libacexml-dev depends on libace-dev.
-        o libkokyu-dev depends on libace-dev.
-        o libtao-dev depends on libtao1.4.
-        o normalize Depends: and Build-Depends: sections.
-      - debian/ace-config.1 debian/tao-config.1: fix hyphenation problem
-        reported by lintian.
-      - debian/libciao-dev.install: add missing .idl and .pidl files.
-        (Closes: #307258)
-
- -- Thomas Girard <thomas.g.girard@free.fr>  Mon,  2 May 2005 19:30:01 +0200
-
-ace (5.4.2.1.0-3) unstable; urgency=high
-
-  * Thomas Girard <thomas.g.girard@free.fr>
-    - debian/patches/84-mpc-honour-soversion.dpatch: new patch from
-      upstream to honour the `version' keyword for libraries.
-    - debian/patches/17-fix-tao-encode_value-memory-leak: new patch
-      from upstream to fix a potential memory leak.
-    - debian/mpc-ace.install: add depgen.pl. (Closes: #289157)
-    - debian/tao_idl: new script that automatically sets ACE_ROOT and
-      TAO_ROOT environment variables. (Closes: #289158)
-    - debian/rules: unbreak gperf-ace. (Closes: #294338)
-    - debian/remove_reactor_dups.sh: new script to ensure that duplicate
-      reactor header files get deleted. (Closes: #294660)
-    - debian/patches/21-always-inline.dpatch, debian/config.h: Always
-      define __ACE_INLINE__, and remove the inline option from the MPC
-      generated GNUmakefiles. Thanks to Marek Brudka for reporting this and
-      for providing the fix. (Closes: #290114)
-    - debian/patches/18-fix-trader-twiddle-operator.dpatch: backport
-      fix to correct operator ~ in trader constraints.
-    - debian/patches/19-fix-taoidl-fd-leak.dpatch: backport a fix to
-      close open file.
-    - debian/control: lib{ace,tao}qtreactor-dev packages depend on
-      libqt3-mt-dev.
-    - debian/libtao-orbsvcs1.4.install:
-      o Add FT_ReplicationManager.
-      o Add Fault_Detector and Fault_Notifier.
-    - debian/control:
-      o mpc-ace is in devel section.
-      o lib{ace,tao}-{fl,tk,qt,xt}reactor-dev are in libdevel section.
-    - debian/tao_ifr: new wrapper script that automatically sets ACE_ROOT
-      and TAO_ROOT environment variables.
-    - debian/libtao-orbsvcs1.4.manpages: add TAO_ORB_Options.1 manpage.
-
- -- Thomas Girard <thomas.g.girard@free.fr>  Wed, 30 Mar 2005 23:24:40 +0200
-
-ace (5.4.2.1.0-2) unstable; urgency=medium
-
-  * Konstantinos Margaritis <markos@debian.org>
-    - Changed dependency of libfltk1-dev in libace-flreactor-dev to
-    libfltk1.1-dev (Closes: #289287)
-    - Added Uploaders field in control.
-
- -- Konstantinos Margaritis <markos@debian.org>  Sat,  8 Jan 2005 22:39:05 +0200
-
-ace (5.4.2.1.0-1) unstable; urgency=low
-
-  * Thomas Girard <thomas.g.girard@free.fr>
-    - Much lintian cleaning.
-    - Integrate upstream MPC patch to honour `libout' and `install' keywords.
-    - Repackage FTRT_EventChannel.
-    - Bug 242881 was closed in the previous upload. (Closes: #242881)
-    - debian/control: libtao-dev should depend on libace-dev.
-      (Closes: #277052)
-    - debian/{Basic,Event,Notify,RTEvent}_Logging_Service.sgml: new man pages.
-    - debian/rules: add docbook-to-man calls.
-  * Raphael Bossek <bossekr@debian.org>
-    - debian/config/debian.features: MPC configuration for Debian GNU/Linux added
-    - debian/config/platform_macros.GNU: Removed due to introduction of
-      debian.features files. This file will be generated
-    - debian/rules: Uses dpatch. Simplified clean target by removing temporary
-      ACE_wrappers subdirectory. Install ace-config and tao-config scripts
-      with executable bit set (Closes: #278522, #278523)
-    - debian/control: Added new reactor packages. Removed depricated
-      suggestions on ace+tao-utilities. Added libssl-dev as recommendation for
-      libace-dev. Added suggestions for pkg-config
-    - Upgrade to latest version of TAO (Closes: #265238)
-    - debian/pkgconfig-ace, debian/pkgconfig-tao, debian/ace.pc.in,
-      debian/tao.pc.in: Support for pkg-config added
-    - debian/libace-dev.links: Added sym-link for /usr/share/ace/lib and
-      /usr/share/ace/bin/generate_export_file.pl
-    - debian/*.docs, debian/*.manpages: Added source directory ACE_wrappers as prefix
-    - debian/libace-dev.install: Added ACE_wrappers/bin/generate_export_file.pl
-
- -- Thomas Girard <thomas.g.girard@free.fr>  Mon, 18 Oct 2004 13:35:56 +0200
-
-ace (5.4.2.1-1) unstable; urgency=low
-
-  * Thomas Girard <thomas.g.girard@free.fr>
-    - New upstream release. (Closes: #243062)
-    - Do not link against Xt libs. (Closes: #251477)
-    - As such, libace-dev does not need to depend on libxt-dev nor xlibs-dev
-      (Closes: #253226)
-    - Add MPC.
-    - Patch ACE_IOStream to support g++ 3.3. (Closes: #243473)
-    - Patch MPC to honour `libout' and `install' keywords in GNUmakefile
-      generation. See DOC Bug#1915.
-    - Backport a fix to NotifyLoggingService from CVS.
-    - Make %S work in ACE_DEBUG.
-  * Konstantinos Margaritis
-    - Fixed missed path for libACE.so.5.4.2 in dh_shlibdeps
-    - Fixed incorrect timestamp of original archive (1970 etc).
-
- -- Konstantinos Margaritis <markos@debian.org>  Thu,  2 Sep 2004 23:04:56 +0200
-
-ace (5.4.0.1-1.1) unstable; urgency=low
-
-  * Fixed ACE_NDEBUG configuration of ACE. (Closes: #242881)
-  * Build-depends on libqt3-headers removed qt_reactor not set.
-  * System capabilities will be determined by including <unistd.h> in
-    <ace/config.h>.
-
- -- Raphael Bossek <bossekr@debian.org>  Thu,  8 Apr 2004 15:37:24 +0200
-
-ace (5.4.0.1-1) unstable; urgency=low
-
-  * KM: release to fix the timestamp errors in the upstream source.
-
- -- Konstantinos Margaritis <markos@debian.org>  Sun, 29 Feb 2004 21:11:14 +0200
-
-ace (5.4-3) unstable; urgency=low
-
-  * KM: backported fixes from CVS to fix 64-bit pointer to int casting in
-    orbsvcs/RTCosScheduling files. This is to fix FTBFS bug in 64-bit archs,
-    until 5.4.1 is released (mid-march).
-    Closes: #233890
-
- -- Konstantinos Margaritis <markos@debian.org>  Wed, 28 Feb 2004 15:53:30 +0200
-
-ace (5.4-2) unstable; urgency=low
-
-  * KM: Includes patch from Raphael Bossek <bossekr@debian.org> to handle
-    bug in tao_idl to use ACE_GPERF instead of plain gperf.
-  * BN: libace-dev now suggests libtao-dev instead of the non-existing tao
-    package. (Closes: #233488)
-  * BN: prepended a "-" to the chmod commands in debian/rules so that they
-    don't fail if used repeatedly.
-
- -- Brian Nelson <pyro@debian.org>  Wed, 18 Feb 2004 02:23:07 -0800
-
-ace (5.4-1) unstable; urgency=low
-
-  * KM: new upstream release
-  * KM: Now builds also ACE+SSL library, Kokyu and CIAO libs.
-  * KM: Due to the orbsvcs executables we can't have 2 different versions
-    of the libtao-orbsvcs1.x package, so we have to replace. This doesn't apply
-    for libace5.x, libtao1.x or the rest of the libs.
-  * Closes: #229134 (fixed dependencies).
-
- -- Konstantinos Margaritis <markos@debian.org>  Sun, 25 Jan 2004 13:33:20 +0200
-
-ace (5.3.1-8) unstable; urgency=low
-
-  * KM: Included the .pidl files in libtao-dev package. These
-    were needed by some .idl files. (Closes: #213568)
-
- -- Konstantinos Margaritis <markos@debian.org>  Wed, 29 Oct 2003 23:46:01 +0200
-
-ace (5.3.1-7) unstable; urgency=low
-
-  * BN: Changed maintainer to "Debian ACE+TAO maintainers
-    <pkg-ace-devel@lists.alioth.debian.org>" and moved myself to the
-    Uploaders.
-  * KM: Fixed conflicting file "/usr/bin/catior" by changing the name to
-    tao-catior in libtao-dev. (Closes: #214421)
-
- -- Brian Nelson <pyro@debian.org>  Thu,  9 Oct 2003 15:05:12 -0700
-
-ace (5.3.1-6) unstable; urgency=low
-
-  * Added the ORB services .idl files that were left out from the
-    libtao-orbsvcs-dev package. (Closes: #213568)
-
- -- Konstantinos Margaritis <markos@debian.org>  Sun,  5 Oct 2003 12:31:21 +0300
-
-ace (5.3.1-5) unstable; urgency=low
-
-  * Regenerated .diff.gz so that it is no longer broken (Closes: #211501)
-  * Back out Debian-specific change in the way that CosNamingC.h is
-    included in TAO/utils/nslist/nslist.cpp.  I'm not sure why this was
-    changed in the first place, but it broke the build. (Closes: #213611)
-
- -- Brian Nelson <pyro@debian.org>  Wed,  1 Oct 2003 10:28:54 -0700
-
-ace (5.3.1-4) unstable; urgency=low
-
-  * Moved the manpages back to -dev packages to follow policy.
-  * Now mostly lintian clean.
-  * provided manpages for a few executables.
-
- -- Konstantinos Margaritis <markos@debian.org>  Wed, 17 Sep 2003 11:43:55 +0300
-
-ace (5.3.1-3) unstable; urgency=low
-
-  * Updated to new standards version 3.6.1
-  * Fixed the section of a couple of packages.
-  * Now the getrlimit, etc functions are always defined
-    as ints. g++ 3.x does not complain anymore (Closes: #104681).
-
- -- Konstantinos Margaritis <markos@debian.org>  Tue, 16 Sep 2003 10:31:03 +0300
-
-ace (5.3.1-2) unstable; urgency=low
-
-  * Now the following TAO packages are created:
-    libtao1.3.1, libtao-dev, libtao-doc, libtao-orbsvcs1.3.1,
-    libtao-orbsvcs-dev.
-  * Also included ACEXML library in two separate packages:
-    libacexml5.3.1, libacexml-dev.
-  * Full doxygen documentation not included due to size concerns.
-    (Closes: #108749).
-  * tao-config included in libtao-dev. (Closes: #159234).
-  * All -dev packages carry their respective examples in full and
-    uncompressed. (Closes: #52145, #76967).
-  * libACE.a is compiled with thread support enabled. (Closes: #126717).
-    dbbalancer now builds successfully with -static.
-  * Moved all manpages to respective -doc pagkaces. (Closes: #73044).
-
- -- Konstantinos Margaritis <markos@debian.org>  Tue,  9 Sep 2003 10:41:14 +0300
-
-ace (5.3.1-1) unstable; urgency=low
-
-  * New upstream release
-  * New maintainers for the package, Brian Nelson <pyro@debian.org> and
-    Konstantinos Margaritis <markos@debian.org> (Closes #199768)
-  * Removed build-dependency on versioned g++
-  * Bumped up standards version to 3.6.0
-  * Dropped version string from -dev package name
-  * libace-dev: downgrade tao to suggests (where did tao go anyway?)
-  * Use debian/compat for debhelper versioning
-  * Use dh_install instead of dh_movefiles, and dh_link instead of manual
-    ln.  The debian/rules file is a lot less hairy now.
-  * Reinstated a libace-doc package (Closes: #192338)
-  * Added symlinks to /usr/share/ace so that this directory can serve as
-    $ACE_ROOT.  Added a corresponding note to the README.Debian
-    file. (Closes: #80329)
-  * Removed the /usr/lib/libACE.so.5 and libACE_RMCast.so.5 symlinks, and
-    made the package names match the sonames.  The sonames now include the
-    full version string, so ACE libs of different versions from now on
-    should coexist nicely, even though upstream doesn't use a proper
-    versioning scheme.  (Closes: #147741)
-
- -- Brian Nelson <pyro@debian.org>  Fri, 15 Aug 2003 00:15:59 -0700
-
-ace (5.2.4-1.2) unstable; urgency=low
-
-  * fix to previous NMU
-  * (Closes: #190792)
-
- -- Konstantinos Margaritis <markos@debian.org>  Sat, 26 Apr 2003 19:18:49 +0300
-
-ace (5.2.4-1.1) unstable; urgency=low
-
-  * gcc-3.2 transition, NMU patch by Andreas Metzler <ametzler@debian.org>
-  * (Closes: #188328)
-
- -- Konstantinos Margaritis <markos@debian.org>  Fri, 11 Apr 2003 23:25:38 +0200
-
-ace (5.2.4-1) unstable; urgency=low
-
-  * New upstream.
-  * Incorporated below change from Goswin.  (Closes: #159236)
-
- -- Ossama Othman <ossama@valinor.ece.uci.edu>  Sun, 15 Sep 2002 14:14:06 -0700
-
-ace (5.2.1-1.1) unstable; urgency=low
-
-  * debian/control: libace5.2-dev recommends tao
-  * ace-config: export ACE_ROOT
-              make -f /usr/share/ace/ace-config.GNU
-                test for tao-confg
-                unset MAKEs env vars to prevent extranous output
-  * debian/rules: install platform macros in
-        $(ACE_PREFIX)/share/ace/include/makeinclude/
-
- -- Goswin Brederlow <goswin.brederlow@student.uni-tuebingen.de>  Mon, 02 Sep 2002 02:37:25 +0200
-
-ace (5.2.1-1) unstable; urgency=low
-
-  * New upstream.
-  * Pulled in updated g++ configuration header and Linux Makefile rules
-    for ACE.  They allow implicit template instantiation to occur.
-  * Disabled support for the ACE_XT_Reactor.  Most folks never use it.
-
- -- Ossama Othman <ossama@debian.org>  Mon, 25 Feb 2002 13:15:25 -0800
-
-ace (5.1.8-7) unstable; urgency=low
-
-  * Really removed the flex/lex checks in configure.in.
-
- -- Ossama Othman <ossama@debian.org>  Wed, 28 Nov 2001 15:30:59 -0800
-
-ace (5.1.8-6) unstable; urgency=low
-
-  * Added "libtool" to Build-Depend field, and run libtoolize in `rules'
-    file to pull in links to recent config.sub, config.guess and
-    ltmain.sh revisions.  (Closes: #120141)
-  * Removed local autoconf test that checks if new() throws exception
-    on failure.  The test caused build hosts to come to a crawl.  g++
-    does indeed throw an exception.
-    Just configure that explicitly.  (Closes: #90731)
-  * Removed flex and yacc checks in configure.in.  They aren't necessary
-    to build ACE.
-  * Closed bug related to gcc internal compiler error.  (Closes: #85230)
-  * Removed unnecessary g++ dependency in control file.  (Closes: #84405)
-  * Added missing xlibs-dev dependency to libace5.1-dev package.
-
- -- Ossama Othman <ossama@debian.org>  Mon, 26 Nov 2001 16:53:33 -0800
-
-ace (5.1.8-5.1) unstable; urgency=high
-
-  * NMU
-  * Added the missing build dependencies on flex and xlibs-dev.
-    (closes: #101170)
-
- -- Adrian Bunk <bunk@fs.tum.de>  Sat, 10 Nov 2001 01:17:53 +0100
-
-ace (5.1.8-5) unstable; urgency=low
-
-  * libace5.1 and libace5.1-dev now conflict with their corresponding ACE
-    5.0 debian packages, since both sets of packages have files with the
-    same name.  libace5.1-dev also conflicts with libace4.6-dev.  (#74031)
-  * Added xlib6g-dev to the list of build dependencies.  The X11 libraries
-    aren't strictly necessary to build ACE, but the Debian packages enable
-    ACE's XtReactor support.
-  * Updated `README.Debian'.  The Debian ACE packages are no longer built
-    using experimental ACE Configuration Project distributions.  They are
-    built using the upstream distribution's autoconf support (contributed
-    by the ACE Configuration Project).
-
- -- Ossama Othman <ossama@debian.org>  Thu,  5 Oct 2000 17:35:56 -0700
-
-ace (5.1.8-4) unstable; urgency=low
-
-  * Updated configure script from new upstream since it detects the CDROM
-    and STREAMS ioctl conflict in current kernels and glibc 2.1.94.  This
-    fixes a seg fault that would occur in ACE applications that use the
-    ACE_Reactor.
-
- -- Ossama Othman <ossama@debian.org>  Wed,  4 Oct 2000 14:43:48 -0700
-
-ace (5.1.8-3) unstable; urgency=low
-
-  * Rebuilt against glibc 2.1.94 (pre-2.2).
-
- -- Ossama Othman <ossama@debian.org>  Fri, 29 Sep 2000 12:40:39 -0700
-
-ace (5.1.8-2) unstable; urgency=low
-
-  * Added missing Build-Depends and Build-Depends-Indep fields to the
-    control file.  (#70113)
-  * Corrected `debian/rules' so that it doesn't erase the installed
-    `config-all.h' header.
-
- -- Ossama Othman <ossama@debian.org>  Sat, 23 Sep 2000 09:54:26 -0700
-
-ace (5.1.8-1) unstable; urgency=low
-
-  * New upstream release.
-
- -- Ossama Othman <ossama@debian.org>  Fri, 25 Aug 2000 15:45:01 -0700
-
-ace (5.0.7-4) frozen unstable; urgency=low
-
-  * Rebuilt the packages so that they get installed in the unstable
-    distribution archive, in addition to the frozen one.  (#58366)
-
- -- Ossama Othman <ossama@debian.org>  Wed, 24 May 2000 15:15:21 -0700
-
-ace (5.0.7-3) frozen; urgency=high
-
-  * Updated libtool related files from latest libtool multi-language
-    branch snapshot.  Regenerated the configure script.  It now has the
-    appropriate deplibs regex.  Apparently, there was a problem with M4
-    quoting in the last package upload.  (#63932)
-  * Explicitly enable C++ exception support.  A fix to the configure
-    script caused this to be necessary since the configure script disables
-    exception handling by default.
-  * Updated `debian/rules' file to use debhelper v2 support.
-  * Updated download location in `debian/copyright'.
-
- -- Ossama Othman <ossama@debian.org>  Fri, 19 May 2000 15:05:30 -0700
-
-ace (5.0.7-2) frozen; urgency=low
-
-  * Updated `acewindex.html' file so that it is no longer empty.  (#50704)
-  * Updated `ACE_Log_Msg.3' man page so that important information is
-    included when it is generated.  This patch was incorporated upstream.
-    (#51224)
-  * Replaced configure script and related files with current upstream
-    configure script.  Patched OS.{h,i} with llseek/lseek64 related
-    upstream fixes.  This should correct the lseek64 and llseek problems
-    encountered in the m68k port.  (#50094, #51074)
-  * Updated ace-config.in with latest upstream since the previous one was
-    missing a "-lACE" in the library list.
-  * Fixed "--infodir" and "--mandir" configure script options in `rules'
-    file.  They incorrectly used a the actual install prefix instead of
-    the debian package install prefix.  This fixes a problem where the
-    gperf-ace documentation wasn't being registered doc-base.
-
- -- Ossama Othman <ossama@debian.org>  Mon, 17 Jan 2000 18:39:18 -0800
-
-ace (5.0.7-1) unstable; urgency=low
-
-  * New upstream.
-  * Enabled C++ template repository during build.  This will reduce
-    the size of the resulting binaries by about 20%.
-  * Updated copyright file.  (updated distribution terms contain
-    suggestions contributed by Richard M. Stallman)
-  * FHS updates.
-  * Added versioned shlibs dependencies via "-V" option for dh_makeshlibs.
-    This is important since new versions of libACE are not always binary
-    compatible with previous versions.
-  * Updated libace5.0-dev to use package dh_installinfo to install
-    gperf-ace.info file.
-  * Minor update to ACE documentation index.html file.
-  * Added ACE man pages in HTML format.
-
- -- Ossama Othman <ossama@debian.org>  Fri, 29 Oct 1999 21:13:10 -0500
-
-ace (4.6.44-1) unstable; urgency=low
-
-  * New upstream.
-
- -- Ossama Othman <ossama@debian.org>  Tue, 13 Jul 1999 20:23:11 -0500
-
-ace (4.6.42-1) unstable; urgency=low
-
-  * New upstream.
-
- -- Ossama Othman <ossama@debian.org>  Sat, 26 Jun 1999 15:46:16 -0500
-
-ace (4.6.37-1) unstable; urgency=low
-
-  * New upstream.
-  * Added doc-base support.
-
- -- Ossama Othman <ossama@debian.org>  Tue, 27 Apr 1999 13:28:53 -0500
-
-ace (4.6.31-2) unstable; urgency=low
-
-  * Removed clone.1 man page since ACE clone utility isn't needed
-    for the Debian packages.
-
- -- Ossama Othman <ossama@debian.org>  Mon, 22 Mar 1999 14:47:50 -0600
-
-ace (4.6.31-1) unstable; urgency=low
-
-  * New upstream beta.
-  * Added ACE PROBLEM-REPORT-FORM to each package. (#34455)
-  * Rebuilt against glibc 2.1.  (#34573)
-  * Added check for struct siginfo_t in signal.h.  Thanks to
-    Konstantinos Margaritis <kmargar@cc.uoa.gr> for pointing this
-    configuration bug out. (#34678)
-
- -- Ossama Othman <ossama@debian.org>  Sun, 24 Jan 1999 15:49:04 -0500
-
-ace (4.6.15-1) unstable; urgency=low
-
-  * Updated to ACE release 4.6.15.
-
- -- Ossama Othman <ossama@debian.org>  Sat, 16 Jan 1999 18:47:25 -0500
-
-ace (4.6.13-1) unstable; urgency=low
-
-  * Updated to ACE release 4.6.13.
-
- -- Ossama Othman <ossama@debian.org>  Thu, 14 Jan 1999 19:54:41 -0500
-
-ace (4.6.12-2) unstable; urgency=low
-
-  * Forgot to change libace4.6-dev dependency from version 4.6.7 to 4.6.12.
-
- -- Ossama Othman <ossama@debian.org>  Thu, 14 Jan 1999 02:47:13 -0500
-
-ace (4.6.12-1) unstable; urgency=low
-
-  * Updated to ACE release 4.6.12.
-
- -- Ossama Othman <ossama@debian.org>  Thu, 14 Jan 1999 01:17:16 -0500
-
-ace (4.6.7-1) unstable; urgency=low
-
-  * Force libtool to link "-lpthread" into ACE's inter-library dependencies
-    since the configure script detects that the "-pthread" flag can be used
-    which make it unneccessary to explicitly link to "-lpthread."  However, we
-    want the "-lpthread" dependency since not all users or programs use the
-    "-pthread" compiler flag.
-  * Fixed packaging bug where run-time library package tried to install/remove
-    the gperf-ace info file.
-  * Updated to ACE release 4.6.7.
-
- -- Ossama Othman <ossama@debian.org>  Tue, 15 Dec 1998 16:29:10 -0500
-
-ace (4.6.5-3) unstable; urgency=low
-
-  * Enabled ACE debugging macros.
-  * Enabled ACE logging macros (LM_DEBUG and LM_INFO).
-
- -- Ossama Othman <ossama@debian.org>  Tue,  8 Dec 1998 14:22:02 -0500
-
-ace (4.6.5-2) unstable; urgency=low
-
-  * Released ace-4.6.5-2 packages.
-  * gperf files (gperf, gperf.1 and gperf.info) will be installed as gperf-ace
-    to prevent conflicts with the existing Cygnus based gperf package.
-  * Corrected libACE compile list by removing template sources from the
-    libACE "SOURCES" make variable.
-
- -- Ossama Othman <ossama@debian.org>  Thu,  3 Dec 1998 15:59:06 -0500
-
-ace (4.6.5-1) unstable; urgency=low
-
-  * Released ace-4.6.5-1 packages
-
- -- Ossama Othman <othman@astrosun.tn.cornell.edu>  Tue,  1 Dec 1998 16:09:49 -0500
-
-ace (4.6.4-2) unstable; urgency=low
-
-  * Added libnsl to library check for t_accept() (not a Debian issue).
-  * Moved all pre-processor related lines to the first column of the M4 block
-    so that they will be in the first column of their respective test programs.
-  * Made definition of ACE_HAS_NONSTATIC_OBJECT_MANAGER a configure script
-    option since there was no working autoconf test for it.
-
- -- Ossama Othman <othman@astrosun.tn.cornell.edu>  Mon, 30 Nov 1998 17:24:49 -0500
-
-ace (4.6.4-1) unstable; urgency=low
-
-  * Added "install-info" commands to postinst and prerm scripts.
-  * Added a "modernized" gperf.info to the distribution.
-  * Added "#ifndef" guards to PACKAGE, VERSION, DEBUG and NDEBUG macros in
-    acconfig.h to prevent redefinition when using ACE with a package that
-    defines them.
-  * Added Env_Value_T.cpp to list of template sources to be installed.
-  * Moved ace-config script to "-dev" package.
-  * Added gperf to the distribution.
-
- -- Ossama Othman <othman@astrosun.tn.cornell.edu>  Fri, 13 Nov 1998 16:02:32 -0500
-
-ace (4.6.3-2) unstable; urgency=low
-
-  * Released ace-4.6.3-2 packages.
-  * Corrected ace-config and configure scripts so that the X11 libraries are
-    displayed correctly by the ace-config script.
-
- -- Ossama Othman <othman@astrosun.tn.cornell.edu>  Thu, 12 Nov 1998 17:24:11 -0500
-
-ace (4.6.3-1) unstable; urgency=low
-
-  * Initial Release.
-
- -- Ossama Othman <othman@astrosun.tn.cornell.edu>  Thu, 12 Nov 1998 13:13:59 -0500
-
diff --git a/ACE/debian/debian.compat b/ACE/debian/debian.compat
deleted file mode 100644
index ec635144f60..00000000000
--- a/ACE/debian/debian.compat
+++ /dev/null
@@ -1 +0,0 @@
-9
diff --git a/ACE/debian/debian.control b/ACE/debian/debian.control
deleted file mode 100644
index 20c2ed49c96..00000000000
--- a/ACE/debian/debian.control
+++ /dev/null
@@ -1,367 +0,0 @@
-Source: ace
-Section: devel
-Priority: optional
-Maintainer: Debian ACE+TAO maintainers <pkg-ace-devel@lists.alioth.debian.org>
-Uploaders: Thomas Girard <thomas.g.girard@free.fr>, Johnny Willemsen <jwillemsen@remedy.nl>
-Build-Depends: debhelper, libssl-dev, libxt-dev (>= 4.3.0), libfltk1.1-dev (>= 1.1.4), tk-dev (>= 8.5), libfox-1.6-dev, docbook-to-man, libxerces-c-dev
-Build-Depends-Indep: doxygen, graphviz
-Standards-Version: 4.1.1
-Vcs-Git: git://anonscm.debian.org/pkg-ace/pkg-ace.git
-Vcs-Browser: https://anonscm.debian.org/gitweb/?p=pkg-ace/pkg-ace.git;a=summary
-Homepage: http://www.dre.vanderbilt.edu/~schmidt/ACE.html
-
-Package: mpc-ace
-Architecture: all
-Depends: ${perl:Depends}, ${misc:Depends}
-Recommends: make
-Replaces: libace-dev (= 5.6.3-4)
-Suggests: libace-dev, pkg-config
-Description: makefile, project, and workspace creator
- This package contains the Makefile, Project, and Workspace Creator (MPC)
- as distributed with the ACE toolkit.
- .
- MPC generates platform- and compiler-specific files to automate the
- compilation process.
- .
- The following programs are included:
-  * mpc-ace: generates project files for a single target
-  * mwc-ace: generates workspace files for a set of projects
-
-Package: libace-6.4.7
-Architecture: any
-Section: libs
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: C++ network programming framework
- This package contains the ADAPTIVE Communication Environment (ACE)
- framework.
- .
- It provides platform independent C++ wrappers for all forms of IPC,
- thread- and process-management routines, and much more.
- .
- Moreover, it defines patterns for common communication tasks.
-  * Reactor: handles event demultiplexing and dispatching
-  * Proactor: for asynchronous I/O driven programs
-
-Package: libace-dev
-Architecture: any
-Section: libdevel
-Depends: libace-6.4.7 (= ${binary:Version}), ${misc:Depends}
-Suggests: libace-doc, pkg-config
-Replaces: mpc-ace (<< 5.6.3-4)
-Description: C++ network programming framework - development files
- This package contains the header files and static library for the ACE
- framework.
-
-Package: libace-doc
-Architecture: all
-Section: doc
-Depends: ${misc:Depends}
-Suggests: libace-dev
-Recommends: doc-base
-Description: C++ network programming framework - documentation
- This package contains the ACE overview documentation, tutorials,
- examples, and information regarding upstream development.
-
-Package: libace-ssl-6.4.7
-Architecture: any
-Section: libs
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: ACE secure socket layer library
- This package contains wrappers that integrate the OpenSSL library in
- the ACE framework.
-
-Package: libace-ssl-dev
-Architecture: any
-Section: libdevel
-Depends: libace-ssl-6.4.7 (= ${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.4.7
-Architecture: any
-Section: libs
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: ACE reliable multicast library
- The RMCast library is a reliable source-ordered multicast protocol
- implementation.
- .
- It uses sequence numbers on messages to ensure ordering, loss
- detection, and suppression of duplicates.
-
-Package: libace-rmcast-dev
-Architecture: any
-Section: libdevel
-Depends: libace-rmcast-6.4.7 (= ${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.4.7
-Architecture: any
-Section: libs
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: ACE transactional multicast library
- The TMCast library is a transactional multicast protocol
- implementation.
- .
- Each message is delivered to multicast group members as a
- transaction: an atomic, consistent, and isolated action.
-
-Package: libace-tmcast-dev
-Architecture: any
-Section: libdevel
-Depends: libace-tmcast-6.4.7 (= ${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.4.7
-Architecture: any
-Section: libs
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: ACE protocol over HTTP tunneling library
- The HTTP Tunneling, Bidirectional, Protocol (HTBP) library enables
- the writing of stream-based protocols over HTTP.
- .
- This allows clients behind a firewall to establish a connection with
- outbound servers using the HTTP protocol.
-
-Package: libace-htbp-dev
-Architecture: any
-Section: libdevel
-Depends: libace-htbp-6.4.7 (= ${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.4.7
-Architecture: any
-Section: libs
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: ACE Inet protocol library
- This package provides an ACE addon library for clients (and possibly
- servers at some point) using Inet protocols, such as HTTP or FTP.
-
-Package: libace-inet-dev
-Architecture: any
-Section: libdevel
-Depends: libace-inet-6.4.7 (= ${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.4.7
-Architecture: any
-Section: libs
-Depends: libace-inet-6.4.6, libace-ssl-6.4.7, ${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
- HTTPS or FTPS.
-
-Package: libace-inet-ssl-dev
-Architecture: any
-Section: libdevel
-Depends: libace-inet-ssl-6.4.7 (= ${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.
-
-Package: ace-gperf
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Breaks: gperf-ace (<< 5.7.7-1)
-Replaces: gperf-ace (<< 5.7.7-1)
-Description: ACE perfect hash function generator
- ace_gperf is the ACE version of gperf.
- .
- Both ace_gperf and gperf were written by the same author, and have
- basically the same options and functionality. ace_gperf simply takes
- advantage of some of the features provided by the ACE library.
-
-Package: libacexml-6.4.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
-Replaces: libace-dev (<< 5.7.7-4)
-Depends: libacexml-6.4.7 (= ${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.4.7
-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 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.4.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.4.7
-Architecture: any
-Section: libs
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: ACE scheduling and dispatching library
- Kokyu is a library designed to provide flexible scheduling and
- dispatching services.
- .
- Currently it provides real-time scheduling and dispatching services
- for TAO real-time CORBA Event Service.
-
-Package: libkokyu-dev
-Architecture: any
-Section: libdevel
-Depends: libkokyu-6.4.7 (= ${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.4.7
-Architecture: any
-Section: libs
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: ACE-GUI reactor integration for Xt
- 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
- with a specific toolkit. By using these reactors, your GUI
- application can remain single threaded yet still respond to both GUI
- events, such as button presses, and your own application events.
- .
- The ACE_XtReactor extends both the ACE_Select_Reactor and the X
- Toolkit library function XtWaitForMultipleEvents().
-
-Package: libace-xtreactor-dev
-Architecture: any
-Section: libdevel
-Depends: libace-xtreactor-6.4.6 (= ${binary:Version}), libace-dev (= ${binary:Version}), libxt-dev (>= 6.4.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.
-
-Package: libace-tkreactor-6.4.7
-Architecture: any
-Section: libs
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: ACE-GUI reactor integration for Tk
- 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
- with a specific toolkit. By using these reactors, your GUI
- application can remain single threaded yet still respond to both GUI
- events, such as button presses, and your own application events.
- .
- The ACE_TkReactor provides reactor functionality around the popular
- Tcl/Tk library. The underlying Tcl/Tk method used is
- Tcl_DoOneEvent().
-
-Package: libace-tkreactor-dev
-Architecture: any
-Section: libdevel
-Depends: libace-tkreactor-6.4.7 (= ${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.4.7
-Architecture: any
-Section: libs
-Depends: ${shlibs:Depends}, ${misc:Depends}
-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
- with a specific toolkit. By using these reactors, your GUI
- application can remain single threaded yet still respond to both GUI
- events, such as button presses, and your own application events.
- .
- The ACE_FlReactor integrates with the FastLight toolkit's Fl::wait()
- method.
-
-Package: libace-flreactor-dev
-Architecture: any
-Section: libdevel
-Depends: libace-flreactor-6.4.6 (= ${binary:Version}), libace-dev (= ${binary:Version}), libfltk1.1-dev (>= 6.4.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.4.7
-Architecture: any
-Section: libs
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: ACE-GUI reactor integration for FOX
- 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
- with a specific toolkit. By using these reactors, your GUI
- application can remain single threaded yet still respond to both GUI
- events, such as button presses, and your own application events.
- .
- The ACE_FoxReactor integrates with the FOX toolkit.
-
-Package: libace-foxreactor-dev
-Architecture: any
-Section: libdevel
-Depends: libace-foxreactor-6.4.7 (= ${binary:Version}), libace-dev (= ${binary:Version}), libfox-1.6-dev, ${misc:Depends}
-Description: ACE-GUI reactor integration for FOX - development files
- This package contains header files and static library for the ACE-FOX
- reactor integration.
-
-Package: ace-netsvcs
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: ACE network service implementations
- ACE network services provide reusable components for common
- distributed system tasks such as logging, naming, locking, and time
- synchronization.
- .
- This package contains driver programs and example configuration
- files to link the various ACE network services together, either
- statically or dynamically, and form complete server programs.
-
-Package: libnetsvcs-6.4.7
-Architecture: any
-Section: libs
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: ACE network service implementations - libraries
- ACE network services provide reusable components for common
- distributed system tasks such as logging, naming, locking, and time
- synchronization.
- .
- This package contains runtime libraries for ACE network services.
-
-Package: libnetsvcs-dev
-Architecture: any
-Section: libdevel
-Depends: libnetsvcs-6.4.7 (= ${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
- synchronization.
- .
- This package contains header files and static library for the ACE
- network services library.
diff --git a/ACE/debian/debian.rules b/ACE/debian/debian.rules
deleted file mode 100644
index 9078a188dab..00000000000
--- a/ACE/debian/debian.rules
+++ /dev/null
@@ -1,118 +0,0 @@
-#!/usr/bin/make -f
-
-# debian/rules file for ACE+TAO Debian GNU/Linux packages
-# written February 2002 by Ossama Othman <ossama@debian.org>
-# Modified August 2003 by Brian Nelson <pyro@debian.org>
-# Copyright (C) 2004  Raphael Bossek <bossekr@debian.org>
-# Copyright © 2005-2012 Thomas Girard <thomas.g.girard@free.fr>
-# Copyright © 2009-2014 Pau Garcia i Quiles <pgquiles@elpauer.org>
-# Copyright © 2010-2014 Johnny Willemsen <jwillemsen@remedy.nl>
-
-#export DEB_BUILD_MAINT_OPTIONS = hardening=+all
-export DEB_BUILD_MAINT_OPTIONS = hardening=+format,+fortify,+stackprotector,+relro,+bindnow
-DPKG_EXPORT_BUILDFLAGS = 1
-include /usr/share/dpkg/buildflags.mk
-CFLAGS+=$(CPPFLAGS)
-CXXFLAGS+=$(CPPFLAGS)
-
-MWCFLAGS := -type gnuace -noreldefs
-DSO_MAKE_FLAG := versioned_so=2
-INSTALL_FLAGS := DESTDIR=$(CURDIR)/debian/tmp INSTALL_PREFIX=/usr install_rpath=0 $(DSO_MAKE_FLAG)
-
-MAN1 := debian/ace_netsvcs.1 \
-	debian/mpc-ace.1
-# Where we install every file before calling dh_install
-DT := debian/tmp
-
-DOXYGEN_FILES_TO_REMOVE := -name '*.md5' -o \
-                           -name '*.map' -o \
-                           -name '*.tag'
-
-# Package names, used when overriding dh_installchangelogs
-ALL_PACKAGES := $(shell dh_listpackages)
-ALL_ACEXML   := $(filter libacexml%,$(ALL_PACKAGES))
-
-export ACE_ROOT := $(shell pwd)
-export MPC_ROOT := $(ACE_ROOT)/MPC
-export LD_LIBRARY_PATH := $(LD_LIBRARY_PATH):$(ACE_ROOT)/lib
-
-%:
-	dh $@
-
-# Implement our own configure machinery; it will copy Debian specific
-# configuration before launching MPC to generate ACE+TAO GNUmakefile
-.PHONY: configure
-configure: configure-stamp
-configure-stamp:
-	cp debian/platform_macros.GNU $(ACE_ROOT)/include/makeinclude
-	cp debian/config*.h $(ACE_ROOT)/ace/
-	cp debian/default.features $(ACE_ROOT)/bin/MakeProjectCreator/config
-	cp debian/ACE-DPKG.mwc $(ACE_ROOT)
-	cd $(ACE_ROOT) && $(ACE_ROOT)/bin/mwc.pl $(MWCFLAGS) ACE-DPKG.mwc
-	touch $@
-
-override_dh_auto_build-arch: configure-stamp
-	$(MAKE) -C $(ACE_ROOT) $(DSO_MAKE_FLAG)
-
-override_dh_auto_build-indep: configure-stamp
-	$(MAKE) -C $(ACE_ROOT) $(DSO_MAKE_FLAG)
-	cd $(ACE_ROOT) && bin/generate_doxygen.pl -is_release -exclude_tao -exclude_ciao -exclude_dance
-	find $(ACE_ROOT)/html $(DOXYGEN_FILES_TO_REMOVE) | xargs -r rm -f
-
-override_dh_auto_install: manpages-stamp
-	$(MAKE) -C $(ACE_ROOT) install $(INSTALL_FLAGS)
-	mkdir -p $(DT)/usr/share/man/man1
-	cp $(ACE_ROOT)/apps/gperf/ace_gperf.1 $(DT)/usr/share/man/man1
-#	Relocate .idl and .pidl files
-	cd $(DT) && for f in $$(find usr/include -name '*.idl' -o -name '*.pidl') ; do \
-	   g=$$(echo $${f%%include*}share/idl/$${f##*usr/include/}) ; \
-	   mkdir -p $$(dirname $$g) ; \
-	   mv $$f $$g ; \
-	   done
-
-override_dh_auto_clean:
-	[ -f $(ACE_ROOT)/GNUmakefile ] && $(MAKE) -C $(ACE_ROOT) realclean $(DSO_MAKE_FLAG) || true
-	find $(ACE_ROOT) -name 'GNUmakefile*' -o -name '.depend.*' | xargs -r rm
-	rm -f $(ACE_ROOT)/include/makeinclude/platform_macros.GNU
-	rm -f $(ACE_ROOT)/bin/MakeProjectCreator/config/default.features
-	rm -f $(ACE_ROOT)/ace/config.h $(ACE_ROOT)/ace/config-hurd.h
-	rm -f $(ACE_ROOT)/ACE-DPKG.mwc
-	rm -f debian/*.1 debian/mpc-ace.sgml
-	rm -f *-stamp
-# Remove stubs that get generated during TAO compilation but for some reason
-# are not removed on make realclean
-	rm -f `cat debian/TOREMOVE`
-	rm -Rf $(ACE_ROOT)/html/libace-doc \
-		$(ACE_ROOT)/html/libacexml-doc \
-		$(ACE_ROOT)/doxygen_sqlite3.db
-
-override_dh_compress:
-	dh_compress -Xexamples
-
-# Add --list-missing to make sure we don't miss new binaries
-override_dh_install:
-	dh_install --list-missing
-
-# ACE+TAO has different changelogs. Use the right one in every package.
-override_dh_installchangelogs:
-	dh_installchangelogs -pace-gperf -pgperf-ace apps/gperf/ChangeLog
-	dh_installchangelogs -pmpc-ace MPC/ChangeLog
-	dh_installchangelogs $(addprefix -p,$(ALL_ACEXML)) ACEXML/ChangeLog
-	dh_installchangelogs --remaining-packages ChangeLogs/ACE-6_4_5
-
-override_dh_fixperms:
-ifneq (,$(filter libace-doc, $(shell dh_listpackages)))
-	find debian -name '*.pl' | xargs -r sed -i -e '1i#!/usr/bin/perl'
-endif
-	dh_fixperms
-
-debian/mpc-ace.sgml: MPC/docs/MPC.sgml
-	sed -e 's/mpc\.pl/mpc-ace/g' -e 's/mwc\.pl/mwc-ace/g' $< > $@
-
-debian/%.1: debian/%.sgml
-	docbook-to-man $< > $@
-
-.PHONY: manpages
-manpages: manpages-stamp
-manpages-stamp: $(MAN1)
-	touch $@
diff --git a/ACE/debian/get-orig-source.sh b/ACE/debian/get-orig-source.sh
new file mode 100755
index 00000000000..4d3df97152b
--- /dev/null
+++ b/ACE/debian/get-orig-source.sh
@@ -0,0 +1,33 @@
+#!/bin/sh
+
+set -ex
+
+UPSTREAM_VERSION=$2
+ORIG_TARBALL=../ace_${UPSTREAM_VERSION}.orig.tar.gz
+
+REAL_TARBALL=`readlink -f ${ORIG_TARBALL}`
+
+WORKING_DIR=`dirname ${ORIG_TARBALL}`
+
+ORIG_TARBALL_DFSG=`echo ${ORIG_TARBALL} | sed -e "s/\(${UPSTREAM_VERSION}\)\(\.orig\)/\1+dfsg\2/g"`
+ORIG_TARBALL_DIR=`echo ${ORIG_TARBALL_DFSG} | sed -e "s/_\(${UPSTREAM_VERSION}\)/-\1/g" -e "s/\.tar\.gz//g"`
+ORIG_TARBALL_DIR_STRIP=`basename ${ORIG_TARBALL_DIR}`
+
+mkdir -p ${ORIG_TARBALL_DIR}
+tar --directory=${ORIG_TARBALL_DIR} --strip 1 -xzf ${REAL_TARBALL} || exit 1
+rm -f ${ORIG_TARBALL} ${REAL_TARBALL}
+
+cd ${ORIG_TARBALL_DIR}
+
+rm -rf ASNMP
+rm -rf performance-tests
+rm -rf rpmbuild debian
+rm -rf websvcs
+rm bin/LabVIEW_RT/*.exe
+rm -rf examples/C++NPv2
+rm -rf examples/C++NPv1
+rm -rf examples/APG
+
+GZIP=-9 tar --remove-files -czf ${ORIG_TARBALL_DFSG} ${ORIG_TARBALL_DIR} || exit 1
+
+exit 0
diff --git a/ACE/debian/libace-6.4.7.lintian-overrides b/ACE/debian/libace-6.4.7.lintian-overrides
index 240f8e08d0c..468b430838b 100644
--- a/ACE/debian/libace-6.4.7.lintian-overrides
+++ b/ACE/debian/libace-6.4.7.lintian-overrides
@@ -1,6 +1,6 @@
-libace-6.4.5: no-symbols-control-file usr/lib/libACE-6.4.5.so
-libace-6.4.5: no-symbols-control-file usr/lib/libACE_ETCL_Parser-6.4.5.so
-libace-6.4.5: no-symbols-control-file usr/lib/libACE_Monitor_Control-6.4.5.so
-libace-6.4.5: no-symbols-control-file usr/lib/libACE_ETCL-6.4.5.so
-libace-6.4.5: no-symbols-control-file usr/lib/libACE_RLECompression-6.4.5.so
-libace-6.4.5: no-symbols-control-file usr/lib/libACE_Compression-6.4.5.so
+libace-6.4.7: no-symbols-control-file usr/lib/libACE-6.4.7.so
+libace-6.4.7: no-symbols-control-file usr/lib/libACE_ETCL_Parser-6.4.7.so
+libace-6.4.7: no-symbols-control-file usr/lib/libACE_Monitor_Control-6.4.7.so
+libace-6.4.7: no-symbols-control-file usr/lib/libACE_ETCL-6.4.7.so
+libace-6.4.7: no-symbols-control-file usr/lib/libACE_RLECompression-6.4.7.so
+libace-6.4.7: no-symbols-control-file usr/lib/libACE_Compression-6.4.7.so
diff --git a/ACE/debian/libace-flreactor-6.4.7.lintian-overrides b/ACE/debian/libace-flreactor-6.4.7.lintian-overrides
index 4b58af00d10..f280d745380 100644
--- a/ACE/debian/libace-flreactor-6.4.7.lintian-overrides
+++ b/ACE/debian/libace-flreactor-6.4.7.lintian-overrides
@@ -1 +1 @@
-libace-flreactor-6.4.5: no-symbols-control-file usr/lib/libACE_FlReactor-6.4.5.so
+libace-flreactor-6.4.7: no-symbols-control-file usr/lib/libACE_FlReactor-6.4.7.so
diff --git a/ACE/debian/libace-foxreactor-6.4.7.lintian-overrides b/ACE/debian/libace-foxreactor-6.4.7.lintian-overrides
index 61c403e638b..a8ade20654d 100644
--- a/ACE/debian/libace-foxreactor-6.4.7.lintian-overrides
+++ b/ACE/debian/libace-foxreactor-6.4.7.lintian-overrides
@@ -1 +1 @@
-libace-foxreactor-6.4.5: no-symbols-control-file usr/lib/libACE_FoxReactor-6.4.5.so
+libace-foxreactor-6.4.7: no-symbols-control-file usr/lib/libACE_FoxReactor-6.4.7.so
diff --git a/ACE/debian/libace-htbp-6.4.7.lintian-overrides b/ACE/debian/libace-htbp-6.4.7.lintian-overrides
index 32697f5e2c0..151a2aa10a9 100644
--- a/ACE/debian/libace-htbp-6.4.7.lintian-overrides
+++ b/ACE/debian/libace-htbp-6.4.7.lintian-overrides
@@ -1 +1 @@
-libace-htbp-6.4.5: no-symbols-control-file usr/lib/libACE_HTBP-6.4.5.so
+libace-htbp-6.4.7: no-symbols-control-file usr/lib/libACE_HTBP-6.4.7.so
diff --git a/ACE/debian/libace-inet-6.4.7.lintian-overrides b/ACE/debian/libace-inet-6.4.7.lintian-overrides
index afb8bb9f959..0fc5348e278 100644
--- a/ACE/debian/libace-inet-6.4.7.lintian-overrides
+++ b/ACE/debian/libace-inet-6.4.7.lintian-overrides
@@ -1,2 +1,2 @@
-libace-inet-6.4.5: extended-description-is-probably-too-short
-libace-inet-6.4.5: no-symbols-control-file usr/lib/libACE_INet-6.4.5.so
+libace-inet-6.4.7: extended-description-is-probably-too-short
+libace-inet-6.4.7: no-symbols-control-file usr/lib/libACE_INet-6.4.7.so
diff --git a/ACE/debian/libace-inet-ssl-6.4.7.lintian-overrides b/ACE/debian/libace-inet-ssl-6.4.7.lintian-overrides
index dcf77c5c4a0..448bd49cbe1 100644
--- a/ACE/debian/libace-inet-ssl-6.4.7.lintian-overrides
+++ b/ACE/debian/libace-inet-ssl-6.4.7.lintian-overrides
@@ -1,4 +1,4 @@
-libace-inet-ssl-6.4.5: no-symbols-control-file usr/lib/libACE_INet_SSL-6.4.5.so
+libace-inet-ssl-6.4.7: no-symbols-control-file usr/lib/libACE_INet_SSL-6.4.7.so
 
 # It's Bison-generate code covered by the GNU Bison GPL-exception
-libace-inet-ssl-6.4.5: possible-gpl-code-linked-with-openssl
+libace-inet-ssl-6.4.7: possible-gpl-code-linked-with-openssl
diff --git a/ACE/debian/libace-qtreactor-6.4.7.install b/ACE/debian/libace-qtreactor-6.4.7.install
deleted file mode 100644
index 1d371e1e571..00000000000
--- a/ACE/debian/libace-qtreactor-6.4.7.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/libACE_QtReactor-*.so
diff --git a/ACE/debian/libace-qtreactor-6.4.7.lintian-overrides b/ACE/debian/libace-qtreactor-6.4.7.lintian-overrides
deleted file mode 100644
index 31bc9dc3867..00000000000
--- a/ACE/debian/libace-qtreactor-6.4.7.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-libace-qtreactor-6.4.5: no-symbols-control-file usr/lib/libACE_QtReactor-6.4.5.so
diff --git a/ACE/debian/libace-qtreactor-dev.install b/ACE/debian/libace-qtreactor-dev.install
deleted file mode 100644
index c5fd689c59a..00000000000
--- a/ACE/debian/libace-qtreactor-dev.install
+++ /dev/null
@@ -1,3 +0,0 @@
-usr/lib/libACE_QtReactor.so
-usr/include/ace/QtReactor
-usr/lib/pkgconfig/ACE_QtReactor.pc
diff --git a/ACE/debian/libace-qtreactor-dev.lintian-overrides b/ACE/debian/libace-qtreactor-dev.lintian-overrides
deleted file mode 100644
index 2bf18f7681a..00000000000
--- a/ACE/debian/libace-qtreactor-dev.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-libace-qtreactor-dev: extended-description-is-probably-too-short
diff --git a/ACE/debian/libace-rmcast-6.4.7.lintian-overrides b/ACE/debian/libace-rmcast-6.4.7.lintian-overrides
index 89d1e6523ce..63d10b11b9f 100644
--- a/ACE/debian/libace-rmcast-6.4.7.lintian-overrides
+++ b/ACE/debian/libace-rmcast-6.4.7.lintian-overrides
@@ -1 +1 @@
-libace-rmcast-6.4.5: no-symbols-control-file usr/lib/libACE_RMCast-6.4.5.so
+libace-rmcast-6.4.7: no-symbols-control-file usr/lib/libACE_RMCast-6.4.7.so
diff --git a/ACE/debian/libace-ssl-6.4.7.lintian-overrides b/ACE/debian/libace-ssl-6.4.7.lintian-overrides
index 2b0bc5f692a..93aae1a9edd 100644
--- a/ACE/debian/libace-ssl-6.4.7.lintian-overrides
+++ b/ACE/debian/libace-ssl-6.4.7.lintian-overrides
@@ -1,5 +1,5 @@
-libace-ssl-6.4.5: extended-description-is-probably-too-short
-libace-ssl-6.4.5: no-symbols-control-file usr/lib/libACE_SSL-6.4.5.so
+libace-ssl-6.4.7: extended-description-is-probably-too-short
+libace-ssl-6.4.7: no-symbols-control-file usr/lib/libACE_SSL-6.4.7.so
 
 # It's Bison-generate code covered by the GNU Bison GPL-exception
-libace-ssl-6.4.5: possible-gpl-code-linked-with-openssl
+libace-ssl-6.4.7: possible-gpl-code-linked-with-openssl
diff --git a/ACE/debian/libace-tkreactor-6.4.7.lintian-overrides b/ACE/debian/libace-tkreactor-6.4.7.lintian-overrides
index 836f6d37a9f..4bf8830fa9e 100644
--- a/ACE/debian/libace-tkreactor-6.4.7.lintian-overrides
+++ b/ACE/debian/libace-tkreactor-6.4.7.lintian-overrides
@@ -1 +1 @@
-libace-tkreactor-6.4.5: no-symbols-control-file usr/lib/libACE_TkReactor-6.4.5.so
+libace-tkreactor-6.4.7: no-symbols-control-file usr/lib/libACE_TkReactor-6.4.7.so
diff --git a/ACE/debian/libace-tmcast-6.4.7.lintian-overrides b/ACE/debian/libace-tmcast-6.4.7.lintian-overrides
index fbb009770a6..eaf1def89d4 100644
--- a/ACE/debian/libace-tmcast-6.4.7.lintian-overrides
+++ b/ACE/debian/libace-tmcast-6.4.7.lintian-overrides
@@ -1 +1 @@
-libace-tmcast-6.4.5: no-symbols-control-file usr/lib/libACE_TMCast-6.4.5.so
+libace-tmcast-6.4.7: no-symbols-control-file usr/lib/libACE_TMCast-6.4.7.so
diff --git a/ACE/debian/libace-xml-utils-6.4.7.lintian-overrides b/ACE/debian/libace-xml-utils-6.4.7.lintian-overrides
index dfe499a9dbb..b5662dc4b6f 100644
--- a/ACE/debian/libace-xml-utils-6.4.7.lintian-overrides
+++ b/ACE/debian/libace-xml-utils-6.4.7.lintian-overrides
@@ -1 +1 @@
-libace-xml-utils-6.4.5: no-symbols-control-file usr/lib/libACE_XML_Utils-6.4.5.so
+libace-xml-utils-6.4.7: no-symbols-control-file usr/lib/libACE_XML_Utils-6.4.7.so
diff --git a/ACE/debian/libace-xtreactor-6.4.7.lintian-overrides b/ACE/debian/libace-xtreactor-6.4.7.lintian-overrides
index 683006fa589..197f8bb0866 100644
--- a/ACE/debian/libace-xtreactor-6.4.7.lintian-overrides
+++ b/ACE/debian/libace-xtreactor-6.4.7.lintian-overrides
@@ -1 +1 @@
-libace-xtreactor-6.4.5: no-symbols-control-file usr/lib/libACE_XtReactor-6.4.5.so
+libace-xtreactor-6.4.7: no-symbols-control-file usr/lib/libACE_XtReactor-6.4.7.so
diff --git a/ACE/debian/libacexml-6.4.7.lintian-overrides b/ACE/debian/libacexml-6.4.7.lintian-overrides
index 62753f80cfe..711cbf02321 100644
--- a/ACE/debian/libacexml-6.4.7.lintian-overrides
+++ b/ACE/debian/libacexml-6.4.7.lintian-overrides
@@ -1,3 +1,3 @@
-libacexml-6.4.5: no-symbols-control-file usr/lib/libACEXML_Parser-6.4.5.so
-libacexml-6.4.5: no-symbols-control-file usr/lib/libACEXML_XML_Svc_Conf_Parser-6.4.5.so
-libacexml-6.4.5: no-symbols-control-file usr/lib/libACEXML-6.4.5.so
+libacexml-6.4.7: no-symbols-control-file usr/lib/libACEXML_Parser-6.4.7.so
+libacexml-6.4.7: no-symbols-control-file usr/lib/libACEXML_XML_Svc_Conf_Parser-6.4.7.so
+libacexml-6.4.7: no-symbols-control-file usr/lib/libACEXML-6.4.7.so
diff --git a/ACE/debian/libkokyu-6.4.7.lintian-overrides b/ACE/debian/libkokyu-6.4.7.lintian-overrides
index 73e11dec443..bbdf1f09523 100644
--- a/ACE/debian/libkokyu-6.4.7.lintian-overrides
+++ b/ACE/debian/libkokyu-6.4.7.lintian-overrides
@@ -1 +1 @@
-libkokyu-6.4.5: no-symbols-control-file usr/lib/libKokyu-6.4.5.so
+libkokyu-6.4.7: no-symbols-control-file usr/lib/libKokyu-6.4.7.so
diff --git a/ACE/debian/libnetsvcs-6.4.7.lintian-overrides b/ACE/debian/libnetsvcs-6.4.7.lintian-overrides
index 6ae68da92a4..eb9155573b5 100644
--- a/ACE/debian/libnetsvcs-6.4.7.lintian-overrides
+++ b/ACE/debian/libnetsvcs-6.4.7.lintian-overrides
@@ -1 +1 @@
-libnetsvcs-6.4.5: no-symbols-control-file usr/lib/libnetsvcs-6.4.5.so
+libnetsvcs-6.4.7: no-symbols-control-file usr/lib/libnetsvcs-6.4.7.so
diff --git a/ACE/debian/rules b/ACE/debian/rules
new file mode 100755
index 00000000000..0a8a196a7ac
--- /dev/null
+++ b/ACE/debian/rules
@@ -0,0 +1,115 @@
+#!/usr/bin/make -f
+
+# debian/rules file for ACE+TAO Debian GNU/Linux packages
+# written February 2002 by Ossama Othman <ossama@debian.org>
+# Modified August 2003 by Brian Nelson <pyro@debian.org>
+# Copyright (C) 2004  Raphael Bossek <bossekr@debian.org>
+# Copyright © 2005-2012 Thomas Girard <thomas.g.girard@free.fr>
+# Copyright © 2009-2014 Pau Garcia i Quiles <pgquiles@elpauer.org>
+# Copyright © 2010-2014 Johnny Willemsen <jwillemsen@remedy.nl>
+
+#export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+export DEB_BUILD_MAINT_OPTIONS = hardening=+format,+fortify,+stackprotector,+relro,+bindnow
+DPKG_EXPORT_BUILDFLAGS = 1
+include /usr/share/dpkg/buildflags.mk
+CFLAGS+=$(CPPFLAGS)
+CXXFLAGS+=$(CPPFLAGS)
+
+MWCFLAGS := -type gnuace -noreldefs
+DSO_MAKE_FLAG := versioned_so=2
+INSTALL_FLAGS := DESTDIR=$(CURDIR)/debian/tmp INSTALL_PREFIX=/usr install_rpath=0 $(DSO_MAKE_FLAG)
+
+MAN1 := debian/ace_netsvcs.1 \
+	debian/mpc-ace.1
+# Where we install every file before calling dh_install
+DT := debian/tmp
+
+DOXYGEN_FILES_TO_REMOVE := -name '*.md5' -o \
+                           -name '*.map' -o \
+                           -name '*.tag'
+
+# Package names, used when overriding dh_installchangelogs
+ALL_PACKAGES := $(shell dh_listpackages)
+ALL_ACEXML   := $(filter libacexml%,$(ALL_PACKAGES))
+
+export ACE_ROOT := $(shell pwd)
+export MPC_ROOT := $(ACE_ROOT)/MPC
+export LD_LIBRARY_PATH := $(LD_LIBRARY_PATH):$(ACE_ROOT)/lib
+
+%:
+	dh $@
+
+# Implement our own configure machinery; it will copy Debian specific
+# configuration before launching MPC to generate ACE+TAO GNUmakefile
+.PHONY: configure
+configure: configure-stamp
+configure-stamp:
+	cp debian/platform_macros.GNU $(ACE_ROOT)/include/makeinclude
+	cp debian/config*.h $(ACE_ROOT)/ace/
+	cp debian/default.features $(ACE_ROOT)/bin/MakeProjectCreator/config
+	cp debian/ACE-DPKG.mwc $(ACE_ROOT)
+	cd $(ACE_ROOT) && $(ACE_ROOT)/bin/mwc.pl $(MWCFLAGS) ACE-DPKG.mwc
+	touch $@
+
+override_dh_auto_build-arch: configure-stamp
+	$(MAKE) -C $(ACE_ROOT) $(DSO_MAKE_FLAG)
+
+override_dh_auto_build-indep: configure-stamp
+	$(MAKE) -C $(ACE_ROOT) $(DSO_MAKE_FLAG)
+	cd $(ACE_ROOT) && bin/generate_doxygen.pl -is_release -exclude_tao -exclude_ciao -exclude_dance
+	find $(ACE_ROOT)/html $(DOXYGEN_FILES_TO_REMOVE) | xargs -r rm -f
+
+override_dh_auto_install: manpages-stamp
+	$(MAKE) -C $(ACE_ROOT) install $(INSTALL_FLAGS)
+	mkdir -p $(DT)/usr/share/man/man1
+	cp $(ACE_ROOT)/apps/gperf/ace_gperf.1 $(DT)/usr/share/man/man1
+#	Relocate .idl and .pidl files
+	cd $(DT) && for f in $$(find usr/include -name '*.idl' -o -name '*.pidl') ; do \
+	   g=$$(echo $${f%%include*}share/idl/$${f##*usr/include/}) ; \
+	   mkdir -p $$(dirname $$g) ; \
+	   mv $$f $$g ; \
+	   done
+
+override_dh_auto_clean:
+	[ -f $(ACE_ROOT)/GNUmakefile ] && $(MAKE) -C $(ACE_ROOT) realclean $(DSO_MAKE_FLAG) || true
+	find $(ACE_ROOT) -name 'GNUmakefile*' -o -name '.depend.*' | xargs -r rm
+	rm -f $(ACE_ROOT)/include/makeinclude/platform_macros.GNU
+	rm -f $(ACE_ROOT)/bin/MakeProjectCreator/config/default.features
+	rm -f $(ACE_ROOT)/ace/config.h $(ACE_ROOT)/ace/config-hurd.h
+	rm -f $(ACE_ROOT)/ACE-DPKG.mwc
+	rm -f debian/*.1 debian/mpc-ace.sgml
+	rm -f *-stamp
+	rm -Rf $(ACE_ROOT)/html/libace-doc \
+		$(ACE_ROOT)/html/libacexml-doc \
+		$(ACE_ROOT)/doxygen_sqlite3.db
+
+override_dh_compress:
+	dh_compress -Xexamples
+
+# Add --list-missing to make sure we don't miss new binaries
+override_dh_install:
+	dh_install --list-missing
+
+# ACE+TAO has different changelogs. Use the right one in every package.
+override_dh_installchangelogs:
+	dh_installchangelogs -pace-gperf -pgperf-ace apps/gperf/ChangeLog
+	dh_installchangelogs -pmpc-ace MPC/ChangeLog
+	dh_installchangelogs $(addprefix -p,$(ALL_ACEXML)) ACEXML/ChangeLog
+	dh_installchangelogs --remaining-packages ChangeLogs/ACE-6_4_7
+
+override_dh_fixperms:
+ifneq (,$(filter libace-doc, $(shell dh_listpackages)))
+	find debian -name '*.pl' | xargs -r sed -i -e '1i#!/usr/bin/perl'
+endif
+	dh_fixperms
+
+debian/mpc-ace.sgml: MPC/docs/MPC.sgml
+	sed -e 's/mpc\.pl/mpc-ace/g' -e 's/mwc\.pl/mwc-ace/g' $< > $@
+
+debian/%.1: debian/%.sgml
+	docbook-to-man $< > $@
+
+.PHONY: manpages
+manpages: manpages-stamp
+manpages-stamp: $(MAN1)
+	touch $@
diff --git a/ACE/debian/source/format b/ACE/debian/source/format
new file mode 100644
index 00000000000..163aaf8d82b
--- /dev/null
+++ b/ACE/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/ACE/debian/source/lintian-overrides b/ACE/debian/source/lintian-overrides
new file mode 100644
index 00000000000..721df3d38a3
--- /dev/null
+++ b/ACE/debian/source/lintian-overrides
@@ -0,0 +1,3 @@
+# We are using a compat level marked as experimental 
+# (compat=9 in debhelper >= 8.1.3)
+ace source: package-needs-versioned-debhelper-build-depends 9
-- 
cgit v1.2.1


From ad5f2b013459dc63d98aee4b0533e5c4d1b14878 Mon Sep 17 00:00:00 2001
From: David Ward <david.ward@ll.mit.edu>
Date: Sun, 25 Mar 2018 19:04:11 -0400
Subject: Include appropriate file from ChangeLogs directory in Debian packages

Use the ACE version number to determine the file in the ChangeLogs
directory to install in Debian packages. (The variable definitions
are copied from ACE/include/makeinclude/wrapper_macros.GNU for the
non-Windows case.)
---
 ACE/debian/rules | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/ACE/debian/rules b/ACE/debian/rules
index 0a8a196a7ac..2bc9510ec4f 100755
--- a/ACE/debian/rules
+++ b/ACE/debian/rules
@@ -36,6 +36,10 @@ export ACE_ROOT := $(shell pwd)
 export MPC_ROOT := $(ACE_ROOT)/MPC
 export LD_LIBRARY_PATH := $(LD_LIBRARY_PATH):$(ACE_ROOT)/lib
 
+ACE_MAJOR_VERSION := $(shell awk '/ACE_MAJOR_VERSION/ { print $$3 }' ${ACE_ROOT}/ace/Version.h)
+ACE_MINOR_VERSION := $(shell awk '/ACE_MINOR_VERSION/ { print $$3 }' ${ACE_ROOT}/ace/Version.h)
+ACE_MICRO_VERSION := $(shell awk '/ACE_MICRO_VERSION/ { print $$3 }' ${ACE_ROOT}/ace/Version.h)
+
 %:
 	dh $@
 
@@ -95,7 +99,8 @@ override_dh_installchangelogs:
 	dh_installchangelogs -pace-gperf -pgperf-ace apps/gperf/ChangeLog
 	dh_installchangelogs -pmpc-ace MPC/ChangeLog
 	dh_installchangelogs $(addprefix -p,$(ALL_ACEXML)) ACEXML/ChangeLog
-	dh_installchangelogs --remaining-packages ChangeLogs/ACE-6_4_7
+	dh_installchangelogs --remaining-packages \
+	        ChangeLogs/ACE-$(ACE_MAJOR_VERSION)_$(ACE_MINOR_VERSION)_$(ACE_MICRO_VERSION)
 
 override_dh_fixperms:
 ifneq (,$(filter libace-doc, $(shell dh_listpackages)))
-- 
cgit v1.2.1


From c6def22a0b87bb608496721bcf8c4dc0a4b121b4 Mon Sep 17 00:00:00 2001
From: David Ward <david.ward@ll.mit.edu>
Date: Sun, 25 Mar 2018 19:04:24 -0400
Subject: Exclude TAO in ACE/debian/ACE-DPKG.mwc

This provides consistency with ACE/ACE.mwc, which excludes TAO (as
seen in both the ACE-only and ACE+TAO source distributions).

Adding this exclusion allows Debian package builds to succeed from
either source distribution, rather than failing if it contains TAO.
In turn, this allows the openSUSE Build Service to produce both RPM
and Debian packages from a single ACE+TAO source distribution.
---
 ACE/debian/ACE-DPKG.mwc | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ACE/debian/ACE-DPKG.mwc b/ACE/debian/ACE-DPKG.mwc
index b7e05296932..cdbfe475b9f 100644
--- a/ACE/debian/ACE-DPKG.mwc
+++ b/ACE/debian/ACE-DPKG.mwc
@@ -1,5 +1,7 @@
 workspace {
   exclude {
+    TAO
+
     performance-tests
 
     examples
-- 
cgit v1.2.1


From 30f4c6e7312ac0941b4eeadaa2b0916de4918399 Mon Sep 17 00:00:00 2001
From: David Ward <david.ward@ll.mit.edu>
Date: Sun, 25 Mar 2018 19:04:39 -0400
Subject: Fix handling of Debian packaging files in ACE/bin/make_release.py

Remove unused code to handle TAO, which is not packaged for Debian.

Remove code to handle ACE/debian/ace.dsc which was deleted. (A .dsc
file is produced automatically by building a Debian source package.)

Examine ACE/debian/control instead of ACE/debian/debian.control.

Update the version inside ACE/debian/*-<version>.lintain-overrides
files, in addition to renaming these files.

Adjust a regular expression to avoid matching on whitespace or other
characters past the end of the file or package name. This had caused
version updates to occur in the wrong places in ACE/debian/control.
---
 ACE/bin/make_release.py | 103 ++++++++++++++++++------------------------------
 1 file changed, 39 insertions(+), 64 deletions(-)

diff --git a/ACE/bin/make_release.py b/ACE/bin/make_release.py
index a55ba82d9da..d5042bc4ade 100755
--- a/ACE/bin/make_release.py
+++ b/ACE/bin/make_release.py
@@ -302,66 +302,64 @@ def update_spec_file ():
 
 def update_debianbuild ():
     """ Updates ACE_ROOT/debian directory.
-    - renames all files with version nrs in name to new scheme.
-    - updates version nrs in file debian/control
-    Currently ONLY ACE & TAO stuff is handled here """
+    - renames all files with version numbers in name; if file contains
+      lintian overrides, update version numbers inside file
+    - updates version numbers inside file debian/control
+    Currently ONLY ACE is handled here """
 
     global comp_versions
 
-    import glob
     import re
-    from os.path import basename
-    from os.path import dirname
-    from os.path import join
+    from os import listdir
 
     files = list ()
     prev_ace_ver = None
-    prev_tao_ver = None
 
-    # rename files
-    mask = re.compile ("(libace|libkokyu|libnetsvcs)(.*)(\d+\.\d+\.\d+)(.*)")
-    tao = re.compile ("tao", re.IGNORECASE)
+    dname = doc_root + '/ACE_TAO/ACE/debian/'
 
-    for fname in glob.iglob(doc_root + '/ACE_TAO/ACE/debian/*'):
-        print "Considering " + fname
-        match = None
+    mask = re.compile ("(libace|libACE|libkokyu|libKokyu|libnetsvcs)([^\s,:]*-)(\d+\.\d+\.\d+)([^\s,:]*)")
 
-        fbase = basename (fname)
+    def update_ver (match):
+        return match.group (1) + match.group (2) + comp_versions["ACE_version"] + match.group (4)
 
-        match = mask.search (fbase)
-        fnewname = None
-        if match is not None:
-            if tao.search (fbase) is not None:
-                fnewname = join (dirname (fname), match.group (1) + match.group (2) + comp_versions["TAO_version"] + match.group (4))
-                prev_tao_ver = match.group (3)
-            else:
-                fnewname = join (dirname (fname), match.group (1) + match.group (2) + comp_versions["ACE_version"] + match.group (4))
-                prev_ace_ver = match.group (3)
+    # find files in debian/* matching mask
+    for fname in listdir(dname):
+        match = mask.search (fname)
+        if match is None:
+            continue
 
-        print prev_ace_ver
-#        print prev_tao_var
+        fnewname = update_ver (match)
+        prev_ace_ver = match.group (3)
 
-        if fnewname is not None:
-            if opts.take_action:
-                print "Rename: " + fname + " to " + fnewname + "\n"
-                ex ("git mv " + fname + " " + fnewname)
-            else:
-                print "Rename: " + fname + " to " + fnewname + "\n"
+        # if file contains lintian overrides, update file
+        if match.group (4) == '.lintian-overrides':
+            with open (dname + fname, 'r+') as lintian_overrides_file:
+                new_lintian_overrides = ""
+                for line in lintian_overrides_file.readlines ():
+                    new_lintian_overrides += mask.sub (update_ver, line)
 
-    # update debianbuild/control
-    def update_ver (match):
-        if match.group (1) == 'libtao':
-            return match.group (1) + match.group (2) + comp_versions["TAO_version"] + match.group (4)
-        else:
-            return match.group (1) + match.group (2) + comp_versions["ACE_version"] + match.group (4)
+                if opts.take_action:
+                    lintian_overrides_file.seek (0)
+                    lintian_overrides_file.truncate (0)
+                    lintian_overrides_file.writelines (new_lintian_overrides)
+                else:
+                    print "New lintian-overrides file:"
+                    print "".join (new_lintian_overrides)
 
-    with open (doc_root + "/ACE_TAO/ACE/debian/debian.control", 'r+') as control_file:
+            files.append (dname + fnewname)
+
+        # rename file
+        print "Rename: " + dname + fname + " to " + dname + fnewname + "\n"
+        if opts.take_action:
+            ex ("git mv " + dname + fname + " " + dname + fnewname)
+
+    # update debian/control
+    with open (dname + "control", 'r+') as control_file:
         new_ctrl = ""
         for line in control_file.readlines ():
             if re.search ("^(Package|Depends|Suggests):", line) is not None:
                 line = mask.sub (update_ver, line)
             elif re.search ('^Replaces:', line) is not None:
-                print comp_versions["ACE_version"]
                 line = line.replace (prev_ace_ver, comp_versions["ACE_version"])
 
             new_ctrl += line
@@ -374,30 +372,7 @@ def update_debianbuild ():
             print "New control file:"
             print "".join (new_ctrl)
 
-    files.append (doc_root + "/ACE_TAO/ACE/debian/debian.control")
-
-    # rewrite debian/dsc
-    dsc_lines = """Format: 1.0
-Source: ACE+src-%s
-Version: %s
-Binary: ace
-Maintainer: Johnny Willemsen  <jwillemsen@remedy.nl>
-Architecture: any
-Build-Depends: gcc, make, g++, debhelper (>= 5), dpkg-dev, libssl-dev (>= 0.9.7d), dpatch (>= 2.0.10), libxt-dev (>= 4.3.0), libfltk1.1-dev (>= 1.1.4), libqt4-dev (>= 4.4~rc1-4), tk-dev, docbook-to-man, autoconf, automake, libtool, autotools-dev, doxygen, graphviz, libfox-1.6-dev
-Files:
- 65b34001c9605f056713a7e146b052d1 46346654 ACE-src-%s.tar.gz
-
-""" % (comp_versions["ACE_version"], comp_versions["TAO_version"], comp_versions["ACE_version"])
-    if opts.take_action:
-        with open (doc_root + "/ACE_TAO/ACE/debian/ace.dsc", 'r+') as dsc_file:
-            dsc_file.seek (0)
-            dsc_file.truncate (0)
-            dsc_file.writelines (dsc_lines)
-    else:
-        print "New dsc file:\n"
-        print dsc_lines
-
-    files.append (doc_root + "/ACE_TAO/ACE/debian/ace.dsc")
+    files.append (dname + "control")
 
     return files
 
-- 
cgit v1.2.1


From b7d5b823a788467d79b12c27f9771f5d407746f3 Mon Sep 17 00:00:00 2001
From: David Ward <david.ward@ll.mit.edu>
Date: Sun, 25 Mar 2018 19:05:44 -0400
Subject: Update instructions for adding a release to openSUSE Build Service

---
 ACE/docs/bczar/bczar.html | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/ACE/docs/bczar/bczar.html b/ACE/docs/bczar/bczar.html
index d492b8832a3..b93eb95537f 100644
--- a/ACE/docs/bczar/bczar.html
+++ b/ACE/docs/bczar/bczar.html
@@ -419,16 +419,13 @@
       <li>
         Update the ACE/NEWS and TAO/NEWS files to have a new section for the next release.</li>
       <li>
-        Update OpenSuSE Build service using
+        Update openSUSE Build service using<br>
         <code>
-        osc checkout devel:libraries:ACE
-        osc add <new release>
-        cp rpmbuild/ace-tao.spec .
-        cp debian/control debian.control
-        cp debian/dsc ace.dsc
-        cp debian/changelog debian.changelog
-        cp debian/rules debian.rules
-        osc commit
+        osc checkout devel:libraries:ACE:micro ACE<br>
+        cd &quot;devel:libraries:ACE:micro/ACE&quot;<br>
+        osc rm ACE+TAO-src-*.tar.gz<br>
+        cp $DOC_ROOT/package-&lt;PID&gt;/ACE+TAO-src-*.tar.gz .<br>
+        osc commit<br>
         </code>
       </li>
       <li>
-- 
cgit v1.2.1


From d7e67f3d37c23b4b46875d9c810c3fa44a64ac8b Mon Sep 17 00:00:00 2001
From: David Ward <david.ward@ll.mit.edu>
Date: Sun, 25 Mar 2018 19:05:50 -0400
Subject: Update my e-mail address

---
 ACE/THANKS | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ACE/THANKS b/ACE/THANKS
index 6072880a6fa..10b22318872 100644
--- a/ACE/THANKS
+++ b/ACE/THANKS
@@ -2324,7 +2324,7 @@ Tim Pinkawa <tpinkawa at eagleseven dot com>
 Ed Blackmond <ed dot blackmond at themis dot com>
 Dave <dwh0403 at 163 dot com>
 Inma Perea <inma dot perea dot fdz at gmail dot com>
-David Ward <dpward at mit dot edu>
+David Ward <david dot ward at ll dot mit dot edu>
 Anatoli Sakhnik <sakhnik at gmail dot com>
 Max Zhou <earthdog at 126 dot com>
 Daynesh Mangal <daynesh at gmail dot com>
-- 
cgit v1.2.1


From 6d5ecfa9873a5612940057f2ee852a3c6ec08660 Mon Sep 17 00:00:00 2001
From: reicesar <reicesar@gmail.com>
Date: Wed, 28 Mar 2018 11:07:58 -0300
Subject: Fix 64bit issue on load registry data

---
 TAO/orbsvcs/ImplRepo_Service/Activator_Options.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/TAO/orbsvcs/ImplRepo_Service/Activator_Options.cpp b/TAO/orbsvcs/ImplRepo_Service/Activator_Options.cpp
index ecfe8758e38..dcae5824b66 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Activator_Options.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/Activator_Options.cpp
@@ -322,7 +322,7 @@ Activator_Options::load_registry_options ()
       // If there aren't any saved parameters, then that's ok.
       return 0;
     }
-  char tmpstr[4096];
+  ACE_TCHAR tmpstr[4096];
   DWORD sz = sizeof (tmpstr);
   DWORD type = 0;
   err = ACE_TEXT_RegQueryValueEx (key, ACE_TEXT("ORBInitOptions"), 0, &type,
@@ -331,7 +331,7 @@ Activator_Options::load_registry_options ()
     {
       ACE_ASSERT (type == REG_SZ);
       tmpstr[sz - 1] = '\0';
-      this->cmdline_ = tmpstr;
+      this->cmdline_ = ACE_TEXT_ALWAYS_CHAR(tmpstr);
     }
 
   sz = sizeof(tmpstr);
@@ -341,7 +341,7 @@ Activator_Options::load_registry_options ()
     {
       ACE_ASSERT (type == REG_SZ);
       tmpstr[sz - 1] = '\0';
-      this->ior_output_file_ = ACE_TEXT_CHAR_TO_TCHAR(tmpstr);
+      this->ior_output_file_ = tmpstr;
     }
 
   sz = sizeof(debug_);
@@ -359,7 +359,7 @@ Activator_Options::load_registry_options ()
     {
       ACE_ASSERT (type == REG_SZ);
       tmpstr[sz - 1] = '\0';
-      this->name_ = tmpstr;
+      this->name_ = ACE_TEXT_ALWAYS_CHAR(tmpstr);
     }
 
   DWORD tmpint = 0;
-- 
cgit v1.2.1


From 8903deb76a7129defc2849125165f95ab2235692 Mon Sep 17 00:00:00 2001
From: "brewmanz(75)" <brewmanz@gmail.com>
Date: Thu, 29 Mar 2018 20:54:02 +1300
Subject: Add missing $ prefix to ACE_ROOT

---
 ACE/tests/README | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ACE/tests/README b/ACE/tests/README
index f6bd9b5771b..16f00d86893 100644
--- a/ACE/tests/README
+++ b/ACE/tests/README
@@ -12,7 +12,7 @@ features.  Building and running the tests is straightforward:
 
 2. You then need to run all the tests, e.g., by running the perl script
 
-   ACE_ROOT/tests/run_test.pl
+   $ACE_ROOT/tests/run_test.pl
 
    Naturally, make sure that you've installed perl first!
 
-- 
cgit v1.2.1


From 0f82fa2d40bc0a82a92a8cb809c74727eac78a66 Mon Sep 17 00:00:00 2001
From: Adam Mitz <mitza@objectcomputing.com>
Date: Thu, 29 Mar 2018 14:31:58 -0500
Subject: Compiler_Features_32_Test for clang 6

No different than clang 5
---
 ACE/tests/Compiler_Features_32_Test.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ACE/tests/Compiler_Features_32_Test.cpp b/ACE/tests/Compiler_Features_32_Test.cpp
index d2b095f6d99..4b1354cd0b4 100644
--- a/ACE/tests/Compiler_Features_32_Test.cpp
+++ b/ACE/tests/Compiler_Features_32_Test.cpp
@@ -43,7 +43,7 @@ void A::clear ()
 {
 #if defined __clang__ && \
     (defined __apple_build_version__ && __apple_build_version__ < 9100000 \
-     || __clang_major__ <= 5)
+     || __clang_major__ <= 6)
 #define CLANG_WORKAROUND
 #endif
 
-- 
cgit v1.2.1


From b901665ea61fc8d923ec498d708909c777967cdb Mon Sep 17 00:00:00 2001
From: Adam Mitz <mitza@ociweb.com>
Date: Wed, 28 Mar 2018 15:21:39 -0500
Subject: Process_Unix.pm: optional stack traces and core file generation for
 stuck processes

---
 ACE/bin/PerlACE/Process_Unix.pm | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/ACE/bin/PerlACE/Process_Unix.pm b/ACE/bin/PerlACE/Process_Unix.pm
index 487a2880abb..6202626cce1 100644
--- a/ACE/bin/PerlACE/Process_Unix.pm
+++ b/ACE/bin/PerlACE/Process_Unix.pm
@@ -586,6 +586,20 @@ sub WaitKill ($)
 
     if ($status == -1) {
         print STDERR "ERROR: $self->{EXECUTABLE} timedout\n";
+
+        if ($ENV{ACE_TEST_LOG_STUCK_STACKS}) {
+            my $debugger = ($^O eq 'darwin') ? 'lldb' : 'gdb';
+            my $commands = ($^O eq 'darwin') ? "-o 'bt all'"
+                : "-ex 'set pagination off' -ex 'thread apply all backtrace'";
+            system "$debugger --batch -p $self->{PROCESS} $commands";
+        }
+
+        if ($ENV{ACE_TEST_GENERATE_CORE_FILE}) {
+            system ($^O ne 'darwin') ? "gcore $self->{PROCESS}"
+                : "lldb -b -p $self->{PROCESS} -o " .
+                "'process save-core core.$self->{PROCESS}'";
+        }
+
         $self->Kill ();
     }
 
-- 
cgit v1.2.1


From 110a761b4731a561fbc04a62f98bc35863d4a64f Mon Sep 17 00:00:00 2001
From: Johnny Willemsen <jwillemsen@remedy.nl>
Date: Wed, 4 Apr 2018 11:03:29 +0200
Subject: Minor documentation changes and remove old cvs date tags

---
 ACE/contrib/FaCE/FaCE.cpp          |  1 -
 TAO/docs/cec_options.html          |  8 ----
 TAO/docs/documentation.html        |  2 +-
 TAO/docs/releasenotes/PSS.html     |  2 +-
 TAO/docs/releasenotes/TODO.html    |  4 --
 TAO/docs/releasenotes/amh.html     | 77 +++++++++++++++++++-------------------
 TAO/docs/releasenotes/ec.html      |  1 -
 TAO/docs/releasenotes/index.html   | 21 +----------
 TAO/docs/releasenotes/orbcore.html |  1 -
 TAO/docs/rtcorba/architecture.html |  1 -
 TAO/docs/rtcorba/faq.html          |  2 -
 TAO/docs/rtcorba/features.html     |  4 +-
 TAO/docs/rtcorba/issues.html       |  2 +-
 TAO/docs/rtcorba/omg_issues.html   |  4 +-
 TAO/docs/rtcorba/status.html       |  2 +-
 15 files changed, 47 insertions(+), 85 deletions(-)

diff --git a/ACE/contrib/FaCE/FaCE.cpp b/ACE/contrib/FaCE/FaCE.cpp
index 22eeadc1e13..bbe83ebca91 100644
--- a/ACE/contrib/FaCE/FaCE.cpp
+++ b/ACE/contrib/FaCE/FaCE.cpp
@@ -26,7 +26,6 @@ const ACE_TCHAR* g_ParameterFileName = ACE_TEXT("Parameters.txt");
  * parameters and parameter history file.
  *
  * @author Si Mong Park (spark@ociweb.com)
- * @version $Revision$ $Date$
  */
 class ParameterList
 {
diff --git a/TAO/docs/cec_options.html b/TAO/docs/cec_options.html
index e91ac919a4e..1e5db2f4db5 100644
--- a/TAO/docs/cec_options.html
+++ b/TAO/docs/cec_options.html
@@ -452,13 +452,5 @@ static CEC_Factory "-CECDispatching reactive ....."
     <P><HR><P>
 
       Back to the TAO <A HREF="index.html">components documentation</A>.
-
-      <!--#include virtual="/~schmidt/cgi-sig.html" -->
-
-    <address><a href="mailto:coryan@cs.wustl.edu">Carlos O'Ryan</a></address>
-<!-- Created: Thu Jul  1 21:44:28 CDT 1999 -->
-<!-- hhmts start -->
-Last modified: Fri Apr 20 15:24:09 CDT 2001
-<!-- hhmts end -->
   </body>
 </html>
diff --git a/TAO/docs/documentation.html b/TAO/docs/documentation.html
index 39e70620173..38bfe9d57db 100644
--- a/TAO/docs/documentation.html
+++ b/TAO/docs/documentation.html
@@ -25,7 +25,7 @@ bgcolor="#ffffff">
 
       <dt> <img alt="o" src="redball.gif"> <a HREF="http://www.theaceorb.com/product/index.html">OCI TAO Developer's Guide</a> </dt><P>
 
-      <dt> <img alt="o" src="redball.gif"> <a HREF="http://www.remedy.nl/opensource/corbapg.html">Remedy TAO Programmer's Guide</a> </dt><P>
+      <dt> <img alt="o" src="redball.gif"> <a HREF="https://www.remedy.nl/opensource/corbapg.html">Remedy IT CORBA Programmer's Guide</a> </dt><P>
 
       <dt> <img alt="o" src="redball.gif"> <a HREF="orbsvcs.html">Online ORB Services Documentation</a> </dt><P>
 
diff --git a/TAO/docs/releasenotes/PSS.html b/TAO/docs/releasenotes/PSS.html
index 6b021fe8e06..de4907bf3ea 100644
--- a/TAO/docs/releasenotes/PSS.html
+++ b/TAO/docs/releasenotes/PSS.html
@@ -15,7 +15,7 @@
         <p>Last Update: 2002/07/29 </p>
       </center>
 
-      <p>Persistent State Service (PSS) desribes a way of making a
+      <p>Persistent State Service (PSS) describes a way of making a
 	service persistent. The fact that PSS is being used by a
 	service is known only to the service (server) and not to the
 	client which makes use of the service. PSS presents persistent
diff --git a/TAO/docs/releasenotes/TODO.html b/TAO/docs/releasenotes/TODO.html
index 75e33df01e6..65e12cbc427 100644
--- a/TAO/docs/releasenotes/TODO.html
+++ b/TAO/docs/releasenotes/TODO.html
@@ -17,10 +17,6 @@
   Bugzilla
       </A> now.
     </P>
-    <P>
-      Last Updated: $Date$ $Revision$
-    </P>
-
 <HR>
 
 <P>Back to the TAO <A HREF="../index.html">documentation index</A>.&nbsp;<!--#include virtual="/~schmidt/cgi-sig.html" -->
diff --git a/TAO/docs/releasenotes/amh.html b/TAO/docs/releasenotes/amh.html
index 141d1a4eabe..556692c3d16 100644
--- a/TAO/docs/releasenotes/amh.html
+++ b/TAO/docs/releasenotes/amh.html
@@ -9,11 +9,10 @@
 <h3>TAO's Asynchronous Method Handling (AMH) Feature</h3>
     Point of contact: <a href="mailto:coryan@uci.edu">Carlos O'Ryan, </a>
                       <a href="mailto:mayur@ics.uci.edu">Mayur Deshpande</a>
-    <h4>Last Updated: $Date$</h4>
 
-    <p> The purpose of this document is to provide a guide to using the AMH 
-capability available in TAO.  This capability is not specified by any 
-CORBA specification (as of date). This document lists the motivation for AMH, 
+    <p> The purpose of this document is to provide a guide to using the AMH
+capability available in TAO.  This capability is not specified by any
+CORBA specification (as of date). This document lists the motivation for AMH,
 how to use it and its current implementation status. </p>
 
 <HR SIZE=4 WIDTH="100%">
@@ -21,42 +20,42 @@ how to use it and its current implementation status. </p>
 
 <h3>Context</h3>
 For many types of distributed systems, the CORBA asynchronous method
-invocation 
-<a href="index.html/#ami"> (AMI) </a> 
-mechanism can improve concurrency, scalability, and 
-responsiveness significantly. AMI allows clients to invoke multiple 
+invocation
+<a href="index.html/#ami"> (AMI) </a>
+mechanism can improve concurrency, scalability, and
+responsiveness significantly. AMI allows clients to invoke multiple
 two-way requests without waiting for responses. The time normally
 spent waiting for replies can therefore be used to perform other
-useful work. The TAO asynchronous method handling (AMH) is a 
-mechanism, which extends the concepts of AMI from clients to 
-servers. Servers with AMH capability can return immediately 
-from (potentially) long, blocking requests. This makes the 
-servers capable of higher throughput. For a detailed description 
-for the motivation and potential use-cases of AMH, please refer to 
+useful work. The TAO asynchronous method handling (AMH) is a
+mechanism, which extends the concepts of AMI from clients to
+servers. Servers with AMH capability can return immediately
+from (potentially) long, blocking requests. This makes the
+servers capable of higher throughput. For a detailed description
+for the motivation and potential use-cases of AMH, please refer to
 <a href="http://www.cs.wustl.edu/~schmidt/PDF/AMH.pdf">AMH-Motivation. </a>
 
 <HR SIZE=4 WIDTH="100%">
 
 
 <h3>Using AMH</h3>
-Servers that want to take advantage of AMH capability must use 
-AMH-servants derived from AMH-skeletons. Invoking the 
+Servers that want to take advantage of AMH capability must use
+AMH-servants derived from AMH-skeletons. Invoking the
 <a href="index.html#idl">IDL-Compiler </a>
 with the "-GH" option causes the IDL-Compiler to generate
-AMH-skeletons for all interfaces in the ".idl" file.  The signatures 
-of the AMH-methods differ from the original interfaces as per the 
-rules described in 
+AMH-skeletons for all interfaces in the ".idl" file.  The signatures
+of the AMH-methods differ from the original interfaces as per the
+rules described in
 <a href="http://www.cs.wustl.edu/~schmidt/PDF/DOA-02.pdf"">AMH-In-Detail. </a>
-Servants derived from the AMH-skeletons are registered with the POA in the usual manner 
-and appear to clients as "normal" servants for the corresponding 
-interfaces; Thus even while being transparent to the client, these 
-servants are now capable of handling requests asynchronously.  
-AMH-servants can be registered in any POA and can intermix with 
-"normal" servants in the same POA. The granularity of AMH is at 
+Servants derived from the AMH-skeletons are registered with the POA in the usual manner
+and appear to clients as "normal" servants for the corresponding
+interfaces; Thus even while being transparent to the client, these
+servants are now capable of handling requests asynchronously.
+AMH-servants can be registered in any POA and can intermix with
+"normal" servants in the same POA. The granularity of AMH is at
 the interface level and not at the method level; Thus for an interface
-compiled with the "-GH" option, all operations in that interface are 
+compiled with the "-GH" option, all operations in that interface are
 asynchronous. Currently, AMH doesn't work in conjunction with
-<a href="index.html#interceptor">Interceptors </a> 
+<a href="index.html#interceptor">Interceptors </a>
 and behaviour is undefined if both are used together.
 
 <HR SIZE=4 WIDTH="100%">
@@ -73,7 +72,7 @@ and behaviour is undefined if both are used together.
 <li>Generation of AMH ResponseHandlers.</li>
 <li>AMH Exceptions.</li>
 <li>Fix the narrow method bug for AMH skeletons : Fixed
-<li>Sending intelligent exception codes back to client in case 
+<li>Sending intelligent exception codes back to client in case
 something nasty happens in the AMH server.</li>
 <li>Example of using AMH available at ACE_wrappers/TAO/examples/AMH/Sink_Server.</li>
 <li>Test for AMH : ACE_wrappers/TAO/performance-tests/Latency/AMH</li>
@@ -85,17 +84,17 @@ something nasty happens in the AMH server.</li>
 
 
 <h3>Credits</h3>
-Original idea first proposed by 
-<a href="mailto:coryan@uci.edu">Carlos O'Ryan </a> 
-and changes to ORB for AMH first attempted by 
-<a href="mailto:brucetrask@aol.com">Bruce Trask. </a>  
-First go to get the IDL-Compiler to generate AMH code attempted by 
-<a href="mailto:brunsch@doc.ece.uci.edu"> Darrell Brunsch. </a>  
-ORB changes for AMH as they stand today put in by 
-<a href="mailto:mayur@ics.uci.edu">Mayur Deshpande. </a>  
-Second go at getting IDL-compiler to generate code attempted by Mayur and 
-<a href="mailto:parsons@cs.wustl.edu">Jeff Parsons. </a>  
-Getting the IDL-Compiler beast to generate the right AMH code finally 
+Original idea first proposed by
+<a href="mailto:coryan@uci.edu">Carlos O'Ryan </a>
+and changes to ORB for AMH first attempted by
+<a href="mailto:brucetrask@aol.com">Bruce Trask. </a>
+First go to get the IDL-Compiler to generate AMH code attempted by
+<a href="mailto:brunsch@doc.ece.uci.edu"> Darrell Brunsch. </a>
+ORB changes for AMH as they stand today put in by
+<a href="mailto:mayur@ics.uci.edu">Mayur Deshpande. </a>
+Second go at getting IDL-compiler to generate code attempted by Mayur and
+<a href="mailto:parsons@cs.wustl.edu">Jeff Parsons. </a>
+Getting the IDL-Compiler beast to generate the right AMH code finally
 achieved by Carlos.
 
 <HR SIZE=4 WIDTH="100%">
diff --git a/TAO/docs/releasenotes/ec.html b/TAO/docs/releasenotes/ec.html
index 3a6a3bca6cb..43c142707db 100644
--- a/TAO/docs/releasenotes/ec.html
+++ b/TAO/docs/releasenotes/ec.html
@@ -8,7 +8,6 @@
 
 <H3>TAO's Real-time Event Service</H3>
     Point of contact: <A HREF="mailto:jwillemsen@remedy.nl">Johnny Willemsen</A>
-    <H4>Last Updated: $Date$</H4>
 
     Documentation for the command line and service configurator
     options used to configure the real-time event service is available <A
diff --git a/TAO/docs/releasenotes/index.html b/TAO/docs/releasenotes/index.html
index a529c8898a2..f676bdf3c39 100644
--- a/TAO/docs/releasenotes/index.html
+++ b/TAO/docs/releasenotes/index.html
@@ -181,24 +181,6 @@ Notification Service
 
 
 
-</ul>
-</td>
-
-<td VALIGN=TOP>
-<ul>
-<b>CCM Related</b>
-<br><BR>
-<li>
-<a href="../../../CIAO/docs/releasenotes/index.html">CORBA Component Model (CIAO)</a></li>
-<li>
-<a href="../../../CIAO/docs/releasenotes/dance.html">Deployment and
-    Configuration Engine (DAnCE)</a></li>
-<li>
-<a href="../../../CIAO/CIDLC/README.html">Component Implementation
-Definition Language Compiler (CIDLC)</a></li>
-<li>
-<a href="../../../CIAO/docs/static_ciao_contents.html">Static Configuration
-    Support for Real-Time Platforms</a></li>
 </ul>
 </td>
 
@@ -215,7 +197,7 @@ Definition Language Compiler (CIDLC)</a></li>
 </table>
 
 
-A complete list of all modifications to TAO is available in the <a href="../../ChangeLog">ChangeLog</a>.
+A complete list of all modifications to TAO is available in the <a href="../../ChangeLogs">ChangeLogs</a>.
 <p>
 <hr>
 <h3>
@@ -2555,6 +2537,5 @@ Need to test local object support more systematically and comprehensively.
 
 <hr>
 <p>Back to the TAO <a href="../index.html">documentation index</a>.<!--#include virtual="/~schmidt/cgi-sig.html" -->
-<hr><!-- hhmts start -->Last modified: Thu May 4 13:08:35 UTC 2006<!-- hhmts end -->
 </body>
 </html>
diff --git a/TAO/docs/releasenotes/orbcore.html b/TAO/docs/releasenotes/orbcore.html
index 611fb321c69..60aad951879 100644
--- a/TAO/docs/releasenotes/orbcore.html
+++ b/TAO/docs/releasenotes/orbcore.html
@@ -23,7 +23,6 @@
 
 Point of contact: <a href="mailto: bala@cs.wustl.edu">Balchandran Natarajan</a>
 
-<p>Last Update: $Date$</p>
 </center>
 
 <!-- ============================================================ -->
diff --git a/TAO/docs/rtcorba/architecture.html b/TAO/docs/rtcorba/architecture.html
index a88c762f940..b160c6fb7cf 100644
--- a/TAO/docs/rtcorba/architecture.html
+++ b/TAO/docs/rtcorba/architecture.html
@@ -112,6 +112,5 @@ and deposit the requests into the right queue for processing.&nbsp;&nbsp;</p>
     is an easier design to implement, integrate and test piece-by-piece.</li>
 </ul>
 <hr>
-<p><i>Last modified: $Date$</i></p>
 </body>
 </html>
diff --git a/TAO/docs/rtcorba/faq.html b/TAO/docs/rtcorba/faq.html
index ac0ec52cfb4..efd90ea90c7 100644
--- a/TAO/docs/rtcorba/faq.html
+++ b/TAO/docs/rtcorba/faq.html
@@ -33,8 +33,6 @@
 <hr>
 <i>
 
-<p>Last modified: $Date$ </i></p>
-
 <p>&nbsp;</p>
 </body>
 </html>
diff --git a/TAO/docs/rtcorba/features.html b/TAO/docs/rtcorba/features.html
index a8d1edc5d3b..c1a16aa8f28 100644
--- a/TAO/docs/rtcorba/features.html
+++ b/TAO/docs/rtcorba/features.html
@@ -208,7 +208,7 @@ ThreadPools are now fully supported. Endpoint priorities are no longer
 supported.</li>
 <li>
 By default dynamic RTCorba threads live forever after they are created.
-When using the <code>RTORBDynamicThreadIdleTimeout</code> from the 
+When using the <code>RTORBDynamicThreadIdleTimeout</code> from the
 <code>RT_ORB_Loader</code> it
 can be specified that the dynamic threads should end after a given
 idle time. Timeout must be specified in microseconds, 0 means the threads
@@ -838,7 +838,7 @@ priority</tt>
 map the RTCORBA priority to the network priority.
 </ul>
 <br>
-<i>Last Modified: $Date$</i></dl>
+</dl>
 
 </body>
 </html>
diff --git a/TAO/docs/rtcorba/issues.html b/TAO/docs/rtcorba/issues.html
index 9aadf5c3eb6..c94a48f40ef 100644
--- a/TAO/docs/rtcorba/issues.html
+++ b/TAO/docs/rtcorba/issues.html
@@ -225,7 +225,7 @@ the guidelines are followed, of course ;-) )</p>
 
 <i>
 
-<p>Last modified: $Date$ </i></p>
+</p>
 <p></p>
 </body>
 </html>
diff --git a/TAO/docs/rtcorba/omg_issues.html b/TAO/docs/rtcorba/omg_issues.html
index 33316e69210..381d0d2a840 100644
--- a/TAO/docs/rtcorba/omg_issues.html
+++ b/TAO/docs/rtcorba/omg_issues.html
@@ -25,7 +25,7 @@ Unnecessary <i>ClientProtocolPolicy</i> complexity</h3>
 in CORBA 2.4 cautions against defining policies that can be set
 in both places:&nbsp;
 <blockquote><br>
-  If the <b><font FACE="Arial" SIZE="2">Policy </font></b> can be 
+  If the <b><font FACE="Arial" SIZE="2">Policy </font></b> can be
 used with <b><font FACE="Arial" SIZE="2">POA </font></b>creation
 to tune <b><font FACE="Arial" SIZE="2">IOR </font></b>contents
 and can also be specified (overridden) in the client, specify how to reconcile the policy's
@@ -98,6 +98,6 @@ provide different semantics or be invalid when used in another ORB, with both
 ORBs being compliant with the specification.&nbsp;&nbsp;&nbsp; </p>
 
 <hr>
-<p><i>Last Modified: $Date$</i></p>
+</p>
 </body>
 </html>
diff --git a/TAO/docs/rtcorba/status.html b/TAO/docs/rtcorba/status.html
index 54be0cc28aa..6bb5549cbc7 100644
--- a/TAO/docs/rtcorba/status.html
+++ b/TAO/docs/rtcorba/status.html
@@ -126,6 +126,6 @@ for their implementation:
 <hr>
 <i>
 
-<p>Last modified: $Date$</i></p>
+</p>
 </body>
 </html>
-- 
cgit v1.2.1


From 6f8b356f4acd034ff8996f515a81b789abeef715 Mon Sep 17 00:00:00 2001
From: Johnny Willemsen <jwillemsen@remedy.nl>
Date: Wed, 4 Apr 2018 16:48:42 +0200
Subject: Only set no_deprecated to 1 when it not has been set

    * ACE/include/makeinclude/platform_g++_common.GNU:
---
 ACE/include/makeinclude/platform_g++_common.GNU | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/ACE/include/makeinclude/platform_g++_common.GNU b/ACE/include/makeinclude/platform_g++_common.GNU
index c465a3d6946..4a455c67996 100644
--- a/ACE/include/makeinclude/platform_g++_common.GNU
+++ b/ACE/include/makeinclude/platform_g++_common.GNU
@@ -55,27 +55,27 @@ endif
 ifeq ($(c++17),1)
   CCFLAGS += -std=c++17
   # This is needed due to the use of the deprecated auto_ptr class
-  no_deprecated = 1
+  no_deprecated ?= 1
 else
   ifeq ($(c++14),1)
     CCFLAGS += -std=c++14
     # This is needed due to the use of the deprecated auto_ptr class
-    no_deprecated = 1
+    no_deprecated ?= 1
   else
     ifeq ($(c++1y),1)
       CCFLAGS += -std=c++1y
       # This is needed due to the use of the deprecated auto_ptr class
-      no_deprecated = 1
+      no_deprecated ?= 1
     else
       ifeq ($(c++11),1)
         CCFLAGS += -std=c++11
         # This is needed due to the use of the deprecated auto_ptr class
-        no_deprecated = 1
+        no_deprecated ?= 1
       else
         ifeq ($(c++0x),1)
           CCFLAGS += -std=c++0x
           # This is needed due to the use of the deprecated auto_ptr class
-          no_deprecated = 1
+          no_deprecated ?= 1
         endif # c++0x
       endif # c++11
     endif # c++1y
-- 
cgit v1.2.1


From 95fff62248ae45054a36ffc3b569a34b86c6d151 Mon Sep 17 00:00:00 2001
From: Johnny Willemsen <jwillemsen@remedy.nl>
Date: Mon, 9 Apr 2018 08:15:19 +0100
Subject: Make use of builtin_bswap(16|32|64)

---
 ACE/ace/CDR_Base.inl           | 11 +++++++++++
 ACE/ace/config-win32-borland.h |  3 +++
 2 files changed, 14 insertions(+)

diff --git a/ACE/ace/CDR_Base.inl b/ACE/ace/CDR_Base.inl
index 24000ac669e..40b3500cfdd 100644
--- a/ACE/ace/CDR_Base.inl
+++ b/ACE/ace/CDR_Base.inl
@@ -66,6 +66,9 @@ ACE_CDR::swap_2 (const char *orig, char* target)
   // function.
   *reinterpret_cast<unsigned short *> (target) =
     _byteswap_ushort (*reinterpret_cast<unsigned short const *> (orig));
+#elif defined (ACE_HAS_BUILTIN_BSWAP16)
+  *reinterpret_cast<uint16_t *> (target) =
+    __builtin_bswap16 (*reinterpret_cast<uint16_t const *> (orig));
 #elif defined (ACE_HAS_BSWAP16)
   *reinterpret_cast<uint16_t *> (target) =
     bswap16 (*reinterpret_cast<uint16_t const *> (orig));
@@ -80,6 +83,8 @@ ACE_CDR::swap_2 (const char *orig, char* target)
 #elif defined (ACE_HAS_PENTIUM) \
        && (defined(_MSC_VER) || defined(__BORLANDC__)) \
        && !defined(ACE_LACKS_INLINE_ASSEMBLY)
+
+ ss
   __asm mov ebx, orig;
   __asm mov ecx, target;
   __asm mov ax, [ebx];
@@ -100,6 +105,9 @@ ACE_CDR::swap_4 (const char* orig, char* target)
   // function.
   *reinterpret_cast<unsigned long *> (target) =
     _byteswap_ulong (*reinterpret_cast<unsigned long const *> (orig));
+#elif defined (ACE_HAS_BUILTIN_BSWAP32)
+  *reinterpret_cast<uint32_t *> (target) =
+    __builtin_bswap32 (*reinterpret_cast<uint32_t const *> (orig));
 #elif defined (ACE_HAS_BSWAP32)
   *reinterpret_cast<uint32_t *> (target) =
     bswap32 (*reinterpret_cast<uint32_t const *> (orig));
@@ -135,6 +143,9 @@ ACE_CDR::swap_8 (const char* orig, char* target)
   // function.
   *reinterpret_cast<unsigned __int64 *> (target) =
     _byteswap_uint64 (*reinterpret_cast<unsigned __int64 const *> (orig));
+#elif defined (ACE_HAS_BUILTIN_BSWAP64)
+  *reinterpret_cast<uint64_t *> (target) =
+    __builtin_bswap64 (*reinterpret_cast<uint64_t const *> (orig));
 #elif defined (ACE_HAS_BSWAP64)
   *reinterpret_cast<uint64_t *> (target) =
     bswap64 (*reinterpret_cast<uint64_t const *> (orig));
diff --git a/ACE/ace/config-win32-borland.h b/ACE/ace/config-win32-borland.h
index 25333940e55..6a1f3dee4ae 100644
--- a/ACE/ace/config-win32-borland.h
+++ b/ACE/ace/config-win32-borland.h
@@ -186,6 +186,9 @@
 
 #ifdef __clang__
 # define ACE_ANY_OPS_USE_NAMESPACE
+# define ACE_HAS_BUILTIN_BSWAP16
+# define ACE_HAS_BUILTIN_BSWAP32
+# define ACE_HAS_BUILTIN_BSWAP64
 #endif /* __clang__ */
 
 
-- 
cgit v1.2.1


From e9839d1b9f1d42cd15aaabb04fe015eb25bee9e3 Mon Sep 17 00:00:00 2001
From: Johnny Willemsen <jwillemsen@remedy.nl>
Date: Mon, 9 Apr 2018 09:20:19 +0200
Subject: Test double/float as last, they are more complex so could easier fail

    * ACE/tests/CDR_Array_Test.cpp:
---
 ACE/tests/CDR_Array_Test.cpp | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/ACE/tests/CDR_Array_Test.cpp b/ACE/tests/CDR_Array_Test.cpp
index 2cb5467a68c..ed088cf2c29 100644
--- a/ACE/tests/CDR_Array_Test.cpp
+++ b/ACE/tests/CDR_Array_Test.cpp
@@ -968,14 +968,6 @@ run_main (int argc, ACE_TCHAR *argv[])
   int use_array;
   for (use_array = 0; use_array < 2; use_array++)
     {
-      {
-        CDR_Test<ACE_CDR::Double, DoubleHelper>
-          test (dtotal, niter, use_array);
-      }
-      {
-        CDR_Test<ACE_CDR::Float, FloatHelper>
-          test (ftotal, niter, use_array);
-      }
       {
         CDR_Test<ACE_CDR::LongLong, LongLongHelper>
           test (qtotal, niter, use_array);
@@ -992,6 +984,14 @@ run_main (int argc, ACE_TCHAR *argv[])
         CDR_Test<ACE_CDR::Char, CharHelper>
           test (ctotal, niter, use_array);
       }
+      {
+        CDR_Test<ACE_CDR::Double, DoubleHelper>
+          test (dtotal, niter, use_array);
+      }
+      {
+        CDR_Test<ACE_CDR::Float, FloatHelper>
+          test (ftotal, niter, use_array);
+      }
     }
 
   ACE_END_TEST;
-- 
cgit v1.2.1


From 85cc6bae8a7187b9b5a4c41264aea2f9d8620922 Mon Sep 17 00:00:00 2001
From: Johnny Willemsen <jwillemsen@remedy.nl>
Date: Mon, 9 Apr 2018 10:33:37 +0200
Subject: Removed accidental change

    * ACE/ace/CDR_Base.inl:
---
 ACE/ace/CDR_Base.inl | 2 --
 1 file changed, 2 deletions(-)

diff --git a/ACE/ace/CDR_Base.inl b/ACE/ace/CDR_Base.inl
index 40b3500cfdd..c31c3b78555 100644
--- a/ACE/ace/CDR_Base.inl
+++ b/ACE/ace/CDR_Base.inl
@@ -83,8 +83,6 @@ ACE_CDR::swap_2 (const char *orig, char* target)
 #elif defined (ACE_HAS_PENTIUM) \
        && (defined(_MSC_VER) || defined(__BORLANDC__)) \
        && !defined(ACE_LACKS_INLINE_ASSEMBLY)
-
- ss
   __asm mov ebx, orig;
   __asm mov ecx, target;
   __asm mov ax, [ebx];
-- 
cgit v1.2.1


From 17cb3ec57b3b9dd537fea4d156384623360d1ae8 Mon Sep 17 00:00:00 2001
From: Johnny Willemsen <jwillemsen@remedy.nl>
Date: Mon, 9 Apr 2018 18:30:56 +0200
Subject: Add some more error logic for the cases the create_profile fails

    * TAO/tao/Connector_Registry.cpp:
---
 TAO/tao/Connector_Registry.cpp | 37 +++++++++++++++++++++++++++++++------
 1 file changed, 31 insertions(+), 6 deletions(-)

diff --git a/TAO/tao/Connector_Registry.cpp b/TAO/tao/Connector_Registry.cpp
index 0f828f613b1..8d3d2eece02 100644
--- a/TAO/tao/Connector_Registry.cpp
+++ b/TAO/tao/Connector_Registry.cpp
@@ -165,8 +165,13 @@ TAO_Connector_Registry::create_profile (TAO_InputCDR &cdr)
   CORBA::ULong tag = 0;
 
   // If there is an error we abort.
-  if ((cdr >> tag) == 0)
+  if (!(cdr >> tag))
+  {
+    TAOLIB_ERROR ((LM_ERROR,
+                   ACE_TEXT ("TAO (%P|%t) - TAO_Connector_Registry::")
+                   ACE_TEXT ("create_profile: Unable to extract tag from CDR stream\n")));
     return 0;
+  }
 
   TAO_Connector *connector =
     this->get_connector (tag);
@@ -195,7 +200,6 @@ TAO_Connector_Registry::create_profile (TAO_InputCDR &cdr)
             }
         }
 
-
       TAO_Profile *pfile = 0;
       ACE_NEW_RETURN (pfile,
                       TAO_Unknown_Profile (tag,
@@ -203,6 +207,9 @@ TAO_Connector_Registry::create_profile (TAO_InputCDR &cdr)
                       0);
       if (pfile->decode (cdr) == -1)
         {
+          TAOLIB_ERROR ((LM_ERROR,
+                        ACE_TEXT ("TAO (%P|%t) - TAO_Connector_Registry::")
+                        ACE_TEXT ("create_profile: Unable to decode unknown profile from CDR stream\n")));
           pfile->_decr_refcnt ();
           pfile = 0;
         }
@@ -217,18 +224,36 @@ TAO_Connector_Registry::create_profile (TAO_InputCDR &cdr)
   // ProfileData is encoded as a sequence of octet. So first get the
   // length of the sequence.
   CORBA::ULong encap_len = 0;
-  if ((cdr >> encap_len) == 0)
+  if (!(cdr >> encap_len))
+  {
+    TAOLIB_ERROR ((LM_ERROR,
+                   ACE_TEXT ("TAO (%P|%t) - TAO_Connector_Registry::")
+                   ACE_TEXT ("create_profile: Unable to extract encapsulated length from CDR stream\n")));
     return 0;
+  }
 
   // Create the decoding stream from the encapsulation in the buffer,
   // and skip the encapsulation.
   TAO_InputCDR str (cdr, encap_len);
 
-  if (str.good_bit () == 0
-      || cdr.skip_bytes (encap_len) == 0)
+  if (!str.good_bit () || !cdr.skip_bytes (encap_len))
+  {
+    TAOLIB_ERROR ((LM_ERROR,
+                   ACE_TEXT ("TAO (%P|%t) - TAO_Connector_Registry::")
+                   ACE_TEXT ("create_profile: Unable to skip encapsulated stream from CDR stream\n")));
     return 0;
+  }
+
+  TAO_Profile* profile = connector->create_profile (str);
+
+  if (!profile)
+  {
+    TAOLIB_ERROR ((LM_ERROR,
+                   ACE_TEXT ("TAO (%P|%t) - TAO_Connector_Registry::")
+                   ACE_TEXT ("create_profile: Connector returned null profile for tag 0x%x\n"), tag));
+  }
 
-  return connector->create_profile (str);
+  return profile;
 }
 
 char
-- 
cgit v1.2.1


From 3653b7c9b62e2e8c9fc49e98d3b82bccd3424a58 Mon Sep 17 00:00:00 2001
From: Johnny Willemsen <jwillemsen@remedy.nl>
Date: Tue, 10 Apr 2018 08:28:07 +0200
Subject: Enable intel assembly when using the Embarcadero clang compilers

    * ACE/ace/CDR_Base.cpp:
    * ACE/ace/config-win32-borland.h:
---
 ACE/ace/CDR_Base.cpp           | 4 ++--
 ACE/ace/config-win32-borland.h | 3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/ACE/ace/CDR_Base.cpp b/ACE/ace/CDR_Base.cpp
index d66a0625eba..56b65f08080 100644
--- a/ACE/ace/CDR_Base.cpp
+++ b/ACE/ace/CDR_Base.cpp
@@ -52,7 +52,7 @@ ACE_CDR::swap_2_array (char const * orig, char* target, size_t n)
     }
 #else
   char const * const o4 = ACE_ptr_align_binary (orig, 4);
-  // this is an _if_, not a _while_. The mistmatch can only be by 2.
+  // this is an _if_, not a _while_. The mismatch can only be by 2.
   if (orig != o4)
     {
       ACE_CDR::swap_2 (orig, target);
@@ -74,7 +74,7 @@ ACE_CDR::swap_2_array (char const * orig, char* target, size_t n)
   // end marks our barrier for not falling outside.
   char const * const end = orig + 2 * (n & (~3));
 
-  // See if we're aligned for writting in 64 or 32 bit chunks...
+  // See if we're aligned for writing in 64 or 32 bit chunks...
 #if ACE_SIZEOF_LONG == 8 && \
     !((defined(__amd64__) || defined (__x86_64__)) && defined(__GNUG__))
   if (target == ACE_ptr_align_binary (target, 8))
diff --git a/ACE/ace/config-win32-borland.h b/ACE/ace/config-win32-borland.h
index 6a1f3dee4ae..82db2a622ac 100644
--- a/ACE/ace/config-win32-borland.h
+++ b/ACE/ace/config-win32-borland.h
@@ -189,6 +189,9 @@
 # define ACE_HAS_BUILTIN_BSWAP16
 # define ACE_HAS_BUILTIN_BSWAP32
 # define ACE_HAS_BUILTIN_BSWAP64
+# if (defined (ACE_HAS_PENTIUM) || defined (__amd64__) || defined (__x86_64__))
+#  define ACE_HAS_INTEL_ASSEMBLY
+# endif
 #endif /* __clang__ */
 
 
-- 
cgit v1.2.1


From 3ead9df51912321ed0040cf193127eb254adbdf5 Mon Sep 17 00:00:00 2001
From: Johnny Willemsen <jwillemsen@remedy.nl>
Date: Tue, 10 Apr 2018 08:32:23 +0200
Subject: Don't use inline assembly with clang compilers

    * ACE/ace/config-win32-borland.h:
---
 ACE/ace/config-win32-borland.h | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/ACE/ace/config-win32-borland.h b/ACE/ace/config-win32-borland.h
index 82db2a622ac..ceb7782156c 100644
--- a/ACE/ace/config-win32-borland.h
+++ b/ACE/ace/config-win32-borland.h
@@ -189,9 +189,7 @@
 # define ACE_HAS_BUILTIN_BSWAP16
 # define ACE_HAS_BUILTIN_BSWAP32
 # define ACE_HAS_BUILTIN_BSWAP64
-# if (defined (ACE_HAS_PENTIUM) || defined (__amd64__) || defined (__x86_64__))
-#  define ACE_HAS_INTEL_ASSEMBLY
-# endif
+# define ACE_LACKS_INLINE_ASSEMBLY
 #endif /* __clang__ */
 
 
-- 
cgit v1.2.1


From 2855e7d3bebfcab8a443d923224e6412968f02ad Mon Sep 17 00:00:00 2001
From: Johnny Willemsen <jwillemsen@remedy.nl>
Date: Tue, 10 Apr 2018 09:54:43 +0200
Subject: Combine two logging lines into one

    * TAO/tao/Object.cpp:
---
 TAO/tao/Object.cpp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/TAO/tao/Object.cpp b/TAO/tao/Object.cpp
index 3e73ac25c1c..78a7cd0d77c 100644
--- a/TAO/tao/Object.cpp
+++ b/TAO/tao/Object.cpp
@@ -929,9 +929,8 @@ operator>> (TAO_InputCDR& cdr, CORBA::Object*& x)
               //    profile from the IOR.
               TAOLIB_ERROR_RETURN ((LM_ERROR,
                                  ACE_TEXT ("TAO (%P|%t) - ERROR: Could not create all ")
-                                 ACE_TEXT ("profiles while extracting object [%d, %d]\n")
-                                 ACE_TEXT ("TAO (%P|%t) - ERROR: reference from the ")
-                                 ACE_TEXT ("CDR stream.\n"),
+                                 ACE_TEXT ("profiles while extracting object [%d, %d] ")
+                                 ACE_TEXT ("reference from the CDR stream.\n"),
                                  mp.profile_count (), profile_count),
                                 false);
             }
-- 
cgit v1.2.1