25 files changed, 330 insertions, 89 deletions
diff --git a/ACE/ace/Based_Pointer_Repository.cpp b/ACE/ace/Based_Pointer_Repository.cpp
index 6ec16f555ca..1f318131a56 100644
--- a/ACE/ace/Based_Pointer_Repository.cpp
+++ b/ACE/ace/Based_Pointer_Repository.cpp
@@ -24,9 +24,9 @@ class ACE_Based_Pointer_Repository_Rep
 {
 public:
   // Useful typedefs.
-  typedef ACE_Map_Manager <void *, size_t, ACE_Null_Mutex> MAP_MANAGER;
-  typedef ACE_Map_Iterator <void *, size_t, ACE_Null_Mutex> MAP_ITERATOR;
-  typedef ACE_Map_Entry <void *, size_t> MAP_ENTRY;
+  using MAP_MANAGER = ACE_Map_Manager<void *, size_t, ACE_Null_Mutex>;
+  using MAP_ITERATOR = ACE_Map_Iterator<void *, size_t, ACE_Null_Mutex>;
+  using MAP_ENTRY = ACE_Map_Entry<void *, size_t>;
 
   /// Keeps track of the mapping between addresses and their associated
   /// values.
diff --git a/ACE/ace/CDR_Base.cpp b/ACE/ace/CDR_Base.cpp
index b87380ee507..05312ecfd61 100644
--- a/ACE/ace/CDR_Base.cpp
+++ b/ACE/ace/CDR_Base.cpp
@@ -819,7 +819,7 @@ ACE_CDR::Fixed ACE_CDR::Fixed::from_floating (LongDouble val)
 #elif defined NONNATIVE_LONGDOUBLE
   typedef LongDouble::NativeImpl BigFloat;
 #else
-  typedef LongDouble BigFloat;
+  using BigFloat = LongDouble;
 #endif
 
   Fixed f;
diff --git a/ACE/ace/DLL_Manager.cpp b/ACE/ace/DLL_Manager.cpp
index 39aa918d2fb..311a6768bf5 100644
--- a/ACE/ace/DLL_Manager.cpp
+++ b/ACE/ace/DLL_Manager.cpp
@@ -754,7 +754,7 @@ ACE_DLL_Manager::unload_dll (ACE_DLL_Handle *dll_handle, int force_unload)
           else
             {
               // Declare the type of the symbol:
-              typedef int (*dll_unload_policy)(void);
+              using dll_unload_policy = int (*)();
 
               void * const unload_policy_ptr =
                 dll_handle->symbol (ACE_TEXT ("_get_dll_unload_policy"), 1);
diff --git a/ACE/ace/Dev_Poll_Reactor.cpp b/ACE/ace/Dev_Poll_Reactor.cpp
index 55cb4d4d5a3..0fbd01f8efc 100644
--- a/ACE/ace/Dev_Poll_Reactor.cpp
+++ b/ACE/ace/Dev_Poll_Reactor.cpp
@@ -1081,7 +1081,7 @@ ACE_Dev_Poll_Reactor::dispatch (Token_Guard &guard)
 int
 ACE_Dev_Poll_Reactor::dispatch_timer_handler (Token_Guard &guard)
 {
-  typedef ACE_Member_Function_Command<Token_Guard> Guard_Release;
+  using Guard_Release = ACE_Member_Function_Command<Token_Guard>;
 
   Guard_Release release(guard, &Token_Guard::release_token);
   return this->timer_queue_->expire_single(release);
diff --git a/ACE/ace/Log_Msg.cpp b/ACE/ace/Log_Msg.cpp
index dbf09f5d3da..ec402e65730 100644
--- a/ACE/ace/Log_Msg.cpp
+++ b/ACE/ace/Log_Msg.cpp
@@ -999,7 +999,7 @@ ACE_Log_Msg::log (const ACE_TCHAR *format_str,
 #else
   // External decls.
 
-  typedef void (*PointerToFunction)(...);
+  using PointerToFunction = void (*)(...);
 
   // Check if there were any conditional values set.
   bool const conditional_values = this->conditional_values_.is_set_;
diff --git a/ACE/ace/Naming_Context.cpp b/ACE/ace/Naming_Context.cpp
index 52f70b31d1c..2cbd95003f3 100644
--- a/ACE/ace/Naming_Context.cpp
+++ b/ACE/ace/Naming_Context.cpp
@@ -23,8 +23,8 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 // Make life easier later on...
 
-typedef ACE_Local_Name_Space <ACE_MMAP_MEMORY_POOL, ACE_RW_Process_Mutex> LOCAL_NAME_SPACE;
-typedef ACE_Local_Name_Space <ACE_LITE_MMAP_MEMORY_POOL, ACE_RW_Process_Mutex> LITE_LOCAL_NAME_SPACE;
+using LOCAL_NAME_SPACE = ACE_Local_Name_Space<ACE_MMAP_Memory_Pool, ACE_RW_Process_Mutex>;
+using LITE_LOCAL_NAME_SPACE = ACE_Local_Name_Space<ACE_Lite_MMAP_Memory_Pool, ACE_RW_Process_Mutex>;
 
 // The ACE_Naming_Context static service object is now defined
 // by the ACE_Object_Manager, in Object_Manager.cpp.
diff --git a/ACE/ace/Object_Manager.cpp b/ACE/ace/Object_Manager.cpp
index 40ab1983f49..77426f599b2 100644
--- a/ACE/ace/Object_Manager.cpp
+++ b/ACE/ace/Object_Manager.cpp
@@ -896,7 +896,7 @@ static ACE_Object_Manager_Manager ACE_Object_Manager_Manager_instance;
 
 // This is global so that it doesn't have to be declared in the header
 // file.  That would cause nasty circular include problems.
-typedef ACE_Cleanup_Adapter<ACE_Recursive_Thread_Mutex> ACE_Static_Object_Lock_Type;
+using ACE_Static_Object_Lock_Type = ACE_Cleanup_Adapter<ACE_Recursive_Thread_Mutex>;
 static ACE_Static_Object_Lock_Type *ACE_Static_Object_Lock_lock = 0;
 
 // ACE_SHOULD_MALLOC_STATIC_OBJECT_LOCK isn't (currently) used by ACE.
diff --git a/ACE/ace/POSIX_Asynch_IO.cpp b/ACE/ace/POSIX_Asynch_IO.cpp
index 2b29515b934..c66c2c19083 100644
--- a/ACE/ace/POSIX_Asynch_IO.cpp
+++ b/ACE/ace/POSIX_Asynch_IO.cpp
@@ -1734,7 +1734,7 @@ public:
                                      ACE_POSIX_Asynch_Transmit_File_Result *result);
 
   /// Destructor.
-  virtual ~ACE_POSIX_Asynch_Transmit_Handler (void);
+  ~ACE_POSIX_Asynch_Transmit_Handler (void) override;
 
   /// Do the transmission. All the info to do the transmission is in
   /// the <result> member.
@@ -1775,10 +1775,10 @@ protected:
   size_t bytes_transferred_;
 
   /// This is called when asynchronous writes from the socket complete.
-  virtual void handle_write_stream (const ACE_Asynch_Write_Stream::Result &result);
+  void handle_write_stream (const ACE_Asynch_Write_Stream::Result &result) override;
 
   /// This is called when asynchronous reads from the file complete.
-  virtual void handle_read_file (const ACE_Asynch_Read_File::Result &result);
+  void handle_read_file (const ACE_Asynch_Read_File::Result &result) override;
 
   /// Issue asynch read from  the file.
   int initiate_read_file (void);
diff --git a/ACE/ace/POSIX_Proactor.cpp b/ACE/ace/POSIX_Proactor.cpp
index e3414396b3a..0056d43a2cd 100644
--- a/ACE/ace/POSIX_Proactor.cpp
+++ b/ACE/ace/POSIX_Proactor.cpp
@@ -45,14 +45,14 @@ public:
                                int signal_number = ACE_SIGRTMIN);
 
   /// Destructor.
-  virtual ~ACE_POSIX_Wakeup_Completion (void);
+  ~ACE_POSIX_Wakeup_Completion (void) override;
 
 
   /// This method calls the <handler>'s <handle_wakeup> method.
-  virtual void complete (size_t bytes_transferred = 0,
+  void complete (size_t bytes_transferred = 0,
                          int success = 1,
                          const void *completion_key = 0,
-                         u_long error = 0);
+                         u_long error = 0) override;
 };
 
 // *********************************************************************
@@ -595,14 +595,14 @@ public:
   ACE_AIOCB_Notify_Pipe_Manager (ACE_POSIX_AIOCB_Proactor *posix_aiocb_proactor);
 
   /// Destructor.
-  virtual ~ACE_AIOCB_Notify_Pipe_Manager (void);
+  ~ACE_AIOCB_Notify_Pipe_Manager (void) override;
 
   /// Send the result pointer through the notification pipe.
   int notify ();
 
   /// This is the call back method when <Asynch_Read> from the pipe is
   /// complete.
-  virtual void handle_read_stream (const ACE_Asynch_Read_Stream::Result &result);
+  void handle_read_stream (const ACE_Asynch_Read_Stream::Result &result) override;
 
 private:
   /// The implementation proactor class.
diff --git a/ACE/ace/Parse_Node.cpp b/ACE/ace/Parse_Node.cpp
index c362f07637a..9427476454d 100644
--- a/ACE/ace/Parse_Node.cpp
+++ b/ACE/ace/Parse_Node.cpp
@@ -51,7 +51,7 @@ ACE_Stream_Node::apply (ACE_Service_Gestalt *config, int &yyerrno)
   typedef std::list<const ACE_Static_Node *,
                     ACE_Allocator_Std_Adapter<const ACE_Static_Node *> > list_t;
 #else
-  typedef std::list<const ACE_Static_Node *> list_t;
+  using list_t = std::list<const ACE_Static_Node *>;
 #endif /* ACE_HAS_ALLOC_HOOKS */
   list_t mod_list;
   const ACE_Static_Node *module;
@@ -668,8 +668,7 @@ ACE_Function_Node::symbol (ACE_Service_Gestalt *,
                            int &yyerrno,
                            ACE_Service_Object_Exterminator *gobbler)
 {
-  typedef ACE_Service_Object *(*ACE_Service_Factory_Ptr)
-    (ACE_Service_Object_Exterminator *);
+  using ACE_Service_Factory_Ptr = ACE_Service_Object *(*)(ACE_Service_Object_Exterminator *);
 
   ACE_TRACE ("ACE_Function_Node::symbol");
   if (this->open_dll (yyerrno) == 0)
diff --git a/ACE/ace/Priority_Reactor.cpp b/ACE/ace/Priority_Reactor.cpp
index dbb29c3cbe2..dab59c20819 100644
--- a/ACE/ace/Priority_Reactor.cpp
+++ b/ACE/ace/Priority_Reactor.cpp
@@ -5,10 +5,10 @@
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
-typedef ACE_Unbounded_Queue_Iterator<ACE_Event_Tuple> QUEUE_ITERATOR;
+using QUEUE_ITERATOR = ACE_Unbounded_Queue_Iterator<ACE_Event_Tuple>;
 // Its iterator.
 
-typedef ACE_Cached_Allocator<ACE_Node<ACE_Event_Tuple>, ACE_SYNCH_NULL_MUTEX> TUPLE_ALLOCATOR;
+using TUPLE_ALLOCATOR = ACE_Cached_Allocator<ACE_Node<ACE_Event_Tuple>, ACE_MT_SYNCH::NULL_MUTEX>;
 // Defines the memory allocator used, no need for locking because it
 // is only used in one thread of control.
 
diff --git a/ACE/ace/Proactor.cpp b/ACE/ace/Proactor.cpp
index 4b5033a3bf3..4f58d7f3bf9 100644
--- a/ACE/ace/Proactor.cpp
+++ b/ACE/ace/Proactor.cpp
@@ -61,7 +61,7 @@ public:
   explicit ACE_Proactor_Timer_Handler (ACE_Proactor &proactor);
 
   /// Destructor.
-  virtual ~ACE_Proactor_Timer_Handler (void);
+  ~ACE_Proactor_Timer_Handler (void) override;
 
   /// Proactor calls this to shut down the timer handler
   /// gracefully. Just calling the destructor alone doesnt do what
@@ -77,7 +77,7 @@ protected:
   /// Run by a daemon thread to handle deferred processing. In other
   /// words, this method will do the waiting on the earliest timer and
   /// event.
-  virtual int svc (void);
+  int svc (void) override;
 
   /// Event to wait on.
   ACE_Auto_Event timer_event_;
@@ -790,7 +790,7 @@ ACE_Proactor::timer_queue (ACE_Proactor_Timer_Queue *tq)
     }
 
   // Set the proactor in the timer queue's functor
-  typedef ACE_Timer_Queue_Upcall_Base<ACE_Handler*,ACE_Proactor_Handle_Timeout_Upcall> TQ_Base;
+  using TQ_Base = ACE_Timer_Queue_Upcall_Base<ACE_Handler *, ACE_Proactor_Handle_Timeout_Upcall>;
 
   TQ_Base * tqb = dynamic_cast<TQ_Base*> (this->timer_queue_);
 
diff --git a/ACE/ace/Service_Config.cpp b/ACE/ace/Service_Config.cpp
index 193e54ab823..cce7acc6693 100644
--- a/ACE/ace/Service_Config.cpp
+++ b/ACE/ace/Service_Config.cpp
@@ -98,8 +98,7 @@ ACE_Threading_Helper<ACE_Null_Mutex>::get (void)
   * know that upon process exit the SC will still be automaticaly and explicitly
   * closed by @c ACE_Object_Manager::fini().
   */
-typedef ACE_Unmanaged_Singleton<ACE_Service_Config,
-                                ACE_SYNCH_RECURSIVE_MUTEX> ACE_SERVICE_CONFIG_SINGLETON;
+using ACE_SERVICE_CONFIG_SINGLETON = ACE_Unmanaged_Singleton<ACE_Service_Config, ACE_MT_SYNCH::RECURSIVE_MUTEX>;
 
 
 /// ctor
diff --git a/ACE/ace/Service_Types.cpp b/ACE/ace/Service_Types.cpp
index b44fb43f116..0843aa04130 100644
--- a/ACE/ace/Service_Types.cpp
+++ b/ACE/ace/Service_Types.cpp
@@ -11,9 +11,9 @@
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
-typedef ACE_Stream<ACE_SYNCH> MT_Stream;
-typedef ACE_Module<ACE_SYNCH> MT_Module;
-typedef ACE_Task<ACE_SYNCH> MT_Task;
+using MT_Stream = ACE_Stream<ACE_MT_SYNCH>;
+using MT_Module = ACE_Module<ACE_MT_SYNCH>;
+using MT_Task = ACE_Task<ACE_MT_SYNCH>;
 
 ACE_ALLOC_HOOK_DEFINE(ACE_Service_Type_Impl)
 
diff --git a/ACE/ace/Sig_Handler.cpp b/ACE/ace/Sig_Handler.cpp
index e91de0b4fb4..efbc170474e 100644
--- a/ACE/ace/Sig_Handler.cpp
+++ b/ACE/ace/Sig_Handler.cpp
@@ -289,8 +289,8 @@ int ACE_Sig_Handlers::sigkey_ = 0;
 bool ACE_Sig_Handlers::third_party_sig_handler_ = false;
 
 // Make life easier by defining typedefs...
-typedef ACE_Fixed_Set <ACE_Event_Handler *, ACE_MAX_SIGNAL_HANDLERS> ACE_SIG_HANDLERS_SET;
-typedef ACE_Fixed_Set_Iterator <ACE_Event_Handler *, ACE_MAX_SIGNAL_HANDLERS> ACE_SIG_HANDLERS_ITERATOR;
+using ACE_SIG_HANDLERS_SET = ACE_Fixed_Set<ACE_Event_Handler *, ((size_t)20)>;
+using ACE_SIG_HANDLERS_ITERATOR = ACE_Fixed_Set_Iterator<ACE_Event_Handler *, ((size_t)20)>;
 
 class ACE_Sig_Handlers_Set
 {
diff --git a/ACE/ace/Svc_Conf_y.cpp b/ACE/ace/Svc_Conf_y.cpp
index 333682808d5..5e1265369d6 100644
--- a/ACE/ace/Svc_Conf_y.cpp
+++ b/ACE/ace/Svc_Conf_y.cpp
@@ -189,14 +189,14 @@ typedef int YYSTYPE;
 #ifdef YYTYPE_UINT8
 typedef YYTYPE_UINT8 ace_yytype_uint8;
 #else
-typedef unsigned char ace_yytype_uint8;
+using ace_yytype_uint8 = unsigned char;
 #endif
 
 #ifdef YYTYPE_INT8
 typedef YYTYPE_INT8 ace_yytype_int8;
 #elif (defined __STDC__ || defined __C99__FUNC__ \
      || defined __cplusplus || defined _MSC_VER)
-typedef signed char ace_yytype_int8;
+using ace_yytype_int8 = signed char;
 #else
 typedef short int ace_yytype_int8;
 #endif
@@ -204,13 +204,13 @@ typedef short int ace_yytype_int8;
 #ifdef YYTYPE_UINT16
 typedef YYTYPE_UINT16 ace_yytype_uint16;
 #else
-typedef unsigned short int ace_yytype_uint16;
+using ace_yytype_uint16 = unsigned short;
 #endif
 
 #ifdef YYTYPE_INT16
 typedef YYTYPE_INT16 ace_yytype_int16;
 #else
-typedef short int ace_yytype_int16;
+using ace_yytype_int16 = short;
 #endif
 
 #ifndef YYSIZE_T
diff --git a/ACE/ace/TP_Reactor.cpp b/ACE/ace/TP_Reactor.cpp
index f1bb31bf92f..297fea48a18 100644
--- a/ACE/ace/TP_Reactor.cpp
+++ b/ACE/ace/TP_Reactor.cpp
@@ -305,7 +305,7 @@ int
 ACE_TP_Reactor::handle_timer_events (int & /*event_count*/,
                                      ACE_TP_Token_Guard &guard)
 {
-  typedef ACE_Member_Function_Command<ACE_TP_Token_Guard> Guard_Release;
+  using Guard_Release = ACE_Member_Function_Command<ACE_TP_Token_Guard>;
 
   Guard_Release release(guard, &ACE_TP_Token_Guard::release_token);
   return this->timer_queue_->expire_single(release);
diff --git a/ACE/ace/Thread_Manager.cpp b/ACE/ace/Thread_Manager.cpp
index e43f5978bcd..43b884d0459 100644
--- a/ACE/ace/Thread_Manager.cpp
+++ b/ACE/ace/Thread_Manager.cpp
@@ -1503,7 +1503,7 @@ ACE_Thread_Manager::join (ACE_thread_t tid, ACE_THR_FUNC_RETURN *status)
       }
 #endif /* !ACE_HAS_VXTHREADS */
 
-    typedef ACE_Double_Linked_List_Iterator<ACE_Thread_Descriptor> iter_t;
+    using iter_t = ACE_Double_Linked_List_Iterator<ACE_Thread_Descriptor>;
     for (iter_t iter (this->thr_list_); !iter.done (); iter.advance ())
       {
         // If threads are created as THR_DETACHED or THR_DAEMON, we
@@ -1578,7 +1578,7 @@ ACE_Thread_Manager::wait_grp (int grp_id)
                     -1);
 #endif /* !ACE_HAS_VXTHREADS */
 
-    typedef ACE_Double_Linked_List_Iterator<ACE_Thread_Descriptor> iter_t;
+    using iter_t = ACE_Double_Linked_List_Iterator<ACE_Thread_Descriptor>;
     for (iter_t iter (this->thr_list_); !iter.done (); iter.advance ())
       {
         // If threads are created as THR_DETACHED or THR_DAEMON, we
@@ -1868,7 +1868,7 @@ ACE_Thread_Manager::wait_task (ACE_Task_Base *task)
                     -1);
 #endif /* !ACE_HAS_VXTHREADS */
 
-    typedef ACE_Double_Linked_List_Iterator<ACE_Thread_Descriptor> iter_t;
+    using iter_t = ACE_Double_Linked_List_Iterator<ACE_Thread_Descriptor>;
     for (iter_t iter (this->thr_list_); !iter.done (); iter.advance ())
       {
         // If threads are created as THR_DETACHED or THR_DAEMON, we
diff --git a/ACE/ace/Time_Policy.cpp b/ACE/ace/Time_Policy.cpp
index 4d2e6880b9d..98be1d5b52a 100644
--- a/ACE/ace/Time_Policy.cpp
+++ b/ACE/ace/Time_Policy.cpp
@@ -14,7 +14,7 @@ ACE_Dynamic_Time_Policy_Base::~ACE_Dynamic_Time_Policy_Base ()
 class NULL_Time_Policy : public ACE_Dynamic_Time_Policy_Base
 {
 protected:
-  virtual ACE_Time_Value_T<ACE_Delegating_Time_Policy> gettimeofday () const;
+  ACE_Time_Value_T<ACE_Delegating_Time_Policy> gettimeofday () const override;
 };
 
 ACE_Time_Value_T<ACE_Delegating_Time_Policy> NULL_Time_Policy::gettimeofday () const
diff --git a/ACE/ace/Time_Value.cpp b/ACE/ace/Time_Value.cpp
index 3ed61ccc4fc..19dfcff8c72 100644
--- a/ACE/ace/Time_Value.cpp
+++ b/ACE/ace/Time_Value.cpp
@@ -232,9 +232,7 @@ ACE_Time_Value::operator *= (double d)
   // Since this is a costly operation, we try to detect as soon as
   // possible if we are having a saturation in order to abort the rest
   // of the computation.
-  typedef ACE::If_Then_Else<(sizeof (double) > sizeof (time_t)),
-    double,
-    long double>::result_type float_type;
+  using float_type = ACE::If_Then_Else<(sizeof(double) > sizeof(time_t)), double, long double>::result_type;
 
   float_type sec_total = static_cast<float_type> (this->sec());
   sec_total *= d;
diff --git a/ACE/debian/changelog b/ACE/debian/changelog
index c732a5fcbf7..062f21edefb 100644
--- a/ACE/debian/changelog
+++ b/ACE/debian/changelog
@@ -1,3 +1,40 @@
+ace (6.5.12+dfsg-3) unstable; urgency=medium
+
+  * Team upload.
+  * Mark build dependency on libfltk1.3-dev. (Closes: #974633)
+
+ -- Sudip Mukherjee <sudipm.mukherjee@gmail.com>  Sat, 05 Dec 2020 20:27:14 +0000
+
+ace (6.5.12+dfsg-2) unstable; urgency=medium
+
+  * Team upload.
+  * Upload to unstable.
+
+ -- Sudip Mukherjee <sudipm.mukherjee@gmail.com>  Sat, 07 Nov 2020 09:28:59 +0000
+
+ace (6.5.12+dfsg-1) experimental; urgency=medium
+
+  * Team upload.
+  * Update to upstream v6.5.12
+    - Sync debian/* with upstream.
+    - Revert upstream shebang portability changes.
+
+ -- Sudip Mukherjee <sudipm.mukherjee@gmail.com>  Fri, 30 Oct 2020 22:35:54 +0000
+
+ace (6.5.10+dfsg-3) unstable; urgency=medium
+
+  * Team upload.
+  * Fix build on hurd-i386.
+
+ -- Sudip Mukherjee <sudipm.mukherjee@gmail.com>  Mon, 26 Oct 2020 21:45:06 +0000
+
+ace (6.5.10+dfsg-2) unstable; urgency=medium
+
+  * Team upload.
+  * Upload to unstable.
+
+ -- Sudip Mukherjee <sudipm.mukherjee@gmail.com>  Sat, 01 Aug 2020 16:19:16 +0100
+
 ace (6.5.10+dfsg-1) experimental; urgency=medium
 
   * Team upload.
diff --git a/ACE/debian/control b/ACE/debian/control
index c1645f8eec1..72c822b5c75 100644
--- a/ACE/debian/control
+++ b/ACE/debian/control
@@ -3,7 +3,7 @@ Section: devel
 Priority: optional
 Maintainer: Debian ACE maintainers <team+ace@tracker.debian.org>
 Uploaders: Thomas Girard <thomas.g.girard@free.fr>, Johnny Willemsen <jwillemsen@remedy.nl>
-Build-Depends: debhelper-compat (=12), 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: debhelper-compat (=12), libssl-dev, libxt-dev (>= 4.3.0), libfltk1.3-dev, tk-dev (>= 8.5), libfox-1.6-dev, docbook-to-man, libxerces-c-dev
 Build-Depends-Indep: doxygen, graphviz
 Standards-Version: 4.5.0
 Vcs-Git: https://salsa.debian.org/debian/ace.git
@@ -304,7 +304,7 @@ Description: ACE-GUI reactor integration for FLTK
 Package: libace-flreactor-dev
 Architecture: any
 Section: libdevel
-Depends: libace-flreactor-6.5.12 (= ${binary:Version}), libace-dev (= ${binary:Version}), libfltk1.1-dev (>= 1.1.4), ${misc:Depends}
+Depends: libace-flreactor-6.5.12 (= ${binary:Version}), libace-dev (= ${binary:Version}), libfltk1.3-dev, ${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.
diff --git a/ACE/debian/patches/0001-Revert-Perl-shebang-portability-changes.patch b/ACE/debian/patches/0001-Revert-Perl-shebang-portability-changes.patch
new file mode 100644
index 00000000000..67a90358729
--- /dev/null
+++ b/ACE/debian/patches/0001-Revert-Perl-shebang-portability-changes.patch
@@ -0,0 +1,236 @@
+From a5c0e7bab44a19590d58d523eacccd3690373820 Mon Sep 17 00:00:00 2001
+From: Sudip Mukherjee <sudipm.mukherjee@gmail.com>
+Date: Fri, 30 Oct 2020 22:08:37 +0000
+Subject: [PATCH] Revert "Perl shebang portability changes"
+
+This reverts commit 7d1e5116b673b3655837e0ce549e7781702d309c.
+
+Ref: https://www.debian.org/doc/debian-policy/ch-files.html#scripts
+
+Signed-off-by: Sudip Mukherjee <sudipm.mukherjee@gmail.com>
+---
+ bin/PerlACE/ConfigList.pm         | 2 +-
+ bin/PerlACE/MSProject.pm          | 2 +-
+ bin/PerlACE/Process.pm            | 2 +-
+ bin/PerlACE/ProcessAndroid.pm     | 2 +-
+ bin/PerlACE/ProcessLVRT.pm        | 2 +-
+ bin/PerlACE/ProcessVX.pm          | 2 +-
+ bin/PerlACE/ProcessVX_Unix.pm     | 2 +-
+ bin/PerlACE/ProcessVX_Win32.pm    | 2 +-
+ bin/PerlACE/ProcessWinCE.pm       | 2 +-
+ bin/PerlACE/ProcessWinCE_Unix.pm  | 2 +-
+ bin/PerlACE/Process_Unix.pm       | 2 +-
+ bin/PerlACE/Process_VMS.pm        | 2 +-
+ bin/PerlACE/Process_Win32.pm      | 2 +-
+ bin/PerlACE/Run_Test.pm           | 2 +-
+ bin/PerlACE/TestTarget.pm         | 2 +-
+ bin/PerlACE/TestTarget_Android.pm | 2 +-
+ bin/PerlACE/TestTarget_LVRT.pm    | 2 +-
+ bin/PerlACE/TestTarget_VxWorks.pm | 2 +-
+ bin/PerlACE/TestTarget_WinCE.pm   | 2 +-
+ bin/Uniqueid.pm                   | 2 +-
+ 20 files changed, 20 insertions(+), 20 deletions(-)
+
+diff --git a/bin/PerlACE/ConfigList.pm b/bin/PerlACE/ConfigList.pm
+index dad60082d39..612c94cb4c2 100644
+--- a/bin/PerlACE/ConfigList.pm
++++ b/bin/PerlACE/ConfigList.pm
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env perl
++#! /usr/bin/perl
+ 
+ package PerlACE::ConfigList;
+ use strict;
+diff --git a/bin/PerlACE/MSProject.pm b/bin/PerlACE/MSProject.pm
+index 1797a609e81..4c650069c98 100644
+--- a/bin/PerlACE/MSProject.pm
++++ b/bin/PerlACE/MSProject.pm
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env perl
++#! /usr/bin/perl
+ 
+ package PerlACE::MSProject;
+ 
+diff --git a/bin/PerlACE/Process.pm b/bin/PerlACE/Process.pm
+index 854ad19039d..4bccbe7daa8 100644
+--- a/bin/PerlACE/Process.pm
++++ b/bin/PerlACE/Process.pm
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env perl
++#! /usr/bin/perl
+ 
+ package PerlACE::Process;
+ 
+diff --git a/bin/PerlACE/ProcessAndroid.pm b/bin/PerlACE/ProcessAndroid.pm
+index d13491d6ed6..a00864a5804 100644
+--- a/bin/PerlACE/ProcessAndroid.pm
++++ b/bin/PerlACE/ProcessAndroid.pm
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env perl
++#! /usr/bin/perl
+ 
+ package PerlACE::ProcessAndroid;
+ 
+diff --git a/bin/PerlACE/ProcessLVRT.pm b/bin/PerlACE/ProcessLVRT.pm
+index dec06b8b2e6..f5ee2de444a 100644
+--- a/bin/PerlACE/ProcessLVRT.pm
++++ b/bin/PerlACE/ProcessLVRT.pm
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env perl
++#! /usr/bin/perl
+ #
+ # ProcessLVRT - how to run ACE+TAO tests on a LabVIEW RT target.
+ # Tests on LabVIEW RT are not executables - LabVIEW RT can't start plain
+diff --git a/bin/PerlACE/ProcessVX.pm b/bin/PerlACE/ProcessVX.pm
+index 3bbbef245a4..808c6ace375 100644
+--- a/bin/PerlACE/ProcessVX.pm
++++ b/bin/PerlACE/ProcessVX.pm
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env perl
++#! /usr/bin/perl
+ 
+ package PerlACE::ProcessVX;
+ 
+diff --git a/bin/PerlACE/ProcessVX_Unix.pm b/bin/PerlACE/ProcessVX_Unix.pm
+index e254567de37..56b5641c971 100644
+--- a/bin/PerlACE/ProcessVX_Unix.pm
++++ b/bin/PerlACE/ProcessVX_Unix.pm
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env perl
++#! /usr/bin/perl
+ 
+ package PerlACE::ProcessVX;
+ 
+diff --git a/bin/PerlACE/ProcessVX_Win32.pm b/bin/PerlACE/ProcessVX_Win32.pm
+index 3b506b60504..d651d38a5cf 100644
+--- a/bin/PerlACE/ProcessVX_Win32.pm
++++ b/bin/PerlACE/ProcessVX_Win32.pm
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env perl
++#! /usr/bin/perl
+ 
+ package PerlACE::ProcessVX;
+ 
+diff --git a/bin/PerlACE/ProcessWinCE.pm b/bin/PerlACE/ProcessWinCE.pm
+index bd86b6a1e2f..f0784e4590f 100644
+--- a/bin/PerlACE/ProcessWinCE.pm
++++ b/bin/PerlACE/ProcessWinCE.pm
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env perl
++#! /usr/bin/perl
+ 
+ package PerlACE::ProcessVX;
+ 
+diff --git a/bin/PerlACE/ProcessWinCE_Unix.pm b/bin/PerlACE/ProcessWinCE_Unix.pm
+index af82496e352..570084af6cd 100644
+--- a/bin/PerlACE/ProcessWinCE_Unix.pm
++++ b/bin/PerlACE/ProcessWinCE_Unix.pm
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env perl
++#! /usr/bin/perl
+ 
+ package PerlACE::ProcessVX;
+ 
+diff --git a/bin/PerlACE/Process_Unix.pm b/bin/PerlACE/Process_Unix.pm
+index 73b2b706665..6202626cce1 100644
+--- a/bin/PerlACE/Process_Unix.pm
++++ b/bin/PerlACE/Process_Unix.pm
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env perl
++#! /usr/bin/perl
+ 
+ package PerlACE::Process;
+ 
+diff --git a/bin/PerlACE/Process_VMS.pm b/bin/PerlACE/Process_VMS.pm
+index 6c89c3f9e9b..9affb6d5ae2 100644
+--- a/bin/PerlACE/Process_VMS.pm
++++ b/bin/PerlACE/Process_VMS.pm
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env perl
++#! /usr/bin/perl
+ 
+ package PerlACE::Process;
+ 
+diff --git a/bin/PerlACE/Process_Win32.pm b/bin/PerlACE/Process_Win32.pm
+index b0e3c339f00..3fac8943491 100644
+--- a/bin/PerlACE/Process_Win32.pm
++++ b/bin/PerlACE/Process_Win32.pm
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env perl
++#! /usr/bin/perl
+ 
+ use PerlACE::Run_Test;
+ 
+diff --git a/bin/PerlACE/Run_Test.pm b/bin/PerlACE/Run_Test.pm
+index 124fd111a0e..712a0f9b2ae 100644
+--- a/bin/PerlACE/Run_Test.pm
++++ b/bin/PerlACE/Run_Test.pm
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env perl
++#! /usr/bin/perl
+ 
+ # This module contains a few miscellaneous functions and some
+ # startup ARGV processing that is used by all tests.
+diff --git a/bin/PerlACE/TestTarget.pm b/bin/PerlACE/TestTarget.pm
+index 347c6cf3a2f..3a5477b87dc 100644
+--- a/bin/PerlACE/TestTarget.pm
++++ b/bin/PerlACE/TestTarget.pm
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env perl
++#! /usr/bin/perl
+ #
+ # The TestTarget class is for operations that are per-target while testing.
+ # They can be overridden for specific needs like embedded systems, etc.
+diff --git a/bin/PerlACE/TestTarget_Android.pm b/bin/PerlACE/TestTarget_Android.pm
+index 3c9ed08d59c..b6d0859b239 100644
+--- a/bin/PerlACE/TestTarget_Android.pm
++++ b/bin/PerlACE/TestTarget_Android.pm
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env perl
++#! /usr/bin/perl
+ package PerlACE::TestTarget_Android;
+ 
+ # ******************************************************************
+diff --git a/bin/PerlACE/TestTarget_LVRT.pm b/bin/PerlACE/TestTarget_LVRT.pm
+index 42c6cbd8615..79371d9800c 100644
+--- a/bin/PerlACE/TestTarget_LVRT.pm
++++ b/bin/PerlACE/TestTarget_LVRT.pm
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env perl
++#! /usr/bin/perl
+ #
+ # TestTarget_LVRT - how to manage the test environment on a LabVIEW RT target.
+ #
+diff --git a/bin/PerlACE/TestTarget_VxWorks.pm b/bin/PerlACE/TestTarget_VxWorks.pm
+index 9780b80155b..c46eb88a57e 100644
+--- a/bin/PerlACE/TestTarget_VxWorks.pm
++++ b/bin/PerlACE/TestTarget_VxWorks.pm
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env perl
++#! /usr/bin/perl
+ 
+ package PerlACE::TestTarget_VxWorks;
+ 
+diff --git a/bin/PerlACE/TestTarget_WinCE.pm b/bin/PerlACE/TestTarget_WinCE.pm
+index b4144b9c344..2aba983da24 100644
+--- a/bin/PerlACE/TestTarget_WinCE.pm
++++ b/bin/PerlACE/TestTarget_WinCE.pm
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env perl
++#! /usr/bin/perl
+ package PerlACE::TestTarget_WinCE;
+ 
+ # ******************************************************************
+diff --git a/bin/Uniqueid.pm b/bin/Uniqueid.pm
+index 3e453a4695d..5ff95403b0f 100644
+--- a/bin/Uniqueid.pm
++++ b/bin/Uniqueid.pm
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env perl
++#! /usr/bin/perl
+ sub uniqueid
+ {
+   if ($^O eq "MSWin32")
+-- 
+2.11.0
+
diff --git a/ACE/debian/patches/series b/ACE/debian/patches/series
new file mode 100644
index 00000000000..118e900d13e
--- /dev/null
+++ b/ACE/debian/patches/series
@@ -0,0 +1 @@
+0001-Revert-Perl-shebang-portability-changes.patch
diff --git a/ACE/docs/ACE-guidelines.html b/ACE/docs/ACE-guidelines.html
index 26d1b6062c2..9beab7f240a 100644
--- a/ACE/docs/ACE-guidelines.html
+++ b/ACE/docs/ACE-guidelines.html
@@ -157,7 +157,7 @@ bgcolor="#ffffff">
         class ACE_Monitor_Control
         {
         public:
-          int read_monitor (void);
+          int read_monitor ();
           // ...
         };
         </PRE>
@@ -168,7 +168,7 @@ rather than
         class ACEMonitorControl
         {
         public:
-          int readMonitor (void);
+          int readMonitor ();
           // ...
         };
         </PRE>
@@ -610,7 +610,7 @@ Foo::bar ()
         void object_addr (const ACE_INET_Addr &);
 
         /// Returns the ACE_INET_Addr for this profile.
-        const ACE_INET_Addr &object_addr const (void);
+        const ACE_INET_Addr &object_addr const ();
         </pre><p>
 
         instead of the "set_" and "get_" form.<p>
@@ -627,9 +627,9 @@ Foo::bar ()
         <strong><code>delete []</code></strong> to correspond to the
         allocation.<p>
 
-    <li>Don't check for a pointer being 0 before deleting it.  It's
-        always safe to delete a 0 pointer.  If the pointer is visible
-        outside the local scope, it's often a good idea to 0 it
+    <li>Don't check for a pointer being nullptr before deleting it.  It's
+        always safe to delete a nullptr.  If the pointer is visible
+        outside the local scope, it's often a good idea to nullptr it
         _after_ deleting it.  Note, the same argument applies to
         free().<p>
 
@@ -638,11 +638,8 @@ Foo::bar ()
         because they check for successful allocation and set errno
         appropriately if it fails.<p>
 
-    <li>Never compare or assign a pointer value with <strong>NULL</strong>;
-        use <strong>0</strong> instead.  The language allows any pointer to
-        be compared or assigned with <strong>0</strong>.  The definition
-        of <strong>NULL</strong> is implementation dependent, so it is
-        difficult to use portably without casting.<p>
+    <li>Never compare or assign a pointer value with <strong>NULL</strong> or <strong>0</strong>
+        use <strong>nullptr</strong> instead.<p>
 
     <li>Never cast a pointer to or from an <strong><code>int</code></strong>
         or a <strong><code>long</code></strong>.  On all currently supported
@@ -750,27 +747,16 @@ Foo::bar ()
 
     <li>In general, if instances of a class should not be copied,
         then a private copy constructor and assignment operator should
-        be declared for the class, but not implemented.  For example:
+        be deleted for the class
 
         <pre>
         // Disallow copying by not implementing the following . . .
-        ACE_Object_Manager (const ACE_Object_Manager &);
-        ACE_Object_Manager &operator= (const ACE_Object_Manager &);
+        ACE_Object_Manager (const ACE_Object_Manager &) = delete;
+        ACE_Object_Manager (ACE_Object_Manager &&) = delete;
+        ACE_Object_Manager &operator= (const ACE_Object_Manager &) = delete;
+        ACE_Object_Manager &operator= (ACE_Object_Manager &&) = delete;
         </pre><p>
 
-        If the class is a template class, then the
-        <code>ACE_UNIMPLEMENTED_FUNC</code> macro should be used:
-
-        <pre>
-        // = Disallow copying...
-        ACE_UNIMPLEMENTED_FUNC (ACE_TSS (const ACE_TSS&lt;TYPE&gt; &))
-        ACE_UNIMPLEMENTED_FUNC (void operator= (const ACE_TSS&lt;TYPE&gt; &))
-        </pre><p>
-
-        <code>ACE_UNIMPLEMENTED_FUNC</code> can be used with non-template
-        classes as well.  Though for consistency and maximum safety, it
-        should be avoided for non-template classes.<p>
-
     <li>Never use <code>BOOL</code>, or similar types.
             (<code>ACE_CDR::Boolean</code> and
             <code>CORBA::Boolean</code> are acceptable).  Use the
@@ -1340,22 +1326,7 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
       is made then don't make it!<p>
 </ul>
 
-
-
 <hr>
-<h3><a href="http://www.cs.wustl.edu/~schmidt/rules.html">ACE
-  Design Rules</a></h3>
-
-
-<hr><p>
-  <font size=-1>
-<!-- hhmts start -->
-Last modified: Wed Nov 23 11:00:44 CST 2005
-<!-- hhmts end -->
-  </font><p>
-
-
-
 Back to <A HREF="index.html">ACE Documentation Home</A>.
 
 </body>