Mon Dec 14 22:42:01 UTC 2009 Chad Beaulac <chad@objectivesolutions.com>

   * ...
     Merged files from trunk for Bugzilla #3334 branch work-in-progress

76 files changed, 1016 insertions, 487 deletions

diff --git a/ChangeLog b/ChangeLog
index 73d2c11db34..0f1c66675dd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,281 @@
+Mon Dec 14 14:58:05 UTC 2009  Abdul Sowayan  <sowayan@gmail.com>
+
+        * NEWS:
+
+          Updated to note iPhone/iPod Touch support.
+
+Mon Dec 14 11:21:46 UTC 2009  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * html/Stats/index.shtml:
+          Updated link to PS3/IBM Cell performance graphs
+
+Mon Dec 14 10:58:46 UTC 2009  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * examples/Export/run_test.pl:
+          Fixed fuzz error
+
+Sun Dec 13 22:38:13 UTC 2009  Abdul Sowayan  <sowayan@gmail.com>
+
+        * include/makeinclude/platform_macosx_iphone.GNU:
+
+          Changed to allow iPhone Hardware compiler to generate executables.
+
+Sun Dec 13 18:30:26 UTC 2009  Abdul Sowayan  <sowayan@gmail.com>
+
+        * include/makeinclude/platform_macosx_iphone.GNU:
+
+          Enhanced iPhone support. Now we can build for the iPhone
+          Hardware target in addition to the simulator.
+
+Sat Dec 12 15:40:13 UTC 2009  Abdul Sowayan  <sowayan@gmail.com>
+
+        * ace/config-macosx-iphone.h:
+        * include/makeinclude/platform_macosx_iphone.GNU:
+
+          First cut at supporting iPhone 3.1.2. These files need
+          some cleanup. With these files, using the iPhone simulator
+          I was able to spawn ACE Threads, print ACE Logs messages,
+          and communicate between the the iPhone simulator and a
+          Windows machine using CORBA.
+
+Thu Dec 10 20:03:58 UTC 2009  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * bin/fuzz.pl:
+          Improved error message
+
+Thu Dec 10 15:37:58 UTC 2009  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * bin/ACETAOCIAO.style:
+          Small updates
+
+Thu Dec 10 15:10:58 UTC 2009  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * bin/fuzz.pl:
+          Check all run_*.pl files for fuzz
+
+Thu Dec 10 13:07:58 UTC 2009  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/config-win32-borland.h:
+          Removed hard supported version check
+
+Wed Dec  9 10:52:26 UTC 2009  Denis Budko  <denis.budko@remedy.nl>
+
+        * bin/fuzz.pl:
+
+          Updated conditions for new framework
+
+Mon Dec  7 16:09:18 UTC 2009  Steve Huston  <shuston@riverace.com>
+
+        * tests/Basic_Types_Test.cpp: Add a verification for the endianness
+          setting.
+
+Mon Dec  7 07:40:00 UTC 2009  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * bin/MakeProjectCreator/config/bmake.features:
+          Disable mcpp for bmake
+
+Fri Dec  4 23:24:21 UTC 2009  Yan Dai  <dai_y@ociweb.com>
+
+        * bin/MakeProjectCreator/config/global.features:
+
+          Added mpc feature to optionally turn on the indirection
+          support on valuetype outgoing message. It defaults to
+          be enabled. To be compatible with previous version TAO,
+          it needs run mwc.pl with
+          "-features valuetype_out_indirection=0" to disable it.
+
+Fri Dec  4 17:25:32 UTC 2009  Yan Dai  <dai_y@ociweb.com>
+
+        * NEWS:
+
+          Removed entry for member validation feature in LoadBalancer as it
+          should be in TAO NEWS.
+
+Fri Dec  4 13:19:00 UTC 2009  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * html/Stats/index.shtml:
+          Added link for IBM Cell xampler performance stats
+
+Fri Dec  4 10:20:23 UTC 2009  Marcel Smit  <msmit@remedy.nl>
+
+        * bin/fuzz.pl:
+          Removed -v option. The information which is generated
+          by -v should always be visible.
+
+Fri Dec  4 07:30:00 UTC 2009  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/config-win32-borland.h:
+          CB2010 fix
+
+Thu Dec  3 11:59:00 UTC 2009  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * bin/fuzz.pl:
+          Check CIAO_TRACE macros and put all run_*.pl files in a separate
+          list
+
+Wed Dec  2 18:17:04 UTC 2009  Yan Dai  <dai_y@ociweb.com>
+
+        * NEWS:
+
+          Added entry for member validation feature in LoadBalancer.
+
+Wed Dec  2 13:46:00 UTC 2009  Martin Corino  <mcorino@remedy.nl>
+
+        * debianbuild/{all files containign version numbers}:
+          Updated to latest micro release.
+
+Wed Dec  2 13:30:00 UTC 2009  Martin Corino  <mcorino@remedy.nl>
+
+        * bin/make_release.py:
+          Added code to update version numbers in ACE_ROOT/debianbuild files
+          on release.
+          Changed to retrieve repo root by default from info of working copy.
+
+Wed Dec  2 07:51:00 UTC 2009  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * bin/copy-script.sh:
+          Also copy md5 files
+
+        * bin/MakeProjectCreator/config/bmake.features:
+          Enable mcpp for bmake
+
+Thu Nov 26 02:08:59 UTC 2009  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
+
+        * Gaurav Kulshreshtha is the 2300th contributor to ACE+TAO+CIAO!
+
+Mon Nov 30 19:11:00 UTC 2009  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * apps/gperf/src/Bool_Array.h:
+        * apps/gperf/src/Key_List.h:
+          C++ Builder 2010 fixes
+
+Mon Nov 30 14:02:00 UTC 2009  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/Process.cpp:
+        * ace/Process.h:
+          Fixed gcc warnings
+
+Mon Nov 30 12:38:00 UTC 2009  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/config-win32-borland.h:
+          Started port to C++ Builder 2010, older versions of C++ Builder are
+          now deprecated
+
+        * ace/MMAP_Memory_Pool.cpp:
+          Layout change
+
+        * ace/OS_NS_sys_time.h:
+        * ace/OS_NS_sys_time.inl:
+          Removed workarounds for ancient wince versions
+
+        * ace/Process.cpp:
+        * ace/Process.h:
+          Use bool and size_t and removed some ugly casts
+
+        * ace/Trace.cpp:
+        * ace/Trace.h:
+          Use bool
+
+Mon Nov 30 10:53:00 UTC 2009  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * debianbuild/patches/18-fix-bswap-detection.dpatch:
+        * debianbuild/patches/22-tao_idl-64bit-fix.dpatch:
+          Removed, not needed anymore
+
+Mon Nov 30 10:08:00 UTC 2009  Martin Corino <mcorino@remedy.nl>
+
+        * include/makeinclude/platform_linux_common.GNU:
+
+          Added some rules to support cross builds.
+          Setting the environment variable (or make variable) CROSS_COMPILE
+          to the platform tool prefix will redefine the CC, CXX and AR
+          variables and add a '-Wl,-rpath-link' option to the LDFLAGS.
+          If the HOST_ROOT variable has been set as well TAO_IDLxxx variables
+          will be redefined as well.
+
+Mon Nov 30 08:58:00 UTC 2009  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * bin/diff-builds-and-group-fixed-tests-only.sh:
+        * bin/Download.html:
+          updated for x.7.5
+
+        * bin/make_release.py
+        * rpmbuild/ace-tao-ciao.spec
+        * rpmbuild/ace-tao.spec
+          Updated to match opensuse build service
+
+        * docs/svn/svn-prefs.reg:
+          Added idl3+
+
+        * etc/index.html:
+          Added 5.7.5
+
+Sun Nov 29 13:06:02 CST 2009  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ACE version 5.7.5 released.
+
+Thu Nov 26 12:33:00 UTC 2009  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/Message_Queue_Test.cpp:
+          Fixed msvc warning
+
+Thu Nov 26 04:19:02 UTC 2009  William R. Otte  <wotte@dre.vanderbilt.edu>
+
+        * tests/Message_Queue_Test.cpp:
+
+          Attempt to resolve warning for MSVC.
+
+Tue Nov 24 09:39:00 UTC 2009  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/Tokenizer_T.cpp:
+          Check if buffer_ is not nil
+
+        * bin/fuzz.pl:
+          Export files shouldn't be in the ciao repository anymore, all
+          should be generated by TAO_IDL
+
+Mon Nov 23 10:56:18 UTC 2009  Marcel Smit  <msmit@remedy.nl>
+
+        * THANKS:
+          Added Wolfgang Pickartz.for solving a TAO_IDL compiler
+          issue.
+
+Mon Nov 23 07:53:57 UTC 2009  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * debianbuild/changelog:
+        * debianbuild/control:
+        * debianbuild/dsc:
+        * debianbuild/rules:
+          Imported last version from debian
+
+Thu Nov 19 20:29:57 UTC 2009  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
+
+        * ace/Log_Msg_NT_Event_Log.cpp (ACE_Log_Msg_NT_Event_Log::log):
+          Added checks to ensure that log() works properly if the msg_data
+          size is greater than ACE_Log_Record::MAXLOGMSGLEN.  Thanks to
+          Gaurav Kulshreshtha <gaurav dot kulshreshtha at onmobile dot
+          com> for contributing this fix.
+
+Fri Nov 20 08:45:52 UTC 2009  Olli Savia  <ops@iki.fi>
+
+        * ace/Log_Msg.cpp:
+          Updated documentation for '%S' modifier.
+
+Fri Nov 20 07:06:04 UTC 2009  Olli Savia  <ops@iki.fi>
+
+        * ace/Sig_Handler.cpp:
+          Reverted: Sun Nov  1 16:47:29 UTC 2009  Olli Savia  <ops@iki.fi>
+
+Thu Nov 19 14:08:29 UTC 2009  Olli Savia  <ops@iki.fi>
+
+        * ace/Sig_Handler.cpp:
+          Reverted: Mon Nov  2 08:36:24 UTC 2009  Olli Savia  <ops@iki.fi>
+
+Wed Nov 19 09:45:00 UTC 2009  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/config-WinCE.h:
+          Only define FILE_MAP_COPY when it is not defined yet
+
 Mon Nov 16 14:40:42 UTC 2009  Olli Savia  <ops@iki.fi>
 
         * include/makeinclude/platform_win32_interix.GNU:
diff --git a/NEWS b/NEWS
index 6ea53c74c88..2538a8667b8 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,36 @@
+USER VISIBLE CHANGES BETWEEN ACE-5.7.5 and ACE-5.7.6
+====================================================
+
+. Added support for iPhone OS 3.1.2. The following
+  environment variable are needed:
+
+  IPHONE_TARGET, should be set to either SIMULATOR or
+  HARDWARE. Set to HARDWARE if you want to deploy
+  on the iPhone/iPod Touch device.
+
+  IPHONE_VERSION, should be set to 3.1.2. One can set
+  the version to any future or past versions, but 
+  only 3.1.2 has been tried.
+
+  Note that one has to compile ACE/TAO statically as
+  it is believed that the iPhone OS does not support
+  dynamic loading of external libraries. The usual
+  procedure of cross compiling ACE/TAO applies 
+  (such as setting HOST_ROOT environment variable).
+
+USER VISIBLE CHANGES BETWEEN ACE-5.7.4 and ACE-5.7.5
+====================================================
+
+. Added MacOSX Snow Leopard support
+
+. Added strsignal() wrapper
+
+. Improved LynxOS support
+
+. Updated Interix port
+
+. Fixed MinGW compilation problems
+
 USER VISIBLE CHANGES BETWEEN ACE-5.7.3 and ACE-5.7.4
 ====================================================
 
diff --git a/PROBLEM-REPORT-FORM b/PROBLEM-REPORT-FORM
index 4b6f784daf9..b0b170f254b 100644
--- a/PROBLEM-REPORT-FORM
+++ b/PROBLEM-REPORT-FORM
@@ -43,7 +43,7 @@
 To: ace-bugs@cs.wustl.edu
 Subject: [area]: [synopsis]
 
-    ACE VERSION: 5.7.4
+    ACE VERSION: 5.7.5
 
     HOST MACHINE and OPERATING SYSTEM:
         If on Windows based OS's, which version of WINSOCK do you
diff --git a/THANKS b/THANKS
index 486169ef3af..3f4032e0869 100644
--- a/THANKS
+++ b/THANKS
@@ -1069,7 +1069,7 @@ Giovanni Zito <gzito at mbox dot thunder dot it>
 Matthew Adams <madams at bexusa dot com>
 Sameer Schabungbam <schabungbam at hss dot hns dot com>
 Jeff Butler <jeff at panasas dot com>
-Roland Rüdenauer <roland dot ruedenauer at freenet dot de>
+Roland R�denauer <roland dot ruedenauer at freenet dot de>
 John Buckman <john at lyris dot com>
 Guy Rosen <grosen at bigfoot dot com>
 <amoderni at viasoft dot com>
@@ -1963,7 +1963,7 @@ Arto Jalkanen <ajalkane at gmail dot com>
 Scott Zionic <sz at finsatconsulting dot com>
 Diana Ukleja <Diana_Ukleja at raytheon dot com>
 Shaun Cooley <scooley4241 at hotmail dot com>
-Aapo Mäkinen <aapo dot makinen at firstbeattechnologies dot com>
+Aapo M�kinen <aapo dot makinen at firstbeattechnologies dot com>
 Matt Emerson <mjemerson at isis dot vanderbilt dot edu>
 Sean Parker <supinlick at yahoo dot com>
 Mark Wilson <mwil at lle dot rochester dot edu>
@@ -2009,7 +2009,7 @@ Timothy Wayne Gomez <gomezt at saic dot com>
 Ventimiglia Chere <Ventimiglia_Chere at emc dot com>
 Frederick Heckel <fwph at cse dot wustl dot edu>
 Ian Zagorskih <ianzag at megasignal dot com>
-Olivier Guérin <guerin35 at hotmail dot com>
+Olivier Gu�rin <guerin35 at hotmail dot com>
 Abdel Rigumye <rigumyea at ociweb dot com>
 James Damour <james dot damour at request dot com>
 Alan Anderson <Alan dot Anderson at sdsmt dot edu>
@@ -2165,7 +2165,7 @@ Ray Lischner <rlischner at proteus-technologies dot com>
 Sergey Kosenko <sergey dot kosenko at gmail dot com>
 Pavel Zaichenko <zpf at ivl dot ua>
 Paul Riley <paul at riley dot net>
-Nelson Filipe Ferreira Gonçalves <ngoncalves at isr dot ist dot utl dot pt>
+Nelson Filipe Ferreira Gon�alves <ngoncalves at isr dot ist dot utl dot pt>
 Harry Goldschmitt <harry at hgac dot com>
 Sail Zeng <sailzeng at tencent dot com>
 Markus Henschel <m dot henschel at bally-wulff dot de>
@@ -2221,7 +2221,7 @@ Hayim Shaul <hayim at iportent dot com>
 Erman Balcik <erman dot balcik at siemens dot com>
 Torsten Saliwada <sally at gmx dot net>
 Nathan Glasser <nglasser at cantata dot com>
-Grégor Boirie <gregor dot boirie at free dot fr>
+Gr�gor Boirie <gregor dot boirie at free dot fr>
 Alex Solan <alex dot solan at gmail dot com>
 Venkat Sidhabathuni <venkats at idengines dot com>
 Nathan Ernst <Nathan dot Ernst at citadelgroup dot com>
@@ -2250,7 +2250,7 @@ Ittehad Shaikh <ishaikh at verivue dot com>
 Michael Doubez <michael dot doubez at gmail dot com>
 Namrata Gandhi <...>
 Michael Guntli <michael dot guntli at leica-geosystems dot com>
-Frank Förster <F dot Forster at herts dot ac dot uk>
+Frank F�rster <F dot Forster at herts dot ac dot uk>
 Roger Leblanc <rog dot leblanc at gmail dot com>
 Bob Fiske <Robert dot Fiske at ironmountain dot com>
 Julien Vintrou <vintrouj at gmail dot com>
@@ -2305,6 +2305,11 @@ Marijke Hengstmengel <mhengstmengel at remedy dot nl>
 Christian Freund <freund at wrz dot de>
 Chris Shaw <google at cshaw-tech dot co dot uk>
 Matthew Carter <r_q_einstein-acetaobugs at yahoo dot com>
+Denis Budko <denis dot budko at remedy dot nl>
+Gaurav Kulshreshtha <gaurav dot kulshreshtha at onmobile dot com>
+Wolfgang Pickartz <Wolfgang dot Pickartz at procom.de>
+Joost Kraaijeveld <J dot Kraaijeveld at Askesis dot nl>
+Pau Garcia i Quiles <pgquiles at elpauer dot org>
 
 I would particularly like to thank Paul Stephenson, who worked with me
 at Ericsson in the early 1990's.  Paul devised the recursive Makefile
diff --git a/VERSION b/VERSION
index d1fda3a91ec..2991a6fabef 100644
--- a/VERSION
+++ b/VERSION
@@ -1,4 +1,4 @@
-This is ACE version 5.7.4, released Mon Oct 12 14:03:48 CDT 2009
+This is ACE version 5.7.5, released Sun Nov 29 13:06:02 CST 2009
 
 If you have any problems with or questions about ACE, please send
 email to the ACE mailing list (ace-users@cs.wustl.edu), using the form
diff --git a/ace/Future_Set.cpp b/ace/Future_Set.cpp
index 3d04fe9ed5d..3bd4abe8156 100644
--- a/ace/Future_Set.cpp
+++ b/ace/Future_Set.cpp
@@ -71,7 +71,7 @@ ACE_Future_Set<T>::insert (ACE_Future<T> &future)
   // If a new map entry was created, then attach to the future,
   // otherwise we were already attached to the future or some error
   // occurred so just delete the future holder.
-  if ( result == 0 )
+  if (result == 0)
     // Attach ourself to the ACE_Futures list of observer
     future.attach (this);
   else
diff --git a/ace/Future_Set.h b/ace/Future_Set.h
index 6e804248021..1e0c0b8e6ec 100644
--- a/ace/Future_Set.h
+++ b/ace/Future_Set.h
@@ -31,14 +31,14 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 /**
  * @class ACE_Future_Set
  *
- * @brief This class implements a mechanism which allows the values of
+ * @brief This class implements a mechanism that allows the values of
  * a collection of ACE_Future objects to be accessed by reader threads
  * as they become available.  The caller(s) provide the ACE_Future_Set
  * (i.e. the observer...) with the collection of ACE_Future objects
- * (i.e. the subjects...) that are to be observed using the
- * the ACE_Future_Set::insert() method.  The caller(s) may then iterate
- * over the collection in the order in which they become readable using
- * the ACE_Future_Set::next_readable() method.
+ * (i.e. the subjects...) that are to be observed using the the
+ * ACE_Future_Set::insert() method.  The caller(s) may then iterate
+ * over the collection in the order in which they become readable
+ * using the ACE_Future_Set::next_readable() method.
  */
 template <class T>
 class ACE_Future_Set : public ACE_Future_Observer<T>
diff --git a/ace/Log_Msg.cpp b/ace/Log_Msg.cpp
index 0ee5ca92de6..b06d361ed9a 100644
--- a/ace/Log_Msg.cpp
+++ b/ace/Log_Msg.cpp
@@ -914,7 +914,8 @@ ACE_Log_Msg::open (const ACE_TCHAR *prog_name,
  *   '@': print a void* pointer (in hexadecimal)
  *   'r': call the function pointed to by the corresponding argument
  *   'R': print return status
- *   'S': format the appropriate _sys_siglist entry corresponding to var-argument.
+ *   'S': print out the appropriate signal message corresponding
+ *        to var-argument, e.g., as done by strsignal()
  *   's': format a character string
  *   'T': print timestamp in hour:minute:sec:usec format.
  *   'D': print timestamp in month/day/year hour:minute:sec:usec format.
diff --git a/ace/Log_Msg_NT_Event_Log.cpp b/ace/Log_Msg_NT_Event_Log.cpp
index e22170c01dc..4883dee9409 100644
--- a/ace/Log_Msg_NT_Event_Log.cpp
+++ b/ace/Log_Msg_NT_Event_Log.cpp
@@ -106,11 +106,16 @@ ACE_Log_Msg_NT_Event_Log::log (ACE_Log_Record &log_record)
   // CR-LF. Newline characters on their own do not appear correctly in
   // the event viewer. We allow for a doubling in the size of the msg
   // data for the worst case of all newlines.
-  const ACE_TCHAR* src_msg_data = log_record.msg_data ();
-  ACE_TCHAR msg_data [ACE_Log_Record::MAXLOGMSGLEN * 2];
+  const ACE_TCHAR *src_msg_data = log_record.msg_data ();
+  ACE_TCHAR msg_data [(ACE_Log_Record::MAXLOGMSGLEN * 2) + 1];
 
+  size_t maxlen = ACE_Log_Record::MAXLOGMSGLEN;
+  if (ACE_Log_Record::MAXLOGMSGLEN > log_record.msg_data_len ())
+    maxlen = log_record.msg_data_len ();
+
+  size_t end = 0;
   for (size_t i = 0, j = 0;
-       i < log_record.msg_data_len ();
+       i < maxlen;
        ++i)
     {
       if (src_msg_data[i] == '\n')
@@ -120,7 +125,10 @@ ACE_Log_Msg_NT_Event_Log::log (ACE_Log_Record &log_record)
         }
       else
         msg_data[j++] = src_msg_data[i];
+
+      end = j;
     }
+  msg_data[end] = '\0';
 
   // Map the ACE log record type to an event log type.
   WORD event_type;
diff --git a/ace/MMAP_Memory_Pool.cpp b/ace/MMAP_Memory_Pool.cpp
index c5acb9e9c53..841160808d9 100644
--- a/ace/MMAP_Memory_Pool.cpp
+++ b/ace/MMAP_Memory_Pool.cpp
@@ -44,7 +44,7 @@ ACE_MMAP_Memory_Pool::release (int destroy)
 #endif /* ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1 */
 
   if (destroy)
-  this->mmap_.remove ();
+    this->mmap_.remove ();
   else
     this->mmap_.close ();
   return 0;
diff --git a/ace/OS_NS_sys_time.h b/ace/OS_NS_sys_time.h
index 898c57f8155..54680c8e416 100644
--- a/ace/OS_NS_sys_time.h
+++ b/ace/OS_NS_sys_time.h
@@ -37,22 +37,8 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace ACE_OS
 {
-#if defined (ACE_WIN32) && defined (_WIN32_WCE)
-// Something is a bit brain-damaged here and I'm not sure what... this code
-// compiled before the OS reorg for ACE 5.4. Since then it hasn't - eVC
-// complains that the operators that return ACE_Time_Value are C-linkage
-// functions that can't return a C++ class. The only way I've found to
-// defeat this is to wrap the whole class in extern "C++".
-//    - Steve Huston, 23-Aug-2004
-extern "C++" {
-#endif
-
   ACE_NAMESPACE_INLINE_FUNCTION
   ACE_Time_Value gettimeofday (void);
-
-#if defined (ACE_WIN32) && defined (_WIN32_WCE)
-}
-#endif
 } /* namespace ACE_OS */
 
 ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/OS_NS_sys_time.inl b/ace/OS_NS_sys_time.inl
index 604df97926d..9eaed9fea43 100644
--- a/ace/OS_NS_sys_time.inl
+++ b/ace/OS_NS_sys_time.inl
@@ -11,16 +11,6 @@
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
-#if defined (ACE_WIN32) && defined (_WIN32_WCE)
-// Something is a bit brain-damaged here and I'm not sure what... this code
-// compiled before the OS reorg for ACE 5.4. Since then it hasn't - eVC
-// complains that the operators that return ACE_Time_Value are C-linkage
-// functions that can't return a C++ class. The only way I've found to
-// defeat this is to wrap the whole class in extern "C++".
-//    - Steve Huston, 23-Aug-2004
-extern "C++" {
-#endif
-
 ACE_INLINE ACE_Time_Value
 ACE_OS::gettimeofday (void)
 {
@@ -89,8 +79,4 @@ ACE_OS::gettimeofday (void)
 #endif // !defined (ACE_WIN32)
 }
 
-#if defined (ACE_WIN32) && defined (_WIN32_WCE)
-}
-#endif
-
 ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Process.cpp b/ace/Process.cpp
index b4121ad0c1a..087d68fb7a2 100644
--- a/ace/Process.cpp
+++ b/ace/Process.cpp
@@ -794,9 +794,9 @@ ACE_Process::convert_env_buffer (const char* env) const
 #endif
 
 ACE_Process_Options::ACE_Process_Options (bool inherit_environment,
-                                          int command_line_buf_len,
-                                          int env_buf_len,
-                                          int max_env_args)
+                                          size_t command_line_buf_len,
+                                          size_t env_buf_len,
+                                          size_t max_env_args)
   :
 #if !defined (ACE_HAS_WINCE)
     inherit_environment_ (inherit_environment),
@@ -826,7 +826,7 @@ ACE_Process_Options::ACE_Process_Options (bool inherit_environment,
     max_environment_args_ (max_env_args),
     max_environ_argv_index_ (max_env_args - 1),
 #endif /* !ACE_HAS_WINCE */
-    command_line_argv_calculated_ (0),
+    command_line_argv_calculated_ (false),
     command_line_buf_ (0),
     command_line_copy_ (0),
     command_line_buf_len_ (command_line_buf_len),
@@ -1003,8 +1003,11 @@ ACE_Process_Options::setenv (const ACE_TCHAR *variable_name,
   va_start (argp, format);
 
   // Add the rest of the varargs.
-  size_t tmp_buflen = DEFAULT_COMMAND_LINE_BUF_LEN > buflen
-                      ? static_cast<size_t> (DEFAULT_COMMAND_LINE_BUF_LEN) : buflen;
+  size_t tmp_buflen = buflen;
+  if (DEFAULT_COMMAND_LINE_BUF_LEN > buflen)
+    {
+      tmp_buflen = DEFAULT_COMMAND_LINE_BUF_LEN;
+    }
   int retval = 0;
 
   ACE_TCHAR *stack_buf = 0;
@@ -1185,17 +1188,16 @@ ACE_Process_Options::command_line (const ACE_TCHAR *const argv[])
   if (argv[i])
     {
       ACE_OS::strcat (command_line_buf_, argv[i]);
-      
+
       while (argv[++i])
         {
-          // Check to see if the next argument will overflow the  
+          // Check to see if the next argument will overflow the
           // command_line buffer.
-          int cur_len =
-            static_cast<int> (
-              ACE_OS::strlen (command_line_buf_)
-              + ACE_OS:: strlen (argv[i])
-              + 2);
-              
+          size_t const cur_len =
+            ACE_OS::strlen (command_line_buf_)
+              + ACE_OS::strlen (argv[i])
+              + 2;
+
           if (cur_len > command_line_buf_len_)
             {
               ACE_ERROR_RETURN ((LM_ERROR,
@@ -1205,13 +1207,13 @@ ACE_Process_Options::command_line (const ACE_TCHAR *const argv[])
                                  command_line_buf_len_),
                                 1);
             }
-            
+
           ACE_OS::strcat (command_line_buf_, ACE_TEXT (" "));
           ACE_OS::strcat (command_line_buf_, argv[i]);
         }
     }
 
-  command_line_argv_calculated_ = 0;
+  command_line_argv_calculated_ = false;
   return 0; // Success.
 }
 
@@ -1241,7 +1243,7 @@ ACE_Process_Options::command_line (const ACE_TCHAR *format, ...)
   // Useless macro.
   va_end (argp);
 
-  command_line_argv_calculated_ = 0;
+  command_line_argv_calculated_ = false;
   return 0;
 }
 
@@ -1253,7 +1255,7 @@ ACE_Process_Options::command_line (const ACE_TCHAR *format, ...)
 int
 ACE_Process_Options::command_line (const ACE_ANTI_TCHAR *format, ...)
 {
-  ACE_ANTI_TCHAR *anti_clb;
+  ACE_ANTI_TCHAR *anti_clb = 0;
   ACE_NEW_RETURN (anti_clb,
                   ACE_ANTI_TCHAR[this->command_line_buf_len_],
                   -1);
@@ -1275,7 +1277,7 @@ ACE_Process_Options::command_line (const ACE_ANTI_TCHAR *format, ...)
 
   delete [] anti_clb;
 
-  command_line_argv_calculated_ = 0;
+  command_line_argv_calculated_ = false;
   return 0;
 }
 #endif /* ACE_HAS_WCHAR && !ACE_HAS_WINCE */
@@ -1296,9 +1298,9 @@ ACE_Process_Options::env_buf (void)
 ACE_TCHAR * const *
 ACE_Process_Options::command_line_argv (void)
 {
-  if (command_line_argv_calculated_ == 0)
+  if (!command_line_argv_calculated_)
     {
-      command_line_argv_calculated_ = 1;
+      command_line_argv_calculated_ = true;
 
       // We need to free up any previous allocated memory first.
       ACE::strdelete (command_line_copy_);
diff --git a/ace/Process.h b/ace/Process.h
index 23af2012e3d..111f29c0435 100644
--- a/ace/Process.h
+++ b/ace/Process.h
@@ -82,9 +82,9 @@ public:
    * max strlen for command-line arguments.
    */
   ACE_Process_Options (bool inherit_environment = true,
-                       int command_line_buf_len = DEFAULT_COMMAND_LINE_BUF_LEN,
-                       int env_buf_len = ENVIRONMENT_BUFFER,
-                       int max_env_args = MAX_ENVIRONMENT_ARGS);
+                       size_t command_line_buf_len = DEFAULT_COMMAND_LINE_BUF_LEN,
+                       size_t env_buf_len = ENVIRONMENT_BUFFER,
+                       size_t max_env_args = MAX_ENVIRONMENT_ARGS);
 
   /// Destructor.
   ~ACE_Process_Options (void);
@@ -388,7 +388,7 @@ protected:
   size_t environment_buf_index_;
 
   /// Pointer to environment_argv_.
-  int environment_argv_index_;
+  size_t environment_argv_index_;
 
   /// Pointer to buffer of the environment settings.
   ACE_TCHAR *environment_buf_;
@@ -400,17 +400,17 @@ protected:
   ACE_TCHAR **environment_argv_;
 
   /// Maximum number of environment variables. Configurable
-  int max_environment_args_;
+  size_t max_environment_args_;
 
   /// Maximum index of environment_argv_ buffer
-  int max_environ_argv_index_;
+  size_t max_environ_argv_index_;
 
   /// The current working directory.
   ACE_TCHAR working_directory_[MAXPATHLEN + 1];
 #endif /* !ACE_HAS_WINCE */
 
   /// Ensures command_line_argv is only calculated once.
-  int command_line_argv_calculated_;
+  bool command_line_argv_calculated_;
 
   /// Pointer to buffer of command-line arguments.  E.g., "-f foo -b bar".
   ACE_TCHAR *command_line_buf_;
@@ -420,7 +420,7 @@ protected:
   ACE_TCHAR *command_line_copy_;
 
   /// Max length of command_line_buf_
-  int command_line_buf_len_;
+  size_t command_line_buf_len_;
 
   /// Argv-style command-line arguments.
   ACE_TCHAR *command_line_argv_[MAX_COMMAND_LINE_OPTIONS];
diff --git a/ace/Service_Object.cpp b/ace/Service_Object.cpp
index dfc84b28cd7..16d650271d3 100644
--- a/ace/Service_Object.cpp
+++ b/ace/Service_Object.cpp
@@ -109,8 +109,7 @@ ACE_Service_Type::fini (void)
       return 1; // No implementation was found.
     }
 
-  // Cast constness away when calling fini
-  int ret = const_cast<ACE_Service_Type_Impl *>(this->type_)->fini ();
+  int ret = this->type_->fini ();
 
   // Ensure that closing the DLL is done after type_->fini() as it may
   // require access to the code for the service object destructor,
diff --git a/ace/Service_Types.cpp b/ace/Service_Types.cpp
index fd4cf978579..50e6b743944 100644
--- a/ace/Service_Types.cpp
+++ b/ace/Service_Types.cpp
@@ -55,7 +55,7 @@ ACE_Service_Type_Impl::~ACE_Service_Type_Impl (void)
 }
 
 int
-ACE_Service_Type_Impl::fini (void)
+ACE_Service_Type_Impl::fini (void) const
 {
   ACE_TRACE ("ACE_Service_Type_Impl::fini");
 
@@ -74,9 +74,7 @@ ACE_Service_Type_Impl::fini (void)
 
   if (ACE_BIT_ENABLED (this->flags_,
                        ACE_Service_Type::DELETE_THIS))
-  {
     delete const_cast <ACE_Service_Type_Impl *> (this);
-  }
 
   return 0;
 }
@@ -110,7 +108,7 @@ ACE_Service_Object_Type::init (int argc, ACE_TCHAR *argv[]) const
 }
 
 int
-ACE_Service_Object_Type::fini (void)
+ACE_Service_Object_Type::fini (void) const
 {
   ACE_TRACE ("ACE_Service_Object_Type::fini");
 
@@ -154,11 +152,6 @@ ACE_Service_Object_Type::info (ACE_TCHAR **str, size_t len) const
   return static_cast<ACE_Service_Object *> (this->object ())->info (str, len);
 }
 
-ACE_Module_Container::~ACE_Module_Container (void)
-{
-  ACE_TRACE ("ACE_Module_Container::~ACE_Module_Container");
-}
-
 ACE_ALLOC_HOOK_DEFINE(ACE_Module_Type)
 
 void
@@ -172,9 +165,7 @@ ACE_Module_Type::dump (void) const
 ACE_Module_Type::ACE_Module_Type (void *m,
                                   const ACE_TCHAR *m_name,
                                   u_int f)
-  : ACE_Service_Type_Impl (m, m_name, f),
-  module_container_ (0),
-  fini_called_ (false)
+  : ACE_Service_Type_Impl (m, m_name, f)
 {
   ACE_TRACE ("ACE_Module_Type::ACE_Module_Type");
 }
@@ -236,16 +227,10 @@ ACE_Module_Type::resume (void) const
 // implementation of ACE_Module and ACE_Module::close...
 
 int
-ACE_Module_Type::fini (void)
+ACE_Module_Type::fini (void) const
 {
   ACE_TRACE ("ACE_Module_Type::fini");
-  if (this->fini_called_)
-  {
-    return 0;    
-  }
-
-  this->fini_called_ = true;
-
+#if 0
   void *obj = this->object ();
   MT_Module *mod = (MT_Module *) obj;
   MT_Task *reader = mod->reader ();
@@ -259,13 +244,9 @@ ACE_Module_Type::fini (void)
 
   // Close the module and delete the memory.
   mod->close (MT_Module::M_DELETE);
-  if (module_container_ != 0)
-  {
-    module_container_->remove (this);
-    module_container_ = 0;
-  }
-
   return ACE_Service_Type_Impl::fini ();
+#endif
+  return 0;
 }
 
 int
@@ -376,7 +357,7 @@ ACE_Stream_Type::info (ACE_TCHAR **str, size_t len) const
 }
 
 int
-ACE_Stream_Type::fini (void)
+ACE_Stream_Type::fini (void) const
 {
   ACE_TRACE ("ACE_Stream_Type::fini");
   void *obj = this->object ();
@@ -406,6 +387,7 @@ int
 ACE_Stream_Type::remove (ACE_Module_Type *mod)
 {
   ACE_TRACE ("ACE_Stream_Type::remove");
+
   ACE_Module_Type *prev = 0;
   void *obj = this->object ();
   MT_Stream *str = (MT_Stream *) obj;
@@ -451,7 +433,6 @@ ACE_Stream_Type::push (ACE_Module_Type *new_module)
   new_module->link (this->head_);
   this->head_ = new_module;
   obj = new_module->object ();
-  new_module->module_container (this);
   return str->push ((MT_Module *) obj);
 }
 
diff --git a/ace/Service_Types.h b/ace/Service_Types.h
index c0677c111d3..e741561d965 100644
--- a/ace/Service_Types.h
+++ b/ace/Service_Types.h
@@ -50,7 +50,7 @@ public:
   virtual int suspend (void) const = 0;
   virtual int resume (void) const = 0;
   virtual int init (int argc, ACE_TCHAR *argv[]) const = 0;
-  virtual int fini (void);
+  virtual int fini (void) const;
   virtual int info (ACE_TCHAR **str, size_t len) const = 0;
 
   /// The pointer to the service.
@@ -104,7 +104,7 @@ public:
   virtual int suspend (void) const;
   virtual int resume (void) const;
   virtual int init (int argc, ACE_TCHAR *argv[]) const;
-  virtual int fini (void);
+  virtual int fini (void) const;
   virtual int info (ACE_TCHAR **str, size_t len) const;
 
 private:
@@ -112,15 +112,6 @@ private:
   mutable int initialized_;
 };
 
-class ACE_Module_Type;
-
-class ACE_Export ACE_Module_Container
-{
-public:
-  virtual ~ACE_Module_Container ();
-  virtual int remove (ACE_Module_Type *module) = 0;
-};
-
 /**
  * @class ACE_Module_Type
  *
@@ -141,7 +132,7 @@ public:
   virtual int suspend (void) const;
   virtual int resume (void) const;
   virtual int init (int argc, ACE_TCHAR *argv[]) const;
-  virtual int fini (void);
+  virtual int fini (void) const;
   virtual int info (ACE_TCHAR **str, size_t len) const;
 
   /// Get the link pointer.
@@ -150,12 +141,6 @@ public:
   /// Set the link pointer.
   void link (ACE_Module_Type *);
 
-  /// Get the link pointer.
-  ACE_Module_Container *module_container (void) const;
-
-  /// Set the module_container pointer
-  void module_container (ACE_Module_Container *);
-
   /// Dump the state of an object.
   void dump (void) const;
 
@@ -165,11 +150,6 @@ public:
 private:
   /// Pointer to the next ACE_Module_Type in an ACE_Stream_Type.
   ACE_Module_Type *link_;
-
-  /// Pointer to the ACE_Module_Container
-  ACE_Module_Container *module_container_;
-
-  bool fini_called_;
 };
 
 /**
@@ -178,7 +158,7 @@ private:
  * @brief Define the methods for handling the configuration of
  * ACE_Streams.
  */
-class ACE_Export ACE_Stream_Type : public ACE_Service_Type_Impl, public ACE_Module_Container
+class ACE_Export ACE_Stream_Type : public ACE_Service_Type_Impl
 {
 public:
   // = Initialization method.
@@ -192,7 +172,7 @@ public:
   virtual int suspend (void) const;
   virtual int resume (void) const;
   virtual int init (int argc, ACE_TCHAR *argv[]) const;
-  virtual int fini (void);
+  virtual int fini (void) const;
   virtual int info (ACE_TCHAR **str, size_t len) const;
 
   /// Add a new  ACE_Module to the top of the ACE_Stream.
diff --git a/ace/Service_Types.inl b/ace/Service_Types.inl
index 28eec6ffab0..9ebfd705ced 100644
--- a/ace/Service_Types.inl
+++ b/ace/Service_Types.inl
@@ -29,18 +29,4 @@ ACE_Service_Type_Impl::name (const ACE_TCHAR *n)
   this->name_ = ACE::strnew (n);
 }
 
-ACE_INLINE void
-ACE_Module_Type::module_container (ACE_Module_Container *n)
-{
-  ACE_TRACE ("ACE_Module_Type::module_container");
-  this->module_container_ = n;
-}
-
-ACE_INLINE ACE_Module_Container *
-ACE_Module_Type::module_container (void) const
-{
-  ACE_TRACE ("ACE_Module_Type::module_container");
-  return this->module_container_;
-}
-
 ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/Sig_Handler.cpp b/ace/Sig_Handler.cpp
index 7be0eb71453..08330ed704a 100644
--- a/ace/Sig_Handler.cpp
+++ b/ace/Sig_Handler.cpp
@@ -161,6 +161,9 @@ ACE_Sig_Handler::register_handler_i (int signum,
         new_disp = &sa;
 
       new_disp->handler (ace_signal_handler_dispatcher);
+#if !defined (ACE_HAS_LYNXOS4_SIGNALS)
+      new_disp->flags (new_disp->flags () | SA_SIGINFO);
+#endif /* ACE_HAS_LYNXOS4_SIGNALS */
       return new_disp->register_action (signum, old_disp);
     }
   else
@@ -428,6 +431,7 @@ ACE_Sig_Handlers::register_handler (int signum,
 
           // Default is to restart signal handlers.
           new_disp->flags (new_disp->flags () | SA_RESTART);
+          new_disp->flags (new_disp->flags () | SA_SIGINFO);
 
           // Finally install (possibly reinstall) the ACE signal
           // handler disposition with the SA_RESTART mode enabled.
diff --git a/ace/Tokenizer_T.cpp b/ace/Tokenizer_T.cpp
index ddc3d70a91c..a0af46e9ec0 100644
--- a/ace/Tokenizer_T.cpp
+++ b/ace/Tokenizer_T.cpp
@@ -124,6 +124,12 @@ ACE_Tokenizer_T<CHAR>::next (void)
       index_ = 0;
       return 0;
     }
+    
+  // Check if a buffer has been passed
+  if (!buffer_)
+    {
+      return 0;
+    }
 
   CHAR replacement = 0;
   int replace;
diff --git a/ace/Trace.cpp b/ace/Trace.cpp
index f83e8e96511..c87d88a3f1f 100644
--- a/ace/Trace.cpp
+++ b/ace/Trace.cpp
@@ -1,6 +1,5 @@
 // $Id$
 
-
 #include "ace/Trace.h"
 
 ACE_RCSID (ace,
@@ -24,7 +23,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 int ACE_Trace::nesting_indent_ = ACE_Trace::DEFAULT_INDENT;
 
 // Is tracing enabled?
-int ACE_Trace::enable_tracing_ = ACE_Trace::DEFAULT_TRACING;
+bool ACE_Trace::enable_tracing_ = ACE_Trace::DEFAULT_TRACING;
 
 ACE_ALLOC_HOOK_DEFINE(ACE_Trace)
 
@@ -37,7 +36,7 @@ ACE_Trace::dump (void) const
 
 // Determine whether or not tracing is enabled
 
-int
+bool
 ACE_Trace::is_tracing (void)
 {
   return ACE_Trace::enable_tracing_;
@@ -48,7 +47,7 @@ ACE_Trace::is_tracing (void)
 void
 ACE_Trace::start_tracing (void)
 {
-  ACE_Trace::enable_tracing_ = 1;
+  ACE_Trace::enable_tracing_ = true;
 }
 
 // Disable the tracing facility.
@@ -56,7 +55,7 @@ ACE_Trace::start_tracing (void)
 void
 ACE_Trace::stop_tracing (void)
 {
-  ACE_Trace::enable_tracing_ = 0;
+  ACE_Trace::enable_tracing_ = false;
 }
 
 // Change the nesting indentation level.
diff --git a/ace/Trace.h b/ace/Trace.h
index 4fdb86a3367..7c0c202c1c4 100644
--- a/ace/Trace.h
+++ b/ace/Trace.h
@@ -49,8 +49,8 @@ public:
   ~ACE_Trace (void);
 
   // = Control the tracing level.
-  /// Determine if tracing is enabled (return == 1) or not (== 0)
-  static int  is_tracing(void);
+  /// Determine if tracing is enabled or not
+  static bool is_tracing(void);
 
   /// Enable the tracing facility.
   static void start_tracing (void);
@@ -79,7 +79,7 @@ private:
   static int nesting_indent_;
 
   /// Is tracing enabled?
-  static int enable_tracing_;
+  static bool enable_tracing_;
 
   /// Default values.
   enum
diff --git a/ace/Version.h b/ace/Version.h
index 3cde464760e..070198a3daa 100644
--- a/ace/Version.h
+++ b/ace/Version.h
@@ -5,5 +5,5 @@
 
 #define ACE_MAJOR_VERSION 5
 #define ACE_MINOR_VERSION 7
-#define ACE_BETA_VERSION 4
-#define ACE_VERSION "5.7.4"
+#define ACE_BETA_VERSION 5
+#define ACE_VERSION "5.7.5"
diff --git a/ace/config-WinCE.h b/ace/config-WinCE.h
index 40a755348fc..3bd3620e2f8 100644
--- a/ace/config-WinCE.h
+++ b/ace/config-WinCE.h
@@ -160,9 +160,9 @@
 // @@ NSIG value.  This is definitely not correct.
 #define NSIG 23
 
-// @@ For some reason, WinCE forgot to define this.
-//    Need to find out what it is. (Used in MapViewOfFile ().)
+#if !defined (FILE_MAP_COPY)
 #define FILE_MAP_COPY 0
+#endif
 
 #define ACE_HAS_INTERLOCKED_EXCHANGEADD
 #define ACE_LACKS_ACCESS
diff --git a/ace/config-win32-borland.h b/ace/config-win32-borland.h
index 9242bf312e7..d2e1cfb8c36 100644
--- a/ace/config-win32-borland.h
+++ b/ace/config-win32-borland.h
@@ -11,10 +11,6 @@
 #error Use config-win32.h in config.h instead of this header
 #endif /* ACE_CONFIG_WIN32_H */
 
-#if (__BORLANDC__ != 0x613)
-#error This version of CodeGear C++ is not supported.
-#endif
-
 #define ACE_HAS_CUSTOM_EXPORT_MACROS
 #define ACE_Proper_Export_Flag __declspec (dllexport)
 #define ACE_Proper_Import_Flag __declspec (dllimport)
@@ -37,9 +33,13 @@
 # define ACE_CC_MINOR_VERSION (__BORLANDC__ % 0x100)
 # define ACE_CC_BETA_VERSION (0)
 
-# ifndef ACE_USING_MCPP_PREPROCESSOR
+#ifndef ACE_USING_MCPP_PREPROCESSOR
+# if (__BORLANDC__ >= 0x620)
+#  define ACE_CC_PREPROCESSOR_ARGS "-q -Sl -o%s"
+# else
 #  define ACE_CC_PREPROCESSOR_ARGS "-q -P- -o%s"
 # endif
+#endif
 
 // Automatically define WIN32 macro if the compiler tells us it is our
 // target platform.
@@ -140,10 +140,10 @@
 #if (__BORLANDC__ < 0x620)
 # define ACE_LACKS_ISBLANK
 # define ACE_LACKS_ISWBLANK
-# define ACE_LACKS_ISWCTYPE
 # define ACE_LACKS_PRAGMA_ONCE 1
 #endif
 
+#define ACE_LACKS_ISWCTYPE
 #define ACE_LACKS_ISCTYPE
 
 #if (__BORLANDC__ < 0x620)
diff --git a/apps/gperf/ChangeLog b/apps/gperf/ChangeLog
index 4d2c5e2126b..b762f3b14f2 100644
--- a/apps/gperf/ChangeLog
+++ b/apps/gperf/ChangeLog
@@ -1135,7 +1135,7 @@ Mon Apr  8 18:17:04 1991  Doug Schmidt  (schmidt at net4.ics.uci.edu)
         * Boy, it has been a *long* time since I hacked this puppy.  Let's
           see, I'm about to add long-overdue support for case-insensitive
           string comparisons to gperf's generated output code.  We are
-          going to employ the hitherto unused option -I to indicte this!
+          going to employ the hitherto unused option -I to indicate this!
 
 Thu Jun 28 16:17:27 1990  Doug Schmidt  (schmidt at brilliant)
 
@@ -1981,7 +1981,7 @@ Sun Jan 15 15:12:09 1989  Doug Schmidt  (schmidt at crimee.ics.uci.edu)
           is now computed in Key_List::Read_Keys, and thus
           Key_List::Print_Min_Max doesn't need to bother.
 
-        * Modifed the key position iterator scheme in options.cc to
+        * Modified the key position iterator scheme in options.cc to
           eliminate the need for member function Options::Advance.
           Now, the Options::Get function performs the advancement
           automatically, obviating the need for an extra function call.
diff --git a/apps/gperf/src/Bool_Array.h b/apps/gperf/src/Bool_Array.h
index 76c600a088d..bf5a9ccb810 100644
--- a/apps/gperf/src/Bool_Array.h
+++ b/apps/gperf/src/Bool_Array.h
@@ -36,7 +36,7 @@
 
 #if defined (ACE_HAS_GPERF)
 
-#if defined (__BORLANDC__) && (__BORLANDC__ < 0x620)
+#if defined (__BORLANDC__) && (__BORLANDC__ <= 0x620)
 #include "gperf_export.h"
 #endif
 
@@ -47,7 +47,7 @@
  * Uses a "Generation Numbering" implementation to minimize
  * initialization time.
  */
-#if defined (__BORLANDC__) && (__BORLANDC__ < 0x620)
+#if defined (__BORLANDC__) && (__BORLANDC__ <= 0x620)
 class ACE_GPERF_Export Bool_Array
 #else
 class Bool_Array
diff --git a/apps/gperf/src/Key_List.h b/apps/gperf/src/Key_List.h
index ef64f188f6f..149ac28d339 100644
--- a/apps/gperf/src/Key_List.h
+++ b/apps/gperf/src/Key_List.h
@@ -34,7 +34,7 @@
 #include "Vectors.h"
 #include "ace/Copy_Disabled.h"
 
-#if defined (__BORLANDC__) && (__BORLANDC__ < 0x620)
+#if defined (__BORLANDC__) && (__BORLANDC__ <= 0x620)
 #include "gperf_export.h"
 #endif
 
@@ -64,7 +64,7 @@ public:
  * the Gen_Perf.hash function.  A Key_List is a singly-linked list
  * of List_Nodes.
  */
-#if defined (__BORLANDC__) && (__BORLANDC__ < 0x620)
+#if defined (__BORLANDC__) && (__BORLANDC__ <= 0x620)
 class ACE_GPERF_Export Key_List : private ACE_Copy_Disabled
 #else
 class Key_List : private ACE_Copy_Disabled
diff --git a/bin/ACETAOCIAO.style b/bin/ACETAOCIAO.style
index 575eb7a31c2..ca0619acaf3 100644
--- a/bin/ACETAOCIAO.style
+++ b/bin/ACETAOCIAO.style
@@ -50,7 +50,7 @@
 <presetreference>Classes and Structs_Member Alignment Together_False</presetreference>
 </rule>
 <rule name="constructor-initialiser-packing">
-<presetreference>Constructor_Member Initializers_One Per Line</presetreference>
+<presetreference>Constructor_Member Initializers_One Per Line Comma Below</presetreference>
 </rule>
 <rule name="constructor-initialiser-style">
 <presetreference>Constructor_Initializer Alignment_True</presetreference>
@@ -245,7 +245,7 @@
 <presetreference>Global_Line Wrapping_80</presetreference>
 </rule>
 <rule name="member-initialiser-position">
-<presetreference>Constructor_Member Initializer Position_Below Indented</presetreference>
+<presetreference>Constructor_Member Initializer Position_Below</presetreference>
 </rule>
 <rule name="min-member-align">
 <presetreference>Classes and Structs_Minimum Member Alignment_None</presetreference>
diff --git a/bin/MakeProjectCreator/config/global.features b/bin/MakeProjectCreator/config/global.features
index aefca279800..f25df8b9d79 100644
--- a/bin/MakeProjectCreator/config/global.features
+++ b/bin/MakeProjectCreator/config/global.features
@@ -136,3 +136,5 @@ tao_no_iiop = 0
 // Option to enable the linking of the TAO_CodecFactory library
 // whenever TAO is linked in
 link_codecfactory = 0
+
+valuetype_out_indirection=1
diff --git a/bin/copy-script.sh b/bin/copy-script.sh
index aca38ae198e..2b893b584e9 100755
--- a/bin/copy-script.sh
+++ b/bin/copy-script.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-for i in *.gz *.bz2 *.zip; do
+for i in *.gz *.bz2 *.zip *.md5; do
   d=`echo $i | sed 's/\.[tz][ai][rp]/-$1&/'`
   echo "Copying $i to $d"
   cp -ip $i /export/www/download.dre/previous_versions/$d
diff --git a/bin/diff-builds-and-group-fixed-tests-only.sh b/bin/diff-builds-and-group-fixed-tests-only.sh
index a2bf7ef816c..b8a59fd75ec 100755
--- a/bin/diff-builds-and-group-fixed-tests-only.sh
+++ b/bin/diff-builds-and-group-fixed-tests-only.sh
@@ -1,4 +1,4 @@
-if test -z $1; then olddate=2009_10_12; else olddate=$1; fi
+if test -z $1; then olddate=2009_11_29; else olddate=$1; fi
 if test -z $2; then newdate=`date -u +%Y_%m_%d`; else newdate=$2; fi
 if test -z $3; then prefix=`date -u +%Y%m%d%a`; else prefix=$3; fi
 if test -z $ACE_ROOT; then ACE_ROOT=..; fi
diff --git a/bin/fuzz.pl b/bin/fuzz.pl
index b467beb2da9..94d132a4c5f 100755
--- a/bin/fuzz.pl
+++ b/bin/fuzz.pl
@@ -50,6 +50,7 @@ use PerlACE::Run_Test;
 @files_noncvs = ();
 @files_sln = ();
 @files_vcproj = ();
+@files_run_pl = ();
 
 # To keep track of errors and warnings
 $errors = 0;
@@ -122,6 +123,9 @@ sub store_file ($)
     }
     elsif ($name =~ /\.pl$/i) {
         push @files_pl, ($name);
+        if ($name =~ /run.*\.pl$/i) {
+            push @files_run_pl, ($name);
+        }
     }
     elsif ($name =~ /\.vcproj$/i) {
         push @files_vcproj, ($name);
@@ -363,6 +367,19 @@ sub check_for_ACE_SYNCH_MUTEX ()
     }
 }
 
+# This test checks for not having export files in CIAO, all have to be ---
+# generated using TAO_IDL
+sub check_for_export_file ()
+{
+    print "Running export file check\n";
+    ITERATION: foreach $file (@files_h) {
+        if (($file =~ /.*CIAO.*export.h/)) {
+            print_error ("$file:$.: found should be generated by TAO_IDL, check -Gx** option");
+        }
+    }
+}
+
+
 # This test checks for the use of ACE_Thread_Mutex in TAO/CIAO,
 # TAO_SYNCH_MUTEX should used instead to make the code build
 # in single-threaded builds.
@@ -1367,21 +1384,7 @@ sub check_for_mismatched_filename ()
 sub check_for_bad_run_test ()
 {
     print "Running run_test.pl test\n";
-    # Add the know ACE files
-    if (defined $ENV{"TAO_ROOT"}) {
-        push @files_lst, $ENV{"TAO_ROOT"} . "/bin/tao_orb_tests.lst";
-        push @files_lst, $ENV{"TAO_ROOT"} . "/bin/tao_other_tests.lst";
-    }
-    if (defined $ENV{"CIAO_ROOT"}) {
-        push @files_lst, $ENV{"CIAO_ROOT"} . "/bin/ciao_tests.lst";
-    }
-    $config_list = new PerlACE::ConfigList;
-    foreach $file (@files_lst) {
-      $config_list->load ($file);
-    }
-    $config_list->add_one_config ("FUZZ");
-    @valid_files = $config_list->valid_entries ();
-    foreach $file (@valid_files) {
+    foreach $file (@files_run_pl) {
         if (open (FILE, $file)) {
             my $is_run_test = 0;
             my $sub = 0;
@@ -1414,20 +1417,20 @@ sub check_for_bad_run_test ()
                         print_error ("$file:$.: using Sys::Hostname");
                     }
 
-                    if (m/\$PerlACE::wait_interval_for_process_creation/) {
-                        print_error ("$file:$.: using \$PerlACE::wait_interval_for_process_creation");
+                    if (m/PerlACE::wait_interval_for_process_creation/) {
+                        print_error ("$file:$.: using PerlACE::wait_interval_for_process_creation");
                     }
 
-                    if (m/\$PerlACE::waitforfile_timed/) {
-                        print_error ("$file:$.: using \$PerlACE::waitforfile_timed");
+                    if (m/PerlACE::waitforfile_timed/) {
+                        print_error ("$file:$.: using PerlACE::waitforfile_timed");
                     }
 
-                    if (m/\$PerlACE::is_vxworks_test/) {
-                        print_error ("$file:$.: using \$PerlACE::is_vxworks_test");
+                    if (m/PerlACE::is_vxworks_test/) {
+                        print_error ("$file:$.: using PerlACE::is_vxworks_test");
                     }
 
-                    if (m/\$PerlACE::add_lib_path/) {
-                        print_error ("$file:$.: using \$PerlACE::add_lib_path");
+                    if (m/PerlACE::add_lib_path/) {
+                        print_error ("$file:$.: using PerlACE::add_lib_path, use AddLibPath on the target");
                     }
 
                     if (m/PerlACE::Run_Test/) {
@@ -1542,7 +1545,7 @@ sub check_for_absolute_ace_wrappers()
                 if (m/\~schmidt\/ACE_wrappers\//) {
                     chomp;
                     print_error ("$file:$.: ~schmidt/ACE_wrappers found");
-                    print_error ($_) if (defined $opt_v);
+                    print_error ($_);
                 }
             }
             close (FILE);
@@ -1581,7 +1584,8 @@ sub check_for_bad_ace_trace()
 
                 # Look for TRACE statements
                 if (m/ACE_OS_TRACE\s*\(\s*\"(.*)\"/
-                    || m/ACE_TRACE\s*\(\s*\"(.*)\"/) {
+                    || m/ACE_TRACE\s*\(\s*\"(.*)\"/
+                    || m/CIAO_TRACE\s*\(\s*\"(.*)\"/) {
                     my $trace = $1;
 
                     # reduce the classname
@@ -1597,7 +1601,7 @@ sub check_for_bad_ace_trace()
                         || ($trace =~ m/\:\:/ && !($trace =~ m/\Q$class\E/ && $trace =~ m/\Q$function\E/))) {
                         print_error ("$file:$.: Mismatched TRACE");
                         print_error ("$file:$.:   I see \"$trace\" but I think I'm in \""
-                                     . $class . "::" . $function . "\"") if (defined $opt_v);
+                                     . $class . "::" . $function . "\"");
                     }
                 }
             }
@@ -1728,15 +1732,15 @@ sub check_for_include ()
                 }
                 if ($disable == 0) {
                     if (/^\s*#\s*include\s*<[(ace)|(TAO)|(CIAO)]\/.*>/) {
-                        print_error ("$file:$.: include <ace\/..> used") if ($opt_v);
+                        print_error ("$file:$.: include <ace\/..> used");
                         ++$bad_occurance;
                     }
                     if (/^\s*#\s*include\s*<tao\/.*>/) {
-                        print_error ("$file:$.: include <tao\/..> used") if ($opt_v);
+                        print_error ("$file:$.: include <tao\/..> used");
                         ++$bad_occurance;
                     }
                     if (/^\s*#\s*include\s*<ciao\/.*>/) {
-                        print_error ("$file:$.: include <ciao\/..> used") if ($opt_v);
+                        print_error ("$file:$.: include <ciao\/..> used");
                         ++$bad_occurance;
                     }
                 }
@@ -1987,7 +1991,7 @@ sub check_for_ORB_init ()
 
 ##############################################################################
 
-use vars qw/$opt_c $opt_d $opt_h $opt_l $opt_t $opt_m $opt_v/;
+use vars qw/$opt_c $opt_d $opt_h $opt_l $opt_t $opt_m/;
 
 if (!getopts ('cdhl:t:mv') || $opt_h) {
     print "fuzz.pl [-cdhm] [-l level] [-t test_name][file1, file2, ...]\n";
@@ -1998,7 +2002,6 @@ if (!getopts ('cdhl:t:mv') || $opt_h) {
     print "    -l level       set detection level (default = 5)\n";
     print "    -t test_name   specify any single test to run. This will disable the run level setting\n";
     print "    -m             only check locally modified files (uses cvs)\n";
-    print "    -v             verbose mode\n";
     print "======================================================\n";
     print "list of the tests that could be run:\n";
     print "\t   check_for_noncvs_files
@@ -2065,8 +2068,8 @@ print "--------------------Configuration: Fuzz - Level ",$opt_l,
       "--------------------\n";
 
 check_for_bad_run_test () if ($opt_l >= 5);
-check_for_deprecated_macros () if ($opt_l > 1 );
-check_for_refcountservantbase () if ($opt_l > 1 );
+check_for_deprecated_macros () if ($opt_l >= 1);
+check_for_refcountservantbase () if ($opt_l >= 1);
 check_for_msc_ver_string () if ($opt_l >= 3);
 check_for_empty_files () if ($opt_l >= 1);
 check_for_noncvs_files () if ($opt_l >= 1);
@@ -2099,10 +2102,11 @@ check_for_changelog_errors () if ($opt_l >= 4);
 check_for_ptr_arith_t () if ($opt_l >= 4);
 check_for_include () if ($opt_l >= 5);
 check_for_non_bool_operators () if ($opt_l > 2);
-check_for_long_file_names () if ($opt_l > 1 );
-check_for_improper_main_declaration ();
-check_for_TAO_Local_RefCounted_Object ();
-check_for_ORB_init ();
+check_for_long_file_names () if ($opt_l >= 1);
+check_for_improper_main_declaration () if ($opt_l >= 1);
+check_for_TAO_Local_RefCounted_Object () if ($opt_l >= 1);
+check_for_ORB_init () if ($opt_l >= 1);
+check_for_export_file () if ($opt_l >= 6);
 
 print "\nFuzz.pl - $errors error(s), $warnings warning(s)\n";
 
diff --git a/bin/make_release.py b/bin/make_release.py
index dc10435b06a..7a8bfb6444b 100755
--- a/bin/make_release.py
+++ b/bin/make_release.py
@@ -1,4 +1,4 @@
-#!/usr/local/bin/python2.5
+#!/usr/bin/python2
 
 # @file make_release.py
 # @author William R. Otte <wotte@dre.vanderbilt.edu>
@@ -102,7 +102,9 @@ def parse_args ():
 
     parser.add_option ("--root", dest="repo_root", action="store",
                        help="Specify an alternate repository root",
-                       default="https://svn.dre.vanderbilt.edu/DOC/")
+                       default=None)
+                       # By default get repo root from working copy
+                       # default="https://svn.dre.vanderbilt.edu/DOC/")
 
     parser.add_option ("-n", dest="take_action", action="store_false",
                        help="Take no action", default=True)
@@ -185,10 +187,11 @@ def commit (files):
     """ Commits the supplied list of files to the repository. """
     vprint ("Committing the following files: " + " ".join (files))
 
-    rev = svn_client.checkin (files,
-                              "ChangeLogTag:%s  %s  <%s>" % (release_date, signature, mailid))
-
-    print "Checked in files, resuling in revision ", rev.number
+    if opts.take_action:
+        rev = svn_client.checkin (files,
+                                  "ChangeLogTag:%s  %s  <%s>" % (release_date, signature, mailid))
+    
+        print "Checked in files, resuling in revision ", rev.number
 
 def check_workspace ():
     """ Checks that the DOC and MPC repositories are up to date.  """
@@ -202,11 +205,19 @@ def check_workspace ():
         raise
 
     try:
-        rev = svn_client.update (doc_root + "ACE/MPC")
+        rev = svn_client.update (doc_root + "/ACE/MPC")
         print "Successfully updated MPC working copy to revision "
     except:
-        print "Unable to update the MPC workspace at " + doc_root + "/MPC"
+        print "Unable to update the MPC workspace at " + doc_root + "/ACE/MPC"
         raise
+    
+    # By default retrieve repo root from working copy
+    if opts.repo_root is None:
+        info = svn_client.info2 (doc_root + "/ACE")[0]
+        opts.repo_root = info[1]["repos_root_URL"]
+       
+    vprint ("Repos root URL = " + opts.repo_root + "\n")
+        
 
 def update_version_files (component):
     """ Updates the version files for a given component.  This includes
@@ -297,7 +308,7 @@ def update_spec_file ():
 
     global comp_versions, opts
 
-    with open ("ACE/rpmbuild/ace-tao-ciao.spec", 'r+') as spec_file:
+    with open (doc_root + "/ACE/rpmbuild/ace-tao.spec", 'r+') as spec_file:
         new_spec = ""
         for line in spec_file.readlines ():
             if line.find ("define ACEVER ") is not -1:
@@ -322,7 +333,105 @@ def update_spec_file ():
             print "New spec file:"
             print "".join (new_spec)
 
-    return ["ACE/rpmbuild/ace-tao-ciao.spec"]
+    return [doc_root + "/ACE/rpmbuild/ace-tao.spec"]
+
+def update_debianbuild ():
+    """ Updates ACE_ROOT/debianbuild directory.
+    - renames all files with version nrs in name to new scheme.
+    - updates version nrs in file debianbuild/control 
+    Currently ONLY ACE & TAO stuff 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
+    
+    files = list ()
+    prev_ace_ver = None
+    prev_tao_ver = None
+    
+    # rename files
+    mask = re.compile ("(libace|libkokyu|libtao)(.*)(\d+\.\d+\.\d+)(.*)")
+    tao = re.compile ("tao", re.IGNORECASE) 
+    
+    for fname in glob.iglob(doc_root + '/ACE/debianbuild/*'):
+        match = None        
+        
+        fbase = basename (fname)
+        
+        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)
+                
+        if fnewname is not None:
+            if opts.take_action:
+                svn_client.move (fname, fnewname)
+            else:
+                print "Rename: " + fname + " to " + fnewname + "\n"
+                
+            files.append (fname)
+            files.append (fnewname)
+        
+    # 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)
+    
+    with open (doc_root + "/ACE/debianbuild/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:
+                line = line.replace (prev_ace_ver, comp_versions["ACE_version"])
+                
+            new_ctrl += line
+
+        if opts.take_action:
+            control_file.seek (0)
+            control_file.truncate (0)
+            control_file.writelines (new_ctrl)
+        else:
+            print "New control file:"
+            print "".join (new_ctrl)
+            
+    files.append (doc_root + "/ACE/debianbuild/control")
+            
+    # rewrite debianbuild/dsc
+    dsc_lines = """# Format: 1.0
+# Source: ace
+# Version: %s
+# Binary: ace
+# Maintainer: Johnny Willemsen  <jwillemsen@remedy.nl>
+# Architecture: any
+# Build-Depends: g++
+# Files:
+#  <hash> <size> ACE+TAO+CIAO-src-%s.tar.bz2
+#
+""" % (comp_versions["TAO_version"], comp_versions["ACE_version"])
+    if opts.take_action:
+        with open (doc_root + "/ACE/debianbuild/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/debianbuild/dsc")
+            
+    return files
 
 def get_and_update_versions ():
     """ Gets current version information for each component,
@@ -342,6 +451,7 @@ def get_and_update_versions ():
         files += create_changelog ("TAO")
         files += create_changelog ("CIAO")
         files += update_spec_file ()
+        files += update_debianbuild ()
 
         commit (files)
     except:
@@ -452,9 +562,9 @@ def update_latest_tag (which, branch):
     """ Update one of the Latest_* tags externals to point the new release """
     global opts
     root_anon = re.sub ("^https:", "svn:", opts.repo_root)
-    propval = """ACE_wrappers %sMiddleware/tags/%s/ACE
-ACE_wrappers/TAO %sMiddleware/tags/%s/TAO
-ACE_wrappers/TAO/CIAO %sMiddleware/tags/%s/CIAO
+    propval = """ACE_wrappers %s/Middleware/tags/%s/ACE
+ACE_wrappers/TAO %s/Middleware/tags/%s/TAO
+ACE_wrappers/TAO/CIAO %s/Middleware/tags/%s/CIAO
 """ % (root_anon, branch, root_anon, branch, root_anon, branch)
     svn_client.propset ("svn:externals", propval,
                         opts.repo_root + "/Middleware/tags/Latest_" + which)
@@ -466,24 +576,32 @@ def tag ():
     branch = "ACE+TAO+CIAO-%d_%d_%d" % (comp_versions["ACE_major"],
                                         comp_versions["ACE_minor"],
                                         comp_versions["ACE_beta"])
-    # Tag middleware
-    svn_client.copy (opts.repo_root + "/Middleware/trunk",
-                     opts.repo_root + "/Middleware/tags/" + branch)
-
-    # Tag MPC
-    svn_client.copy (opts.repo_root + "/MPC/trunk",
-                     opts.repo_root + "/MPC/tags/" + branch)
-
-    # Update latest tag
-#    if opts.release_type == "major":
-#        update_latest_tag ("Major", branch)
-#    elif opts.release_type == "minor":
-#        update_latest_tag ("Minor", branch)
-#    elif opts.release_type == "beta":
-#        update_latest_tag ("Beta", branch)
-#        update_latest_tag ("Micro", branch)
-#        if comp_versions["ACE_beta"] == 1:
-#                update_latest_tag ("BFO", branch)
+                                        
+    if opts.take_action:                                        
+        # Tag middleware
+        svn_client.copy (opts.repo_root + "/Middleware/trunk",
+                        opts.repo_root + "/Middleware/tags/" + branch)
+    
+        # Tag MPC
+        svn_client.copy (opts.repo_root + "/MPC/trunk",
+                        opts.repo_root + "/MPC/tags/" + branch)
+
+        # Update latest tag
+        # mcorino@remedy.nl - subversion does not seem to support propset directly
+        #                     on URLs (except for some strange reason through propedit)
+        #if opts.release_type == "major":
+            #update_latest_tag ("Major", branch)
+        #elif opts.release_type == "minor":
+            #update_latest_tag ("Minor", branch)
+        #elif opts.release_type == "beta":
+            #update_latest_tag ("Beta", branch)
+            #update_latest_tag ("Micro", branch)
+            #if comp_versions["ACE_beta"] == 1:
+                    #update_latest_tag ("BFO", branch)
+    else:
+        print "Creating tags:\n"
+        print opts.repo_root + "/Middleware/tags/" + branch + "\n"
+        print opts.repo_root + "/MPC/tags/" + branch + "\n"
 
 ##################################################
 #### Packaging methods
diff --git a/debianbuild/changelog b/debianbuild/changelog
index 1249c97813a..cc8d1a3d691 100644
--- a/debianbuild/changelog
+++ b/debianbuild/changelog
@@ -1,3 +1,14 @@
+ace (5.7.4-1) unstable; urgency=low
+
+  * New upstream release
+  * Add dependency on ${misc:Depends}
+  * Add new libraries and update patch 34-bts386713 accordingly
+  * Remove patch 15-fix-fltk-include (fixed upstream)
+  * Remove DH_COMPAT definition from the debian/rules file, it's already in
+    debian/compat
+
+ -- Pau Garcia i Quiles <pgquiles@elpauer.org>  Sun, 25 Oct 2009 12:59:18 +0100
+
 ace (5.6.6-1) experimental; urgency=low
 
   * New upstream release.
diff --git a/debianbuild/control b/debianbuild/control
index 0c84d35242b..72e7463177c 100644
--- a/debianbuild/control
+++ b/debianbuild/control
@@ -5,7 +5,7 @@ Maintainer: Debian ACE+TAO maintainers <pkg-ace-devel@lists.alioth.debian.org>
 Uploaders: Konstantinos Margaritis <markos@debian.org>, Brian Nelson <pyro@debian.org>, Thomas Girard <thomas.g.girard@free.fr>
 Build-Depends: debhelper (>= 5), libssl-dev (>= 0.9.7d), dpatch (>= 2.0.10), libxt-dev (>= 4.3.0), libfltk1.1-dev (>= 1.1.4), libqt4-dev (>= 4.4~rc1-4), tk-dev (>= 8.4.7), libfox-1.6-dev, zlib1g-dev, libzzip-dev, docbook-to-man, bzip2, autoconf, automake, libtool, autotools-dev, doxygen
 Build-Conflicts: autoconf2.13, automake1.4
-Standards-Version: 3.8.0
+Standards-Version: 3.8.3.0
 Vcs-Svn: svn://svn.debian.org/svn/pkg-ace/trunk
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-ace/trunk
 Homepage: http://www.cs.wustl.edu/~schmidt/ACE.html
@@ -13,9 +13,9 @@ Homepage: http://www.cs.wustl.edu/~schmidt/ACE.html
 Package: mpc-ace
 Architecture: all
 Section: devel
-Depends: ${perl:Depends}
+Depends: ${perl:Depends}, ${misc:Depends}
 Recommends: make
-Replaces: libace-dev (= 5.6.7-4)
+Replaces: libace-dev (< 5.7.5-1)
 Suggests: libace-dev, pkg-config
 Description: makefile, project and workspace creator
  This package contains the Makefile, Project and Workspace Creator (MPC)
@@ -28,10 +28,10 @@ Description: makefile, project and workspace creator
   * mpc-ace, generating project files for a single target
   * mwc-ace, generating workspace files for a set of projects
 
-Package: libace-5.6.7
+Package: libace-5.7.5
 Architecture: any
 Section: libs
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: C++ network programming framework
  This package contains the ADAPTIVE Communication Environment (ACE)
  framework.
@@ -54,9 +54,9 @@ Description: C++ network programming framework
 Package: libace-dev
 Architecture: any
 Section: libdevel
-Depends: libace-5.6.7 (= ${binary:Version})
+Depends: libace-5.7.5 (= ${binary:Version}), ${misc:Depends}
 Suggests: libace-doc, libtao-dev, pkg-config
-Replaces: mpc-ace (<< 5.6.7-4)
+Replaces: mpc-ace (<< 5.7.5-4)
 Description: C++ network programming framework development files
  This package contains the header files and static library for the ACE
  framework.
@@ -64,15 +64,16 @@ Description: C++ network programming framework development files
 Package: libace-doc
 Architecture: all
 Section: doc
+Depends: ${misc:Depends}
 Suggests: libace-dev
 Description: C++ network programming framework documentation
  This package contains the ACE overview documentation, tutorials,
  examples, and information regarding upstream development.
 
-Package: libace-ssl-5.6.7
+Package: libace-ssl-5.7.5
 Architecture: any
 Section: libs
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: ACE secure socket layer library
  This package contains wrappers that integrate the OpenSSL library in the
  ACE framework.
@@ -80,15 +81,15 @@ Description: ACE secure socket layer library
 Package: libace-ssl-dev
 Architecture: any
 Section: libdevel
-Depends: libace-ssl-5.6.7 (= ${binary:Version}), libace-dev (= ${binary:Version}), libssl-dev (>= 0.9.7d)
+Depends: ${misc:Depends}, libace-ssl-5.7.4 (= ${binary:Version}), libace-dev (= ${binary:Version}), libssl-dev (>= 5.7.5d)
 Description: ACE secure socket layer library development files
  This package contains the header files and static library for the ACE
  SSL library.
 
-Package: libace-rmcast-5.6.7
+Package: libace-rmcast-5.7.5
 Architecture: any
 Section: libs
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: ACE reliable multicast library
  The RMCast library is a reliable source-ordered multicast protocol
  implementation.
@@ -99,15 +100,15 @@ Description: ACE reliable multicast library
 Package: libace-rmcast-dev
 Architecture: any
 Section: libdevel
-Depends: libace-rmcast-5.6.7 (= ${binary:Version}), libace-dev (= ${binary:Version})
+Depends: ${misc:Depends}, libace-rmcast-5.7.5 (= ${binary:Version}), libace-dev (= ${binary:Version})
 Description: ACE reliable multicast library development files
  This package contains the header files and static library for the ACE
  reliable multicast library.
 
-Package: libace-tmcast-5.6.7
+Package: libace-tmcast-5.7.5
 Architecture: any
 Section: libs
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: ACE transactional multicast library
  The TMCast library is a transaction multicast protocol implementation.
  .
@@ -117,15 +118,15 @@ Description: ACE transactional multicast library
 Package: libace-tmcast-dev
 Architecture: any
 Section: libdevel
-Depends: libace-tmcast-5.6.7 (= ${binary:Version}), libace-dev (= ${binary:Version})
+Depends: ${misc:Depends}, libace-tmcast-5.7.5 (= ${binary:Version}), libace-dev (= ${binary:Version})
 Description: ACE transactional multicast library development files
  This package contains the header files and static library for the ACE
  transactional multicast library.
 
-Package: libace-htbp-5.6.7
+Package: libace-htbp-5.7.5
 Architecture: any
 Section: libs
-Depends: ${shlibs:Depends}
+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.
@@ -136,7 +137,7 @@ Description: ACE protocol over HTTP tunneling library
 Package: libace-htbp-dev
 Architecture: any
 Section: libdevel
-Depends: libace-htbp-5.6.7 (= ${binary:Version}), libace-dev (= ${binary:Version})
+Depends: ${misc:Depends}, libace-htbp-5.7.5 (= ${binary:Version}), libace-dev (= ${binary:Version})
 Description: ACE protocol over HTTP tunneling library development files
  This package contains the header files and static library for the ACE
  HTBP library.
@@ -144,7 +145,7 @@ Description: ACE protocol over HTTP tunneling library development files
 Package: gperf-ace
 Architecture: any
 Section: devel
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: ACE perfect hash function generator
  gperf-ace is the ACE version of gperf.
  .
@@ -152,10 +153,10 @@ Description: ACE perfect hash function generator
  basically the same options and functionality. gperf-ace simply takes
  advantage of the some of the features provided by the ACE library.
 
-Package: libacexml-5.6.7
+Package: libacexml-5.7.5
 Architecture: any
 Section: libs
-Depends: ${shlibs:Depends}
+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
@@ -167,16 +168,16 @@ Description: ACE SAX based XML parsing library
 Package: libacexml-dev
 Architecture: any
 Section: libdevel
-Depends: libacexml-5.6.7 (= ${binary:Version}), libace-dev (= ${binary:Version})
+Depends: ${misc:Depends}, libacexml-5.7.5 (= ${binary:Version}), libace-dev (= ${binary:Version})
 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: libkokyu-5.6.7
+Package: libkokyu-5.7.5
 Architecture: any
 Section: libs
-Depends: ${shlibs:Depends}
-Suggests: libtao-1.6.9, libtao-orbsvcs-1.6.9
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Suggests: libtao-1.7.4, libtao-orbsvcs-1.7.5
 Description: ACE scheduling and dispatching library
  Kokyu is a library designed to provide flexible scheduling and
  dispatching services.
@@ -187,15 +188,15 @@ Description: ACE scheduling and dispatching library
 Package: libkokyu-dev
 Architecture: any
 Section: libdevel
-Depends: libkokyu-5.6.7 (= ${binary:Version}), libace-dev (= ${binary:Version})
+Depends: ${misc:Depends}, libkokyu-5.7.5 (= ${binary:Version}), libace-dev (= ${binary:Version})
 Description: ACE scheduling and dispatching library development files
  This package contains the header files and static library for the ACE
  scheduling and dispatching library.
 
-Package: libace-qtreactor-5.6.7
+Package: libace-qtreactor-5.7.5
 Architecture: any
 Section: libs
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: ACE-GUI reactor integration for Qt
  Recognizing the need to write reactor-based GUI applications, the ACE
  community has created several reactor extensions for use with X Window
@@ -211,15 +212,15 @@ Description: ACE-GUI reactor integration for Qt
 Package: libace-qtreactor-dev
 Architecture: any
 Section: libdevel
-Depends: libace-qtreactor-5.6.7 (= ${binary:Version}), libace-dev (= ${binary:Version}), libqt4-dev
+Depends: ${misc:Depends}, libace-qtreactor-5.7.5 (= ${binary:Version}), libace-dev (= ${binary:Version}), libqt4-dev
 Description: ACE-GUI reactor integration for Qt development files
  This package contains header files and static library for the ACE-Qt
  reactor integration.
 
-Package: libace-xtreactor-5.6.7
+Package: libace-xtreactor-5.7.5
 Architecture: any
 Section: libs
-Depends: ${shlibs:Depends}
+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
@@ -234,15 +235,15 @@ Description: ACE-GUI reactor integration for Xt
 Package: libace-xtreactor-dev
 Architecture: any
 Section: libdevel
-Depends: libace-xtreactor-5.6.7 (= ${binary:Version}), libace-dev (= ${binary:Version}), libxt-dev (>= 4.3.0)
+Depends: ${misc:Depends}, libace-xtreactor-5.7.4 (= ${binary:Version}), libace-dev (= ${binary:Version}), libxt-dev (>= 5.7.5)
 Description: ACE-GUI reactor integration for Xt development files
  This package contains header files and static library for the ACE-Xt
  reactor integration.
 
-Package: libace-tkreactor-5.6.7
+Package: libace-tkreactor-5.7.5
 Architecture: any
 Section: libs
-Depends: ${shlibs:Depends}
+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
@@ -257,15 +258,15 @@ Description: ACE-GUI reactor integration for Tk
 Package: libace-tkreactor-dev
 Architecture: any
 Section: libdevel
-Depends: libace-tkreactor-5.6.7 (= ${binary:Version}), libace-dev (= ${binary:Version}), tk-dev (>= 8.4.7)
+Depends: ${misc:Depends}, libace-tkreactor-5.7.4 (= ${binary:Version}), libace-dev (= ${binary:Version}), tk-dev (>= 5.7.5)
 Description: ACE-GUI reactor integration for Tk development files
  This package contains header files and static library for the ACE-Tk
  reactor integration.
 
-Package: libace-flreactor-5.6.7
+Package: libace-flreactor-5.7.5
 Architecture: any
 Section: libs
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: ACE-GUI reactor integration for Fl
  Recognizing the need to write reactor-based GUI applications, the ACE
  community has created several reactor extensions for use with X Window
@@ -279,15 +280,15 @@ Description: ACE-GUI reactor integration for Fl
 Package: libace-flreactor-dev
 Architecture: any
 Section: libdevel
-Depends: libace-flreactor-5.6.7 (= ${binary:Version}), libace-dev (= ${binary:Version}), libfltk1.1-dev (>= 1.1.4)
+Depends: ${misc:Depends}, libace-flreactor-5.7.4 (= ${binary:Version}), libace-dev (= ${binary:Version}), libfltk1.1-dev (>= 5.7.5)
 Description: ACE-GUI reactor integration for Fl development files
  This package contains header files and static library for the ACE-Fl
  reactor integration.
 
-Package: libace-foxreactor-5.6.7
+Package: libace-foxreactor-5.7.5
 Architecture: any
 Section: libs
-Depends: ${shlibs:Depends}
+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
@@ -301,15 +302,15 @@ Description: ACE-GUI reactor integration for FOX
 Package: libace-foxreactor-dev
 Architecture: any
 Section: libdevel
-Depends: libace-foxreactor-5.6.7 (= ${binary:Version}), libace-dev (= ${binary:Version}), libfox-1.6-dev
+Depends: ${misc:Depends}, libace-foxreactor-5.7.5 (= ${binary:Version}), libace-dev (= ${binary:Version}), libfox-1.6-dev
 Description: ACE-GUI reactor integration for FOX development files
  This package contains header files and static library for the ACE-FOX
  reactor integration.
 
-Package: libtao-1.6.9
+Package: libtao-1.7.5
 Architecture: any
 Section: libs
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: ACE based CORBA ORB core libraries
  The ACE ORB (TAO) is an open-source Common Object Request Broker
  Architecture (CORBA) 2.x-compliant Object Request Broker (ORB).  It
@@ -320,7 +321,7 @@ Description: ACE based CORBA ORB core libraries
 Package: libtao-dev
 Architecture: any
 Section: libdevel
-Depends: libtao-1.6.9 (= ${binary:Version}), libace-dev (= ${binary:Version})
+Depends: ${misc:Depends}, libtao-1.7.5 (= ${binary:Version}), libace-dev (= ${binary:Version})
 Suggests: libtao-doc, libtao-orbsvcs-dev
 Description: ACE based CORBA ORB core libraries development files
  This package contains the header files for TAO.  Due to the size of the
@@ -329,100 +330,100 @@ Description: ACE based CORBA ORB core libraries development files
 Package: libtao-doc
 Architecture: all
 Section: doc
-Depends: libace-doc (= ${source:Version})
+Depends: ${misc:Depends}, libace-doc (= ${source:Version})
 Suggests: libtao-dev
 Description: ACE based CORBA ORB core libraries documentation
  This package contains the TAO overview documentation, tutorials,
  examples, and information regarding upstream development.
 
-Package: libtao-orbsvcs-1.6.9
+Package: libtao-orbsvcs-1.7.5
 Architecture: any
 Section: libs
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: TAO CORBA services libraries
  This package contains libraries that are needed by many TAO programs.
 
 Package: libtao-orbsvcs-dev
 Architecture: any
 Section: libdevel
-Depends: libtao-orbsvcs-1.6.9 (= ${binary:Version}), libtao-dev (= ${binary:Version})
+Depends: ${misc:Depends}, libtao-orbsvcs-1.7.5 (= ${binary:Version}), libtao-dev (= ${binary:Version})
 Description: TAO CORBA services development files
  This package contains the header files for the TAO CORBA services.
  .
  Due to the size of the static libs (> 400MB) they have been left out.
  The examples and some documentation have been included as well.
 
-Package: libtao-qtresource-1.6.9
+Package: libtao-qtresource-1.7.5
 Architecture: any
 Section: libs
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: TAO-GUI reactor integration for Qt
  The Qt resource factory integrates ACE QtReactor into TAO ORB reactor.
 
 Package: libtao-qtresource-dev
 Architecture: any
 Section: libdevel
-Depends: libtao-qtresource-1.6.9 (= ${binary:Version}), libace-qtreactor-dev (= ${binary:Version}), libtao-dev (= ${binary:Version})
+Depends: ${misc:Depends}, libtao-qtresource-1.7.5 (= ${binary:Version}), libace-qtreactor-dev (= ${binary:Version}), libtao-dev (= ${binary:Version})
 Description: TAO-GUI reactor integration for Qt development files
  This package contains header files and static library for the TAO-Qt
  reactor integration.
 
-Package: libtao-xtresource-1.6.9
+Package: libtao-xtresource-1.7.5
 Architecture: any
 Section: libs
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: TAO-GUI reactor integration for Xt
  The Xt resource factory integrates ACE XtReactor into TAO ORB reactor.
 
 Package: libtao-xtresource-dev
 Architecture: any
 Section: libdevel
-Depends: libtao-xtresource-1.6.9 (= ${binary:Version}), libace-xtreactor-dev (= ${binary:Version}), libtao-dev (= ${binary:Version})
+Depends: ${misc:Depends}, libtao-xtresource-1.7.5 (= ${binary:Version}), libace-xtreactor-dev (= ${binary:Version}), libtao-dev (= ${binary:Version})
 Description: TAO-GUI reactor integration for Xt development files
  This package contains header files and static library for the TAO-Xt
  reactor integration.
 
-Package: libtao-flresource-1.6.9
+Package: libtao-flresource-1.7.5
 Architecture: any
 Section: libs
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: TAO-GUI reactor integration for Fl
  The Fl resource factory integrates ACE FlReactor into TAO ORB reactor.
 
 Package: libtao-flresource-dev
 Architecture: any
 Section: libdevel
-Depends: libtao-flresource-1.6.9 (= ${binary:Version}), libace-flreactor-dev (= ${binary:Version}), libtao-dev (= ${binary:Version})
+Depends: ${misc:Depends}, libtao-flresource-1.7.5 (= ${binary:Version}), libace-flreactor-dev (= ${binary:Version}), libtao-dev (= ${binary:Version})
 Description: TAO-GUI reactor integration for Fl development files
  This package contains header files and static library for the TAO-Fl
  reactor integration.
 
-Package: libtao-tkresource-1.6.9
+Package: libtao-tkresource-1.7.5
 Architecture: any
 Section: libs
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: TAO-GUI reactor integration for Tk development files
  The Tk resource factory integrates ACE TkReactor into TAO ORB reactor.
 
 Package: libtao-tkresource-dev
 Architecture: any
 Section: libdevel
-Depends: libtao-tkresource-1.6.9 (= ${binary:Version}), libace-tkreactor-dev (= ${binary:Version}), libtao-dev (= ${binary:Version})
+Depends: ${misc:Depends}, libtao-tkresource-1.7.5 (= ${binary:Version}), libace-tkreactor-dev (= ${binary:Version}), libtao-dev (= ${binary:Version})
 Description: TAO-GUI reactor integration for Tk development files
  This package contains header files and static library for the TAO-Tk
  reactor integration.
 
-Package: libtao-foxresource-1.6.9
+Package: libtao-foxresource-1.7.5
 Architecture: any
 Section: libs
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: TAO-GUI reactor integration for FOX
  The Fl resource factory integrates ACE FoxReactor into TAO ORB reactor.
 
 Package: libtao-foxresource-dev
 Architecture: any
 Section: libdevel
-Depends: libtao-foxresource-1.6.9 (= ${binary:Version}), libace-foxreactor-dev (= ${binary:Version}), libtao-dev (= ${binary:Version})
+Depends: ${misc:Depends}, libtao-foxresource-1.7.5 (= ${binary:Version}), libace-foxreactor-dev (= ${binary:Version}), libtao-dev (= ${binary:Version})
 Description: TAO-GUI reactor integration for FOX development files
  This package contains header files and static library for the TAO-FOX
  reactor integration.
@@ -430,7 +431,7 @@ Description: TAO-GUI reactor integration for FOX development files
 Package: tao-idl
 Architecture: any
 Section: devel
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: TAO IDL to C++ compiler
  This package provides a Interface Definition Language (IDL) to C++ compiler.
  .
@@ -440,7 +441,7 @@ Description: TAO IDL to C++ compiler
 Package: tao-ifr
 Architecture: any
 Section: devel
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: TAO interface repository
  CORBA-aware programs can contact an interface repository to get objects
  interfaces at run-time. Then they can use the Dynamic Invocation
@@ -453,7 +454,7 @@ Description: TAO interface repository
 Package: tao-imr
 Architecture: any
 Section: devel
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: TAO implementation repository
  An implementation repository activates CORBA servers on demand.
  .
@@ -465,7 +466,7 @@ Description: TAO implementation repository
 Package: tao-ft
 Architecture: any
 Section: devel
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: TAO fault tolerant services
  TAO supports Fault Tolerance for CORBA Objects.
  .
@@ -477,7 +478,7 @@ Description: TAO fault tolerant services
 Package: tao-utils
 Architecture: any
 Section: devel
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
 Suggests: tao-naming
 Description: TAO naming service and IOR utilities
  This package includes programs to query or control a CORBA naming
@@ -492,7 +493,7 @@ Description: TAO naming service and IOR utilities
 Package: tao-naming
 Architecture: any
 Section: devel
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
 Recommends: tao-utils
 Description: TAO naming service
  TAO implementation of CORBA interoperable naming service (INS).
@@ -504,7 +505,7 @@ Description: TAO naming service
 Package: tao-trading
 Architecture: any
 Section: devel
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: TAO trading service
  TAO implementation of CORBA trading service.
  .
@@ -514,7 +515,7 @@ Description: TAO trading service
 Package: tao-event
 Architecture: any
 Section: devel
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: TAO event service
  An event service creates channels where suppliers and consumers
  can push or pull events. This channel enables asynchronous, message
@@ -526,7 +527,7 @@ Description: TAO event service
 Package: tao-rtevent
 Architecture: any
 Section: devel
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: TAO real-time event service
  Another TAO implementation of CORBA event service. For more information on
  CORBA event service have a look at tao-event package.
@@ -537,7 +538,7 @@ Description: TAO real-time event service
 Package: tao-ftrtevent
 Architecture: any
 Section: devel
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: TAO fault-tolerant real-time event service
  TAO fault-tolerant, real-time CORBA event service. For more information on
  CORBA event service have a look at tao-event package.
@@ -550,7 +551,7 @@ Description: TAO fault-tolerant real-time event service
 Package: tao-notify
 Architecture: any
 Section: devel
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: TAO notification service
  A notification service enhances an event service. For more information on
  CORBA event service have a look at tao-event package.
@@ -562,7 +563,7 @@ Description: TAO notification service
 Package: tao-load
 Architecture: any
 Section: devel
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: TAO load balancing service
  TAO implementation of OMG Load Balancing and Monitoring specification.
  .
@@ -573,7 +574,7 @@ Description: TAO load balancing service
 Package: tao-log
 Architecture: any
 Section: devel
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: TAO telecom log services
  TAO implementations of CORBA telecom log service.
  .
@@ -586,7 +587,7 @@ Description: TAO telecom log services
 Package: tao-scheduling
 Architecture: any
 Section: devel
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: TAO scheduling service
  TAO implementation of CORBA scheduling service.
  .
@@ -597,7 +598,7 @@ Description: TAO scheduling service
 Package: tao-concurrency
 Architecture: any
 Section: devel
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: TAO concurrency service
  A concurrency service provides a mechanism to acquire and release locks in
  a distributed system.
@@ -607,7 +608,7 @@ Description: TAO concurrency service
 Package: tao-lifecycle
 Architecture: any
 Section: devel
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: TAO lifecycle service
  The CORBA lifecycle service allows clients to create, delete, copy and move
  objects.
@@ -617,7 +618,7 @@ Description: TAO lifecycle service
 Package: tao-time
 Architecture: any
 Section: devel
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: TAO time service
  A time service offers globally synchronized time to clients.
  .
diff --git a/debianbuild/dsc b/debianbuild/dsc
index 0eb4b47c54f..3c1075fabf4 100644
--- a/debianbuild/dsc
+++ b/debianbuild/dsc
@@ -1,10 +1,10 @@
 # Format: 1.0
 # Source: ace
-# Version: 1.5.7
+# Version: 1.7.5
 # Binary: ace
 # Maintainer: Johnny Willemsen  <jwillemsen@remedy.nl>
 # Architecture: any
 # Build-Depends: g++
 # Files:
-#  d57283ebb8157ae919762c58419353c8 133282 ACE+TAO+CIAO-src-5.6.7.tar.bz2
+#  <hash> <size> ACE+TAO+CIAO-src-5.7.5.tar.bz2
 #
diff --git a/debianbuild/libace-5.7.5.docs b/debianbuild/libace-5.7.5.docs
new file mode 100644
index 00000000000..e367841dc93
--- /dev/null
+++ b/debianbuild/libace-5.7.5.docs
@@ -0,0 +1,8 @@
+ACE_wrappers/README
+ACE_wrappers/VERSION
+ACE_wrappers/AUTHORS
+ACE_wrappers/FAQ
+ACE_wrappers/PROBLEM-REPORT-FORM
+ACE_wrappers/THANKS
+ACE_wrappers/VERSION
+ACE_wrappers/NEWS
diff --git a/debianbuild/libace-5.7.5.install b/debianbuild/libace-5.7.5.install
new file mode 100644
index 00000000000..c1cbf26a13f
--- /dev/null
+++ b/debianbuild/libace-5.7.5.install
@@ -0,0 +1 @@
+usr/lib/libACE-*.so*
diff --git a/debianbuild/libace-flreactor-5.7.5.install b/debianbuild/libace-flreactor-5.7.5.install
new file mode 100644
index 00000000000..550aa832bf0
--- /dev/null
+++ b/debianbuild/libace-flreactor-5.7.5.install
@@ -0,0 +1 @@
+usr/lib/libACE_FlReactor-*.so*
diff --git a/debianbuild/libace-foxreactor-5.7.5.install b/debianbuild/libace-foxreactor-5.7.5.install
new file mode 100644
index 00000000000..fd0fc562b85
--- /dev/null
+++ b/debianbuild/libace-foxreactor-5.7.5.install
@@ -0,0 +1 @@
+usr/lib/libACE_FoxReactor-*.so*
diff --git a/debianbuild/libace-htbp-5.7.5.install b/debianbuild/libace-htbp-5.7.5.install
new file mode 100644
index 00000000000..9467b8be94b
--- /dev/null
+++ b/debianbuild/libace-htbp-5.7.5.install
@@ -0,0 +1 @@
+usr/lib/libACE_HTBP-*.so*
diff --git a/debianbuild/libace-qtreactor-5.7.5.install b/debianbuild/libace-qtreactor-5.7.5.install
new file mode 100644
index 00000000000..7b9064dfd86
--- /dev/null
+++ b/debianbuild/libace-qtreactor-5.7.5.install
@@ -0,0 +1 @@
+usr/lib/libACE_QtReactor-*.so*
diff --git a/debianbuild/libace-rmcast-5.7.5.install b/debianbuild/libace-rmcast-5.7.5.install
new file mode 100644
index 00000000000..20aeea4c29b
--- /dev/null
+++ b/debianbuild/libace-rmcast-5.7.5.install
@@ -0,0 +1 @@
+usr/lib/libACE_RMCast-*.so*
diff --git a/debianbuild/libace-ssl-5.7.5.install b/debianbuild/libace-ssl-5.7.5.install
new file mode 100644
index 00000000000..46f38fe8510
--- /dev/null
+++ b/debianbuild/libace-ssl-5.7.5.install
@@ -0,0 +1 @@
+usr/lib/libACE_SSL-*.so*
diff --git a/debianbuild/libace-tkreactor-5.7.5.install b/debianbuild/libace-tkreactor-5.7.5.install
new file mode 100644
index 00000000000..38a14bc655f
--- /dev/null
+++ b/debianbuild/libace-tkreactor-5.7.5.install
@@ -0,0 +1 @@
+usr/lib/libACE_TkReactor-*.so*
diff --git a/debianbuild/libace-tmcast-5.7.5.install b/debianbuild/libace-tmcast-5.7.5.install
new file mode 100644
index 00000000000..024bf2de1bb
--- /dev/null
+++ b/debianbuild/libace-tmcast-5.7.5.install
@@ -0,0 +1 @@
+usr/lib/libACE_TMCast-*.so*
diff --git a/debianbuild/libace-xtreactor-5.7.5.install b/debianbuild/libace-xtreactor-5.7.5.install
new file mode 100644
index 00000000000..f981828eb55
--- /dev/null
+++ b/debianbuild/libace-xtreactor-5.7.5.install
@@ -0,0 +1 @@
+usr/lib/libACE_XtReactor-*.so*
diff --git a/debianbuild/libacexml-5.7.5.docs b/debianbuild/libacexml-5.7.5.docs
new file mode 100644
index 00000000000..4ebd1c55c18
--- /dev/null
+++ b/debianbuild/libacexml-5.7.5.docs
@@ -0,0 +1 @@
+ACE_wrappers/ACEXML/README
diff --git a/debianbuild/libacexml-5.7.5.install b/debianbuild/libacexml-5.7.5.install
new file mode 100644
index 00000000000..2c0837e6b38
--- /dev/null
+++ b/debianbuild/libacexml-5.7.5.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/debianbuild/libkokyu-5.7.5.docs b/debianbuild/libkokyu-5.7.5.docs
new file mode 100644
index 00000000000..35ee2dbe99c
--- /dev/null
+++ b/debianbuild/libkokyu-5.7.5.docs
@@ -0,0 +1 @@
+ACE_wrappers/Kokyu/README
diff --git a/debianbuild/libkokyu-5.7.5.install b/debianbuild/libkokyu-5.7.5.install
new file mode 100644
index 00000000000..6bd63ce5377
--- /dev/null
+++ b/debianbuild/libkokyu-5.7.5.install
@@ -0,0 +1 @@
+usr/lib/libKokyu-*.so*
diff --git a/debianbuild/libtao-1.7.5.docs b/debianbuild/libtao-1.7.5.docs
new file mode 100644
index 00000000000..a79beab3449
--- /dev/null
+++ b/debianbuild/libtao-1.7.5.docs
@@ -0,0 +1,4 @@
+ACE_wrappers/TAO/README
+ACE_wrappers/TAO/VERSION
+ACE_wrappers/TAO/PROBLEM-REPORT-FORM
+ACE_wrappers/TAO/NEWS
diff --git a/debianbuild/libtao-1.7.5.install b/debianbuild/libtao-1.7.5.install
new file mode 100644
index 00000000000..38fc18caa42
--- /dev/null
+++ b/debianbuild/libtao-1.7.5.install
@@ -0,0 +1,33 @@
+usr/lib/libTAO-*.so*
+usr/lib/libTAO_AnyTypeCode-*.so*
+usr/lib/libTAO_BiDirGIOP-*.so*
+usr/lib/libTAO_CodecFactory-*.so*
+usr/lib/libTAO_Codeset-*.so*
+usr/lib/libTAO_Compression-*.so*
+usr/lib/libTAO_CSD_Framework-*.so*
+usr/lib/libTAO_CSD_ThreadPool-*.so*
+usr/lib/libTAO_DynamicAny-*.so*
+usr/lib/libTAO_DynamicInterface-*.so*
+usr/lib/libTAO_EndpointPolicy-*.so*
+usr/lib/libTAO_IFR_Client-*.so*
+usr/lib/libTAO_IORInterceptor-*.so*
+usr/lib/libTAO_IORManip-*.so*
+usr/lib/libTAO_IORTable-*.so*
+usr/lib/libTAO_Messaging-*.so*
+usr/lib/libTAO_ObjRefTemplate-*.so*
+usr/lib/libTAO_PI-*.so*
+usr/lib/libTAO_PI_Server-*.so*
+usr/lib/libTAO_PortableServer-*.so*
+usr/lib/libTAO_RTCORBA-*.so*
+usr/lib/libTAO_RTPortableServer-*.so*
+usr/lib/libTAO_RTScheduler-*.so*
+usr/lib/libTAO_SmartProxies-*.so*
+usr/lib/libTAO_Strategies-*.so*
+usr/lib/libTAO_TC-*.so*
+usr/lib/libTAO_TC_IIOP-*.so*
+usr/lib/libTAO_TypeCodeFactory-*.so*
+usr/lib/libTAO_Utils-*.so*
+usr/lib/libTAO_Valuetype-*.so*
+usr/lib/libTAO_ImR_Client-*.so*
+usr/lib/libTAO_DiffServPolicy-*.so*
+usr/lib/libTAO_ZlibCompressor-*.so*
diff --git a/debianbuild/libtao-flresource-1.7.5.install b/debianbuild/libtao-flresource-1.7.5.install
new file mode 100644
index 00000000000..5387bf74f53
--- /dev/null
+++ b/debianbuild/libtao-flresource-1.7.5.install
@@ -0,0 +1 @@
+usr/lib/libTAO_FlResource-*.so*
diff --git a/debianbuild/libtao-foxresource-1.7.5.install b/debianbuild/libtao-foxresource-1.7.5.install
new file mode 100644
index 00000000000..bfaad19f8eb
--- /dev/null
+++ b/debianbuild/libtao-foxresource-1.7.5.install
@@ -0,0 +1 @@
+usr/lib/libTAO_FoxResource-*.so*
diff --git a/debianbuild/libtao-orbsvcs-1.7.5.NEWS b/debianbuild/libtao-orbsvcs-1.7.5.NEWS
new file mode 100644
index 00000000000..ea0759e0ade
--- /dev/null
+++ b/debianbuild/libtao-orbsvcs-1.7.5.NEWS
@@ -0,0 +1,6 @@
+ace (5.4.7-11) unstable; urgency=low
+
+  The libtao-orbsvcs1.4.7c2a package was split into smaller packages.
+  Please install the tao-* packages that suit your needs.
+
+ -- Thomas Girard <thomas.g.girard@free.fr>  Sat, 23 Sep 2006 09:47:01 +0200
diff --git a/debianbuild/libtao-orbsvcs-1.7.5.install b/debianbuild/libtao-orbsvcs-1.7.5.install
new file mode 100644
index 00000000000..59883c71dea
--- /dev/null
+++ b/debianbuild/libtao-orbsvcs-1.7.5.install
@@ -0,0 +1,59 @@
+usr/lib/libTAO_AV-*.so*
+usr/lib/libTAO_CosConcurrency-*.so*
+usr/lib/libTAO_CosConcurrency_Skel-*.so*
+usr/lib/libTAO_CosConcurrency_Serv-*.so*
+usr/lib/libTAO_CosEvent-*.so*
+usr/lib/libTAO_CosEvent_Skel-*.so*
+usr/lib/libTAO_CosEvent_Serv-*.so*
+usr/lib/libTAO_CosLifeCycle-*.so*
+usr/lib/libTAO_CosLoadBalancing-*.so*
+usr/lib/libTAO_CosNaming-*.so*
+usr/lib/libTAO_CosNaming_Skel-*.so*
+usr/lib/libTAO_CosNaming_Serv-*.so*
+usr/lib/libTAO_CosNotification-*.so*
+usr/lib/libTAO_CosNotification_Persist-*.so*
+usr/lib/libTAO_CosNotification_Skel-*.so*
+usr/lib/libTAO_CosNotification_Serv-*.so*
+usr/lib/libTAO_CosNotification_MC-*.so*
+usr/lib/libTAO_CosNotification_MC_Ext-*.so*
+usr/lib/libTAO_CosProperty-*.so*
+usr/lib/libTAO_CosProperty_Skel-*.so*
+usr/lib/libTAO_CosProperty_Serv-*.so*
+usr/lib/libTAO_CosTime-*.so*
+usr/lib/libTAO_CosTrading-*.so*
+usr/lib/libTAO_CosTrading_Skel-*.so*
+usr/lib/libTAO_CosTrading_Serv-*.so*
+usr/lib/libTAO_DsEventLogAdmin-*.so*
+usr/lib/libTAO_DsEventLogAdmin_Skel-*.so*
+usr/lib/libTAO_DsEventLogAdmin_Serv-*.so*
+usr/lib/libTAO_DsLogAdmin-*.so*
+usr/lib/libTAO_DsLogAdmin_Skel-*.so*
+usr/lib/libTAO_DsLogAdmin_Serv-*.so*
+usr/lib/libTAO_DsNotifyLogAdmin-*.so*
+usr/lib/libTAO_DsNotifyLogAdmin_Skel-*.so*
+usr/lib/libTAO_DsNotifyLogAdmin_Serv-*.so*
+usr/lib/libTAO_ETCL-*.so*
+usr/lib/libTAO_FaultTolerance-*.so*
+usr/lib/libTAO_FT_ClientORB-*.so*
+usr/lib/libTAO_FT_ServerORB-*.so*
+usr/lib/libTAO_FTORB_Utils-*.so*
+usr/lib/libTAO_FTRT_EventChannel-*.so*
+usr/lib/libTAO_FtRtEvent-*.so*
+usr/lib/libTAO_FTRT_ClientORB-*.so*
+usr/lib/libTAO_HTIOP-*.so*
+usr/lib/libTAO_IFRService-*.so*
+usr/lib/libTAO_PortableGroup-*.so*
+usr/lib/libTAO_RTCORBAEvent-*.so*
+usr/lib/libTAO_RTEvent-*.so*
+usr/lib/libTAO_RTEvent_Serv-*.so*
+usr/lib/libTAO_RTEvent_Skel-*.so*
+usr/lib/libTAO_RTEventLogAdmin-*.so*
+usr/lib/libTAO_RTEventLogAdmin_Skel-*.so*
+usr/lib/libTAO_RTEventLogAdmin_Serv-*.so*
+usr/lib/libTAO_RTKokyuEvent-*.so*
+usr/lib/libTAO_RTSched-*.so*
+usr/lib/libTAO_RTSchedEvent-*.so*
+usr/lib/libTAO_RT_Notification-*.so*
+usr/lib/libTAO_SSLIOP-*.so*
+usr/lib/libTAO_Security-*.so*
+usr/lib/libTAO_Svc_Utils-*.so*
diff --git a/debianbuild/libtao-qtresource-1.7.5.install b/debianbuild/libtao-qtresource-1.7.5.install
new file mode 100644
index 00000000000..b5af230536e
--- /dev/null
+++ b/debianbuild/libtao-qtresource-1.7.5.install
@@ -0,0 +1 @@
+usr/lib/libTAO_QtResource-*.so*
diff --git a/debianbuild/libtao-tkresource-1.7.5.install b/debianbuild/libtao-tkresource-1.7.5.install
new file mode 100644
index 00000000000..9de803ef62b
--- /dev/null
+++ b/debianbuild/libtao-tkresource-1.7.5.install
@@ -0,0 +1 @@
+usr/lib/libTAO_TkResource-*.so*
diff --git a/debianbuild/libtao-xtresource-1.7.5.install b/debianbuild/libtao-xtresource-1.7.5.install
new file mode 100644
index 00000000000..b6a1ca56d3c
--- /dev/null
+++ b/debianbuild/libtao-xtresource-1.7.5.install
@@ -0,0 +1 @@
+usr/lib/libTAO_XtResource-*.so*
diff --git a/debianbuild/patches/18-fix-bswap-detection.dpatch b/debianbuild/patches/18-fix-bswap-detection.dpatch
deleted file mode 100644
index 95521e2328d..00000000000
--- a/debianbuild/patches/18-fix-bswap-detection.dpatch
+++ /dev/null
@@ -1,35 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 18-fix-bswap-detection.dpatch by Thomas Girard <thomas.g.girard@free.fr>
-##
-## DP: taken from upstream: fix bswap autoconf detection
-@DPATCH@
---- ACE_wrappers.orig/configure.ac
-+++ ACE_wrappers/configure.ac
-@@ -3445,15 +3445,24 @@
- 
- ACE_CHECK_HAS_DEFINES([bswap16])
- if test "$ace_cv_defined_bswap16" = no; then
--  ACE_CHECK_HAS_DEFINES([bswap_16])
-+  ACE_CHECK_HAS_DEFINES([bswap_16],[],[],[
-+#if ACE_HAS_BYTESWAP_H
-+#include <byteswap.h>
-+#endif])
- fi
- ACE_CHECK_HAS_DEFINES([bswap32])
- if test "$ace_cv_defined_bswap32" = no; then
--  ACE_CHECK_HAS_DEFINES([bswap_32])
-+  ACE_CHECK_HAS_DEFINES([bswap_32],[],[],[
-+#if ACE_HAS_BYTESWAP_H
-+#include <byteswap.h>
-+#endif])
- fi
- ACE_CHECK_HAS_DEFINES([bswap64])
- if test "$ace_cv_defined_bswap64" = no; then
--  ACE_CHECK_HAS_DEFINES([bswap_64])
-+  ACE_CHECK_HAS_DEFINES([bswap_64],[],[],[
-+#if ACE_HAS_BYTESWAP_H
-+#include <byteswap.h>
-+#endif])
- fi
- 
- ACE_CHECK_LACKS_FUNCS(chdir)
diff --git a/debianbuild/patches/22-tao_idl-64bit-fix.dpatch b/debianbuild/patches/22-tao_idl-64bit-fix.dpatch
deleted file mode 100644
index b93cf6d87e2..00000000000
--- a/debianbuild/patches/22-tao_idl-64bit-fix.dpatch
+++ /dev/null
@@ -1,65 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 22-tao_idl-64bit-fix.dpatch by Thomas Girard <thomas.g.girard@free.fr>
-##
-## DP: backport 64bit fix for tao_idl from upstream
-@DPATCH@
---- ACE_wrappers/TAO/TAO_IDL/be/be_helper.cpp-	2008-11-04 22:18:23.000000000 +0100
-+++ ACE_wrappers/TAO/TAO_IDL/be/be_helper.cpp	2008-11-04 22:19:14.000000000 +0100
-@@ -360,7 +360,7 @@
- 
-   return *this;
- }
--#if defined (ACE_WIN64) || ! (! defined (ACE_HAS_UINT64_T) && ACE_SIZEOF_LONG == 8)
-+
- TAO_OutStream &
- TAO_OutStream::operator<< (const ACE_CDR::ULongLong num)
- {
-@@ -380,26 +380,6 @@
- 
-   return *this;
- }
--#endif
--TAO_OutStream &
--TAO_OutStream::operator<< (const unsigned long num)
--{
--  ACE_OS::fprintf (this->fp_,
--                   "%lu",
--                   num);
--
--  return *this;
--}
--
--TAO_OutStream &
--TAO_OutStream::operator<< (const long num)
--{
--  ACE_OS::fprintf (this->fp_,
--                   "%ld",
--                   num);
--
--  return *this;
--}
- 
- TAO_OutStream &
- TAO_OutStream::operator<< (const TAO_NL&)
---- ACE_wrappers/TAO/TAO_IDL/be_include/be_helper.h-	2008-11-04 22:14:08.000000000 +0100
-+++ ACE_wrappers/TAO/TAO_IDL/be_include/be_helper.h	2008-11-04 22:16:53.000000000 +0100
-@@ -174,18 +174,12 @@
- 
-   TAO_OutStream &operator<< (const ACE_CDR::Long num);
-   // output the integer and return a reference to ourselves
--#if defined (ACE_WIN64) || ! (! defined (ACE_HAS_UINT64_T) && ACE_SIZEOF_LONG == 8)
-+
-   TAO_OutStream &operator<< (const ACE_CDR::ULongLong num);
-   // output the integer and return a reference to ourselves
- 
-   TAO_OutStream &operator<< (const ACE_CDR::LongLong num);
-   // output the integer and return a reference to ourselves
--#endif
--  TAO_OutStream &operator<< (const unsigned long num);
--  // output the integer and return a reference to ourselves
--
--  TAO_OutStream &operator<< (const long num);
--  // output the integer and return a reference to ourselves
- 
-   // = MANIPULATORS
- 
diff --git a/debianbuild/rules b/debianbuild/rules
index 4eb6078903b..a3650fa1d82 100644
--- a/debianbuild/rules
+++ b/debianbuild/rules
@@ -6,9 +6,6 @@
 # Copyright (C) 2004  Raphael Bossek <bossekr@debian.org>
 # Copyright © 2005-2008 Thomas Girard <thomas.g.girard@free.fr>
 
-# This is the debhelper compatibility version to use.
-export DH_COMPAT=4
-
 INSTALL := install -o root -g root
 INSTALL_755 := $(INSTALL) -m 755
 
@@ -54,6 +51,8 @@ endif
 export ACE_ROOT := $(shell pwd)/$(ACE_SUBDIR)
 export TAO_ROOT := $(ACE_ROOT)/TAO
 export CIAO_ROOT := $(TAO_ROOT)/CIAO
+export DANCE_ROOT := $(CIAO_ROOT)/DAnCE
+export DDS_ROOT := $(CIAO_ROOT)/connectors/dds4ccm
 export LD_LIBRARY_PATH := $(LD_LIBRARY_PATH):$(ACE_ROOT)/lib
 export QTDIR := /usr/share/qt4
 
@@ -122,7 +121,39 @@ ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
 endif
 
 autotools-stamp: prepatch-stamp
+	patch -p0 < debian/patches/93-hack-to-fix-libtoolize.dpatch
+	patch -p1 -d $(ACE_ROOT) < debian/patches/94-build-crosscompile.dpatch
+	patch -p1 -d $(TAO_ROOT) < debian/patches/94-build-crosscompile.dpatch
+	patch -p1 -d $(ACE_ROOT) < debian/patches/95-build-ace-for-tao.dpatch
+	patch -p1 -d $(ACE_ROOT) < debian/patches/96-build-athena3d.dpatch
 	cd $(ACE_ROOT) && bin/bootstrap
+
+#	cd $(ACE_ROOT) && autoconf && autoheader && aclocal && automake && libtoolize
+#	cd $(TAO_ROOT) && autoconf && autoheader && aclocal && automake && libtoolize
+
+#	echo "ACE_ROOT - autoconf"
+#	autoconf
+#	echo "ACE_ROOT - autoheader"
+#	autoheader
+#	echo "ACE_ROOT - aclocal"
+#	aclocal
+#	echo "ACE_ROOT - automake"
+#	automake
+#	echo "ACE_ROOT - libtoolize"
+#	libtoolize
+
+#	cd $(TAO_ROOT)
+#	echo "TAO_ROOT - autoconf"
+#	autoconf
+#	echo "TAO_ROOT - autoheader"
+#	autoheader
+#	echo "TAO_ROOT - aclocal"
+#	aclocal
+#	echo "TAO_ROOT - automake"
+#	automake
+#	echo "TAO_ROOT - libtoolize"
+#	libtoolize
+
 	touch $@
 
 .PHONY: autotools
diff --git a/docs/Download.html b/docs/Download.html
index 9bbd0cc3049..0dcea8645ed 100644
--- a/docs/Download.html
+++ b/docs/Download.html
@@ -84,101 +84,101 @@ of the ACE, TAO, and CIAO micro release kit is available for
   <TR><TH>Filename</TH><TH>Description</TH><TH>Full</TH><TH>Sources only</TH></TR>
   <TR><TD>ACE+TAO+CIAO.tar.gz</TD>
       <TD>ACE+TAO+CIAO (tar+gzip format)</TD>
-      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-5.7.4.tar.gz">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-5.7.4.tar.gz">FTP</A>]
+      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-5.7.5.tar.gz">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-5.7.5.tar.gz">FTP</A>]
       </TD>
-      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-src-5.7.4.tar.gz">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-src-5.7.4.tar.gz">FTP</A>]
+      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-src-5.7.5.tar.gz">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-src-5.7.5.tar.gz">FTP</A>]
       </TD>
   </TR>
   <TR><TD>ACE+TAO+CIAO.tar.bz2</TD>
       <TD>ACE+TAO+CIAO (tar+bzip2 format)</TD>
-      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-5.7.4.tar.bz2">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-5.7.4.tar.bz2">FTP</A>]
+      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-5.7.5.tar.bz2">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-5.7.5.tar.bz2">FTP</A>]
       </TD>
-      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-src-5.7.4.tar.bz2">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-src-5.7.4.tar.bz2">FTP</A>]
+      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-src-5.7.5.tar.bz2">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-src-5.7.5.tar.bz2">FTP</A>]
       </TD>
   </TR>
   <TR><TD>ACE+TAO+CIAO.zip</TD>
       <TD>ACE+TAO+CIAO (zip format)</TD>
-      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-5.7.4.zip">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-5.7.4.zip">FTP</A>]
+      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-5.7.5.zip">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-5.7.5.zip">FTP</A>]
       </TD>
-      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-src-5.7.4.zip">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-src-5.7.4.zip">FTP</A>]
+      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-src-5.7.5.zip">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-src-5.7.5.zip">FTP</A>]
       </TD>
   </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-5.7.4.tar.gz">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-5.7.4.tar.gz">FTP</A>]
+      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-5.7.5.tar.gz">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-5.7.5.tar.gz">FTP</A>]
       </TD>
-      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-5.7.4.tar.gz">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-5.7.4.tar.gz">FTP</A>]
+      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-5.7.5.tar.gz">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-5.7.5.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-5.7.4.tar.bz2">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-5.7.4.tar.bz2">FTP</A>]
+      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-5.7.5.tar.bz2">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-5.7.5.tar.bz2">FTP</A>]
       </TD>
-      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-5.7.4.tar.bz2">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-5.7.4.tar.bz2">FTP</A>]
+      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-5.7.5.tar.bz2">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-5.7.5.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-5.7.4.zip">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-5.7.4.zip">FTP</A>]
+      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-5.7.5.zip">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-5.7.5.zip">FTP</A>]
       </TD>
-      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-5.7.4.zip">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-5.7.4.zip">FTP</A>]
+      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-5.7.5.zip">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-5.7.5.zip">FTP</A>]
       </TD>
   </TR>
   <TR><TD>ACE-html.tar.gz</TD>
       <TD>Doxygen documentation for ACE+TAO+CIAO (tar+gzip format)</TD>
-      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-html-5.7.4.tar.gz">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-html-5.7.4.tar.gz">FTP</A>]
+      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-html-5.7.5.tar.gz">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-html-5.7.5.tar.gz">FTP</A>]
       </TD>
   </TR>
   <TR><TD>ACE-html.tar.bz2</TD>
       <TD>Doxygen documentation for ACE+TAO+CIAO (tar+bzip2 format)</TD>
-      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-html-5.7.4.tar.bz2">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-html-5.7.4.tar.bz2">FTP</A>]
+      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-html-5.7.5.tar.bz2">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-html-5.7.5.tar.bz2">FTP</A>]
       </TD>
   </TR>
   <TR><TD>ACE-html.zip</TD>
       <TD>Doxygen documentation for ACE+TAO+CIAO (zip format)</TD>
-      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-html-5.7.4.zip">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-html-5.7.4.zip">FTP</A>]
+      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-html-5.7.5.zip">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-html-5.7.5.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-5.7.4.tar.gz">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-5.7.4.tar.gz">FTP</A>]
+      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-5.7.5.tar.gz">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-5.7.5.tar.gz">FTP</A>]
       </TD>
-      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-src-5.7.4.tar.gz">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-src-5.7.4.tar.gz">FTP</A>]
+      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-src-5.7.5.tar.gz">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-src-5.7.5.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-5.7.4.tar.bz2">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-5.7.4.tar.bz2">FTP</A>]
+      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-5.7.5.tar.bz2">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-5.7.5.tar.bz2">FTP</A>]
       </TD>
-      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-src-5.7.4.tar.bz2">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-src-5.7.4.tar.bz2">FTP</A>]
+      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-src-5.7.5.tar.bz2">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-src-5.7.5.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-5.7.4.zip">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-5.7.4.zip">FTP</A>]
+      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-5.7.5.zip">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-5.7.5.zip">FTP</A>]
       </TD>
-      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-src-5.7.4.zip">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-src-5.7.4.zip">FTP</A>]
+      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-src-5.7.5.zip">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-src-5.7.5.zip">FTP</A>]
       </TD>
   </TR>
 </TABLE>
diff --git a/docs/svn/svn-prefs.reg b/docs/svn/svn-prefs.reg
index 815164a445e..88cde866921 100644
--- a/docs/svn/svn-prefs.reg
+++ b/docs/svn/svn-prefs.reg
@@ -52,6 +52,7 @@ REGEDIT4
 "*.idl"="svn:eol-style=native;svn:keywords=Author Date Id Revision"
 "*.idl3"="svn:eol-style=native;svn:keywords=Author Date Id Revision"
 "*.idl3p"="svn:eol-style=native;svn:keywords=Author Date Id Revision"
+"*.idl3+"="svn:eol-style=native;svn:keywords=Author Date Id Revision"
 "*.pidl"="svn:eol-style=native;svn:keywords=Author Date Id Revision"
 "*.cidl"="svn:eol-style=native;svn:keywords=Author Date Id Revision"
 "*.html"="svn:eol-style=native;svn:keywords=Author Date Id Revision"
diff --git a/etc/index.html b/etc/index.html
index fa79377fb60..43495c31cc3 100644
--- a/etc/index.html
+++ b/etc/index.html
@@ -35,6 +35,7 @@
     <hr>
     We do have the documentation for previous releases
     <ul>
+      <LI><P><A HREF="5.7.5/html">5.7.5</A></P></LI>
       <LI><P><A HREF="5.7.4/html">5.7.4</A></P></LI>
       <LI><P><A HREF="5.7.3/html">5.7.3</A></P></LI>
       <LI><P><A HREF="5.7.2/html">5.7.2</A></P></LI>
diff --git a/examples/Export/run_test.pl b/examples/Export/run_test.pl
index 11e98b17b94..e77d07e2c81 100755
--- a/examples/Export/run_test.pl
+++ b/examples/Export/run_test.pl
@@ -6,12 +6,18 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 # -*- perl -*-
 
 use lib "$ENV{ACE_ROOT}/bin";
-use PerlACE::Run_Test;
+use PerlACE::TestTarget;
 
-$TEST = new PerlACE::Process ("test");
+my $server = PerlACE::TestTarget::create_target (1) || die "Create target 1 failed\n";
 
-$status = $TEST->SpawnWaitKill (20);
+$SV = $server->CreateProcess ("test");
 
-$status = 1 if ($status < 0);
+$test = $SV->SpawnWaitKill ($server->ProcessStartWaitInterval());
+
+if ($test != 0) {
+    print STDERR "ERROR: test returned $test\n";
+    exit 1;
+}
+
+exit 0;
 
-exit $status;
diff --git a/html/Stats/index.shtml b/html/Stats/index.shtml
index ced61281cbb..242ff09e777 100644
--- a/html/Stats/index.shtml
+++ b/html/Stats/index.shtml
@@ -50,7 +50,7 @@ In addition to the statistics described above, a number of other ACE/TAO/CIAO de
   <a href="http://www.dre.vanderbilt.edu/Scoreboard/">Automated Builds</a>
 </li>
 <li>
-  <a href="http://www.dre.vanderbilt.edu/~isisbuilds/auto_compile_logs/isislab/emulab/FC6xampler/Template-Display/_Report/">Xampler Performance benchmarks</a>
+  Xampler Performance benchmarks for <a href="http://www.dre.vanderbilt.edu/~isisbuilds/auto_compile_logs/isislab/emulab/FC6xampler/Template-Display/_Report/">x86</a> and <a href="http://www.dre.vanderbilt.edu/~remedynl/ps3xampler/ps3xampler/_Report/">IBM Cell</a>
 </li>
 <li>
   <a href="http://www.dre.vanderbilt.edu/Stats/CORBAecompact/">Footprint CORBA/e compact</a>
diff --git a/include/makeinclude/platform_linux_common.GNU b/include/makeinclude/platform_linux_common.GNU
index 8a19abcdde1..06d58031f97 100644
--- a/include/makeinclude/platform_linux_common.GNU
+++ b/include/makeinclude/platform_linux_common.GNU
@@ -118,6 +118,26 @@ SYSARCH := $(shell uname -m)
 ifeq ($(insure),1)
   CC  = insure
   CXX = insure
+else
+  ifneq ($(CROSS_COMPILE),)
+    # Build using the cross-tools
+    CC  = ${CROSS_COMPILE}gcc
+    CXX = ${CROSS_COMPILE}g++
+    AR  = ${CROSS_COMPILE}ar
+    # Cross-linker requires this for linked in shared libs that depend
+    # themselves on other shared libs (not directly linked in)
+    LDFLAGS += -Wl,-rpath-link,$(ACE_ROOT)/lib
+    ifneq (,$(HOST_ROOT))
+      TAO_IDLFLAGS += -g $(HOST_ROOT)/bin/ace_gperf
+      TAO_IDL = $(HOST_ROOT)/bin/tao_idl
+      TAO_IDL3_TO_IDL2 = $(HOST_ROOT)/bin/tao_idl3_to_idl2
+      TAO_IDL_DEP = $(TAO_IDL)
+      TAO_IDL3_TO_IDL2_DEP = $(TAO_IDL3_TO_IDL2)
+      # make sure to use the target compiler, not the cross-compiler
+      # as preprocessor for the cross-compiled idl tools
+      TAO_IDL_PREPROCESSOR = gcc
+    endif
+  endif
 endif
 
 PIC      = -fPIC
diff --git a/include/makeinclude/platform_macosx_iphone.GNU b/include/makeinclude/platform_macosx_iphone.GNU
new file mode 100644
index 00000000000..cadbb4a78e7
--- /dev/null
+++ b/include/makeinclude/platform_macosx_iphone.GNU
@@ -0,0 +1,38 @@
+# $Id$
+
+include $(ACE_ROOT)/include/makeinclude/platform_macosx_common.GNU
+
+XCODE:=/Developer
+
+ifeq ($(IPHONE_TARGET), SIMULATOR)
+  IPHONE_PLATFORM:=$(XCODE)/Platforms/iPhoneSimulator.platform/Developer
+  IPHONE_SDK:=$(IPHONE_PLATFORM)/SDKs/iPhoneSimulator${IPHONE_VERSION}.sdk
+  IPHONE_HARDWARE_ARCHITECTURE=i386
+endif
+
+ifeq ($(IPHONE_TARGET), HARDWARE)
+  IPHONE_PLATFORM:=$(XCODE)/Platforms/iPhoneOS.platform/Developer
+  IPHONE_SDK:=$(IPHONE_PLATFORM)/SDKs/iPhoneOS${IPHONE_VERSION}.sdk
+  IPHONE_HARDWARE_ARCHITECTURE=armv6
+endif
+
+CC:=$(IPHONE_PLATFORM)/usr/bin/gcc
+CXX:=$(IPHONE_PLATFORM)/usr/bin/g++
+AR:=$(IPHONE_PLATFORM)/usr/bin/ar
+RANLIB:=$(IPHONE_PLATFORM)/usr/bin/ranlib
+DLD = $(CXX)
+LD  = $(CXX)
+CFLAGS   += -arch $(IPHONE_HARDWARE_ARCHITECTURE) -isysroot $(IPHONE_SDK)
+CXXFLAGS += -arch $(IPHONE_HARDWARE_ARCHITECTURE) -isysroot $(IPHONE_SDK)
+
+ifneq (,$(HOST_ROOT))
+  TAO_IDLFLAGS += -g $(HOST_ROOT)/bin/ace_gperf
+  TAO_IDL = $(HOST_ROOT)/bin/tao_idl
+  TAO_IDL3_TO_IDL2 = $(HOST_ROOT)/bin/tao_idl3_to_idl2
+  TAO_IDL_DEP = $(TAO_IDL)
+  TAO_IDL3_TO_IDL2_DEP = $(TAO_IDL3_TO_IDL2)
+  # make sure to use the target compiler, not the cross-compiler
+  # as preprocessor for the cross-compiled idl tools
+  TAO_IDL_PREPROCESSOR = gcc
+endif
+
diff --git a/rpmbuild/ace-tao-ciao.spec b/rpmbuild/ace-tao.spec
index 48ef30aafa1..ae1a82bc35a 100644
--- a/rpmbuild/ace-tao-ciao.spec
+++ b/rpmbuild/ace-tao.spec
@@ -1,7 +1,7 @@
 # Set the version number here.
-%define ACEVER  5.7.4
-%define TAOVER  1.7.4
-%define CIAOVER 0.7.4
+%define ACEVER  5.7.5
+%define TAOVER  1.7.5
+%define CIAOVER 0.7.5
 
 # Conditional build
 # Default values are
@@ -62,7 +62,7 @@ URL:          http://www.cs.wustl.edu/~schmidt/ACE.html
 License:      DOC License
 Source0:      http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-src-%{ACEVER}.tar.gz
 Source1:      ace-tao-rpmlintrc
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRoot:    %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %if 0%{?centos_version}
 %define _extension .gz
@@ -177,7 +177,7 @@ BuildRequires: fox16-devel
 NoSource: 0
 %endif
 
-%description
+%description -n ace-tao
 
 The ADAPTIVE Communication Environment (ACE) is a freely available,
 open-source object-oriented (OO) framework that implements many core
diff --git a/tests/Basic_Types_Test.cpp b/tests/Basic_Types_Test.cpp
index 7a864720841..2372defb539 100644
--- a/tests/Basic_Types_Test.cpp
+++ b/tests/Basic_Types_Test.cpp
@@ -290,10 +290,19 @@ run_main (int, ACE_TCHAR *[])
       ++errors;
     }
 
+  ACE_UINT16 test_val = 123;
 #if defined (ACE_LITTLE_ENDIAN)
   ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("little endian\n")));
+  if (ACE_HTONS (test_val) == test_val)
+    ACE_ERROR ((LM_ERROR,
+                ACE_TEXT ("Endian test: %d == %d but should be different\n"),
+                ACE_HTONS (test_val), test_val));
 #elif defined (ACE_BIG_ENDIAN)
   ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("big endian\n")));
+  if (ACE_HTONS (test_val) != test_val)
+    ACE_ERROR ((LM_ERROR,
+                ACE_TEXT ("Endian test: %d != %d but should be equal\n"),
+                ACE_HTONS (test_val), test_val));
 #else
   ACE_ERROR ((LM_ERROR,
               ACE_TEXT ("assertion failed: no ACE_*_ENDIAN definition!\n")));
diff --git a/tests/Bug_3334_Regression_Test.cpp b/tests/Bug_3334_Regression_Test.cpp
index f3e0ff4c815..b158e70731f 100644
--- a/tests/Bug_3334_Regression_Test.cpp
+++ b/tests/Bug_3334_Regression_Test.cpp
@@ -15,21 +15,23 @@
 //
 // ============================================================================
 
+#undef ACE_NLOGGING
 #include "test_config.h"
+
 #include "ace/Log_Msg.h"
 #include "ace/Service_Config.h"
 
-ACE_RCSID(tests, Bug_3334_Regression_Test, "$Id$")
+ACE_RCSID (tests, Bug_3334_Regression_Test, "$Id$")
 
 int
 run_main (int, ACE_TCHAR *argv[])
 {
   ACE_START_TEST (ACE_TEXT ("Bug_3334_Regression_Test"));
 
-  ACE_TCHAR *_argv[3] = { argv[0],
+  ACE_TCHAR * _argv[3] = {argv[0],
                           const_cast<ACE_TCHAR*> (ACE_TEXT ("-f")),
                           const_cast<ACE_TCHAR*>
-                            (ACE_TEXT ("Bug_3334_Regression_Test.conf")) };
+                          (ACE_TEXT ("Bug_3334_Regression_Test.conf"))};
   int status;
   if ((status = ACE_Service_Config::open (3,
                                           _argv,
@@ -41,6 +43,7 @@ run_main (int, ACE_TCHAR *argv[])
                 ACE_TEXT ("open"),
                 1));
 
+  ACE_Service_Config::fini_svcs ();
   ACE_END_TEST;
   return status;
 }
diff --git a/tests/Future_Set_Test.cpp b/tests/Future_Set_Test.cpp
index 8f2eb9306ef..f27282809d9 100644
--- a/tests/Future_Set_Test.cpp
+++ b/tests/Future_Set_Test.cpp
@@ -11,7 +11,7 @@
 // = DESCRIPTION
 //    This example tests the ACE Future Set and illustrates an
 //    implementation of the Active Object pattern, which is available
-//    at <http://www.cs.wustl.edu/~schmidt/Act-Obj.ps.gz>.  The
+//    at <http://www.cs.wustl.edu/~schmidt/PDF/Act-Obj.pdf>.  The
 //    Active Object itself is very simple -- it determines if numbers
 //    are prime.
 //
diff --git a/tests/Message_Queue_Test.cpp b/tests/Message_Queue_Test.cpp
index ac8a7135a8b..fbf029bc5eb 100644
--- a/tests/Message_Queue_Test.cpp
+++ b/tests/Message_Queue_Test.cpp
@@ -123,7 +123,7 @@ Counting_Test_Producer::svc (void)
   // correct.
   // Also, to be sure there's not just 1 producer and 1 consumer pinging
   // back and forth, make the producers randomly delay between blocks.
-  ACE_OS::srand ((u_int) ACE_OS::time ());
+  ACE_OS::srand (static_cast<ACE_RANDR_TYPE> (ACE_OS::time ()));
   int multiple = ACE_OS::rand () % 10;
   int delay_ms = (ACE_OS::rand () % 10) / 2;
   // The delay usually causes the test to time out in the automated
@@ -213,8 +213,7 @@ Counting_Test_Consumer::svc (void)
   // a calculated number of blocks then stop; the test checker will determine
   // if the number consumed plus the number remaining is correct for the
   // number produced.
-  
-  ACE_RANDR_TYPE seed = ACE_OS::time ();
+  ACE_RANDR_TYPE seed = static_cast<ACE_RANDR_TYPE> (ACE_OS::time ());
 
   int multiple = ACE_OS::rand_r (seed) % 10;
   int delay_ms = ACE_OS::rand_r (seed) % 10;