Thu Nov 22 12:38:34 UTC 2012 Johnny Willemsen <jwillemsen@remedy.nl>

        * ace/Service_Config.h:
          Added new ACE_DYNAMIC_VERSIONED_SERVICE_DIRECTIVE which accepts
          an explicit version to be loaded. Needed for debian for example

        * debian/patches/series:
        * debian/patches/15-fix-lzo-flags.diff:
        * debian/patches/34-bts386713.diff:
          Cleanup

        * debian/platform_macros.GNU:
          Set versioned_so=2

        * include/makeinclude/platform_g++_common.GNU:
          When versioned_so=2 add ACE_VERSIONED_SO=2 as
          define

7 files changed, 49 insertions, 414 deletions

diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index 8ece4f422f2..830e5647adc 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,3 +1,21 @@
+Thu Nov 22 12:38:34 UTC 2012  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/Service_Config.h:
+          Added new ACE_DYNAMIC_VERSIONED_SERVICE_DIRECTIVE which accepts
+          an explicit version to be loaded. Needed for debian for example
+
+        * debian/patches/series:
+        * debian/patches/15-fix-lzo-flags.diff:
+        * debian/patches/34-bts386713.diff:
+          Cleanup
+
+        * debian/platform_macros.GNU:
+          Set versioned_so=2
+
+        * include/makeinclude/platform_g++_common.GNU:
+          When versioned_so=2 add ACE_VERSIONED_SO=2 as
+          define
+
 Thu Nov 22 09:20:46 UTC 2012  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * include/makeinclude/platform_g++_common.GNU:
diff --git a/ACE/ace/Service_Config.h b/ACE/ace/Service_Config.h
index d25e72ed280..a8616c419f8 100644
--- a/ACE/ace/Service_Config.h
+++ b/ACE/ace/Service_Config.h
@@ -57,6 +57,31 @@ class ACE_DLL;
   ACE_TEXT ("() \"") \
   ACE_TEXT (parameters) \
   ACE_TEXT ("\"")
+#if defined (ACE_VERSIONED_SO) and (ACE_VERSIONED_SO == 2)
+#define ACE_DYNAMIC_VERSIONED_SERVICE_DIRECTIVE(ident, libpathname, version, objectclass, parameters) \
+  ACE_TEXT ("dynamic ") \
+  ACE_TEXT (ident) \
+  ACE_TEXT (" Service_Object * ") \
+  ACE_TEXT (libpathname) \
+  ACE_TEXT ("-") \
+  ACE_TEXT (version) \
+  ACE_TEXT (":") \
+  ACE_TEXT (objectclass) \
+  ACE_TEXT ("() \"") \
+  ACE_TEXT (parameters) \
+  ACE_TEXT ("\"")
+#else
+#define ACE_DYNAMIC_VERSIONED_SERVICE_DIRECTIVE(ident, libpathname, version, objectclass, parameters) \
+  ACE_TEXT ("dynamic ") \
+  ACE_TEXT (ident) \
+  ACE_TEXT (" Service_Object * ") \
+  ACE_TEXT (libpathname) \
+  ACE_TEXT (":") \
+  ACE_TEXT (objectclass) \
+  ACE_TEXT ("() \"") \
+  ACE_TEXT (parameters) \
+  ACE_TEXT ("\"")
+#endif /* ACE_VERSIONED_SO */
 #define ACE_REMOVE_SERVICE_DIRECTIVE(ident) \
   ACE_TEXT ("remove ") \
   ACE_TEXT (ident)
diff --git a/ACE/debian/patches/15-fix-lzo-flags.diff b/ACE/debian/patches/15-fix-lzo-flags.diff
deleted file mode 100644
index 59d14458bc6..00000000000
--- a/ACE/debian/patches/15-fix-lzo-flags.diff
+++ /dev/null
@@ -1,22 +0,0 @@
-Description: hardcode LZO headers location
- Use LZO2 instead of LZO, and replace variable with Debian path
-Forwarded: not-needed
-Author: Thomas Girard <thomas.g.girard@free.fr>
-Last-Update: 2011-02-13
-
---- a/MPC/config/lzo1.mpb
-+++ b/MPC/config/lzo1.mpb
-@@ -8,11 +8,11 @@ feature(lzo1) {
-     LZO1_INCDIR
-     $(LZO1_ROOT)/include
-   }
--  includes += $(LZO1_INCDIR)
-+  includes += /usr/include/lzo
-   libpaths += $(LZO1_ROOT)/lib
-   specific (prop:microsoft) {
-     lit_libs += liblzo
-   } else {
--    lit_libs += lzo
-+    lit_libs += lzo2
-   }
- }
diff --git a/ACE/debian/patches/34-bts386713.diff b/ACE/debian/patches/34-bts386713.diff
deleted file mode 100644
index 5e75c7272ae..00000000000
--- a/ACE/debian/patches/34-bts386713.diff
+++ /dev/null
@@ -1,389 +0,0 @@
-Description: Hardcode TAO library names so that dynamic loading works
- ACE allows to dynamically load a library with ACE_DYNAMIC_SERVICE_DIRECTIVE
- macro, and this mechanism is used to load some TAO libraries when needed. The
- name used in macro invocations is the short library name, i.e. libfoo.so.
- .
- Debian usually ships libfoo.so symlinks in -dev packages. So to make the
- dynamic loading work without the need for the -dev package being installed,
- we use long names (libfoo-x.y.z.so) in the macro invocation.
-Forwarded: not-needed
-Author: Pau Garcia i Quiles <pgquiles@elpauer.org>
-Last-Update: 2011-06-26
-
---- pkg-ace.orig/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.cpp
-+++ pkg-ace/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.cpp
-@@ -10,7 +10,7 @@
- 
- static const char pg_poa_factory_name[] = "TAO_GOA";
- static const ACE_TCHAR pg_poa_factory_directive[] = ACE_DYNAMIC_SERVICE_DIRECTIVE(
--  "TAO_GOA", "TAO_PortableGroup", "_make_TAO_PG_Object_Adapter_Factory", "");
-+  "TAO_GOA", "libTAO_PortableGroup-2.1.2.so", "_make_TAO_PG_Object_Adapter_Factory", "");
- 
- TAO_BEGIN_VERSIONED_NAMESPACE_DECL
- 
---- pkg-ace.orig/TAO/orbsvcs/tests/Bug_3486_Regression/server.cpp
-+++ pkg-ace/TAO/orbsvcs/tests/Bug_3486_Regression/server.cpp
-@@ -18,7 +18,7 @@
- 
- ACE_TCHAR const * const scpc_loadNamingService = ACE_DYNAMIC_SERVICE_DIRECTIVE(
-   "testNamingService",
--  "TAO_CosNaming_Serv",
-+  "libTAO_CosNaming_Serv-2.1.2.so",
-   "_make_TAO_Naming_Loader",
-   ""
- );
---- pkg-ace.orig/TAO/orbsvcs/tests/Notify/Bug_2926_Regression/server.cpp
-+++ pkg-ace/TAO/orbsvcs/tests/Notify/Bug_2926_Regression/server.cpp
-@@ -20,7 +20,7 @@
- 
- ACE_TCHAR const * const scpc_loadNotifyService = ACE_DYNAMIC_SERVICE_DIRECTIVE(
-   "testNotifyService",
--  "TAO_CosNotification_Serv",
-+  "libTAO_CosNotification_Serv-2.1.2.so",
-   "_make_TAO_CosNotify_Service",
-   ""
- );
---- pkg-ace.orig/TAO/orbsvcs/tests/Notify/Bug_3252_Regression/server.cpp
-+++ pkg-ace/TAO/orbsvcs/tests/Notify/Bug_3252_Regression/server.cpp
-@@ -23,7 +23,7 @@
- 
- ACE_TCHAR const * const scpc_loadNotifyService = ACE_DYNAMIC_SERVICE_DIRECTIVE(
-   "testNotifyService",
--  "TAO_CosNotification_Serv",
-+  "libTAO_CosNotification_Serv-2.1.2.so",
-   "_make_TAO_CosNotify_Service",
-   "-UseSeparateDispatchingORB 1"
- );
---- pkg-ace.orig/TAO/orbsvcs/tests/Notify/Bug_3646b_Regression/server.cpp
-+++ pkg-ace/TAO/orbsvcs/tests/Notify/Bug_3646b_Regression/server.cpp
-@@ -20,7 +20,7 @@
- 
- ACE_TCHAR const * const scpc_loadNotifyService = ACE_DYNAMIC_SERVICE_DIRECTIVE(
-   "testNotifyService",
--  "TAO_Notify_Service",
-+  "libTAO_Notify_Service-2.1.2.so",
-   "_make_TAO_Notify_Service_Driver",
-   "-NoNameSvc -RunThreads 0"
- );
---- pkg-ace.orig/TAO/orbsvcs/tests/Notify/Bug_3646c_Regression/server.cpp
-+++ pkg-ace/TAO/orbsvcs/tests/Notify/Bug_3646c_Regression/server.cpp
-@@ -23,7 +23,7 @@
- 
- ACE_TCHAR scpc_loadNotifyService[max_length] = ACE_DYNAMIC_SERVICE_DIRECTIVE(
-   "testNotifyService",
--  "TAO_Notify_Service",
-+  "libTAO_Notify_Service-2.1.2.so",
-   "_make_TAO_Notify_Service_Driver",
-   "-Channel -ChannelName Channel1 -ChannelName Channel2 -RunThreads 0 -ORBInitRef NameService=iioploc://%s:%s/NameService -IORoutput %s"
- );
---- pkg-ace.orig/TAO/orbsvcs/tests/Notify/Bug_3646d_Regression/server.cpp
-+++ pkg-ace/TAO/orbsvcs/tests/Notify/Bug_3646d_Regression/server.cpp
-@@ -20,7 +20,7 @@
- 
- ACE_TCHAR const * const scpc_loadNotifyService = ACE_DYNAMIC_SERVICE_DIRECTIVE(
-   "testNotifyService",
--  "TAO_Notify_Service",
-+  "libTAO_Notify_Service-2.1.2.so",
-   "_make_TAO_Notify_Service_Driver",
-   "-Channel -ChannelName Channel1 -ChannelName Channel2 -RunThreads 10 -ORBInitRef NameService=file://naming.ior -IORoutput notify.ior"
- );
-@@ -29,7 +29,7 @@
- 
- ACE_TCHAR const * const scpc_loadNameService = ACE_DYNAMIC_SERVICE_DIRECTIVE(
-   "testNamingService",
--  "TAO_CosNaming_Serv",
-+  "libTAO_CosNaming_Serv-2.1.2.so",
-   "_make_TAO_Naming_Loader",
-   "testNameService testNameService -ORBId testDllOrb -m 0 -o naming.ior"
- );
---- pkg-ace.orig/TAO/orbsvcs/tests/Notify/Bug_3663_Regression/server.cpp
-+++ pkg-ace/TAO/orbsvcs/tests/Notify/Bug_3663_Regression/server.cpp
-@@ -20,7 +20,7 @@
- 
- ACE_TCHAR const * const scpc_loadNotifyService = ACE_DYNAMIC_SERVICE_DIRECTIVE(
-   "testNotifyService",
--  "TAO_Notify_Service",
-+  "libTAO_Notify_Service-2.1.2.so",
-   "_make_TAO_Notify_Service_Driver_INCORRECT",
-   "-NoNameSvc -RunThreads 0"
- );
---- pkg-ace.orig/TAO/orbsvcs/tests/Notify/Bug_3688b_Regression/server.cpp
-+++ pkg-ace/TAO/orbsvcs/tests/Notify/Bug_3688b_Regression/server.cpp
-@@ -24,7 +24,7 @@
- 
- ACE_TCHAR const * const scpc_loadNameService = ACE_DYNAMIC_SERVICE_DIRECTIVE(
-   "testNamingService",
--  "TAO_CosNaming_Serv",
-+  "libTAO_CosNaming_Serv-2.1.2.so",
-   "_make_TAO_Naming_Loader",
-   "testNameService testNameService -ORBId testDllOrb -m 0 -o naming.ior"
- );
-@@ -34,7 +34,7 @@
- 
- ACE_TCHAR const * const scpc_loadNotifyService = ACE_DYNAMIC_SERVICE_DIRECTIVE(
-   "testNotifyService",
--  "TAO_Notify_Service",
-+  "libTAO_Notify_Service-2.1.2.so",
-   "_make_TAO_Notify_Service_Driver",
-   "-Channel -ChannelName Channel1 -ChannelName Channel2 -RunThreads 1 -ORBInitRef NameService=file://naming.ior -IORoutput notify.ior"
- );
---- pkg-ace.orig/TAO/tao/Codeset/Codeset_Manager_i.cpp
-+++ pkg-ace/TAO/tao/Codeset/Codeset_Manager_i.cpp
-@@ -353,7 +353,7 @@
-   if (fact == 0)
-     ACE_Service_Config::process_directive
-       (ACE_DYNAMIC_SERVICE_DIRECTIVE ("UTF8_Latin1_Factory",
--                                      "TAO_Codeset",
-+                                      "libTAO_Codeset-2.1.2.so",
-                                       "_make_TAO_UTF8_Latin1_Factory",
-                                       ""));
-   else
-@@ -370,7 +370,7 @@
-   if (fact == 0)
-     ACE_Service_Config::process_directive
-       (ACE_DYNAMIC_SERVICE_DIRECTIVE ("UTF16_BOM_Factory",
--                                      "TAO_Codeset",
-+                                      "libTAO_Codeset-2.1.2.so",
-                                       "_make_TAO_UTF16_BOM_Factory",
-                                       ""));
-   else
---- pkg-ace.orig/TAO/tao/CSD_Framework/CSD_ORBInitializer.cpp
-+++ pkg-ace/TAO/tao/CSD_Framework/CSD_ORBInitializer.cpp
-@@ -10,7 +10,7 @@
- static const ACE_TCHAR csd_poa_factory_directive[] =
-   ACE_DYNAMIC_SERVICE_DIRECTIVE(
-     "TAO_CSD_Object_Adapter_Factory",
--    "TAO_CSD_Framework",
-+    "libTAO_CSD_Framework-2.1.2.so",
-     "_make_TAO_CSD_Object_Adapter_Factory",
-     "");
- 
---- pkg-ace.orig/TAO/tao/ORB_Core.cpp
-+++ pkg-ace/TAO/tao/ORB_Core.cpp
-@@ -1660,7 +1660,7 @@
-     {
-       this->configuration ()->process_directive (
-         ACE_DYNAMIC_SERVICE_DIRECTIVE("PolicyFactory_Loader",
--                                      "TAO_PI",
-+                                      "libTAO_PI-2.1.2.so",
-                                       "_make_TAO_PolicyFactory_Loader",
-                                       ""));
-       loader =
-@@ -1712,7 +1712,7 @@
-     {
-       this->configuration ()->process_directive (
-         ACE_DYNAMIC_SERVICE_DIRECTIVE ("ORBInitializer_Registry",
--                                       "TAO_PI",
-+                                       "libTAO_PI-2.1.2.so",
-                                        "_make_ORBInitializer_Registry",
-                                        ""));
-       this->orbinitializer_registry_ =
-@@ -2467,7 +2467,7 @@
-     {
-       this->configuration ()->process_directive
-         (ACE_DYNAMIC_SERVICE_DIRECTIVE("TypeCodeFactory",
--                                       "TAO_TypeCodeFactory",
-+                                       "libTAO_TypeCodeFactory-2.1.2.so",
-                                        "_make_TAO_TypeCodeFactory_Loader",
-                                        ""));
-       loader =
-@@ -2500,7 +2500,7 @@
-     {
-       this->configuration()->process_directive
-         (ACE_DYNAMIC_SERVICE_DIRECTIVE("CodecFactory",
--                                       "TAO_CodecFactory",
-+                                       "libTAO_CodecFactory-2.1.2.so",
-                                        "_make_TAO_CodecFactory_Loader",
-                                        ""));
-       loader =
-@@ -2527,7 +2527,7 @@
-     {
-       this->configuration()->process_directive
-         (ACE_DYNAMIC_SERVICE_DIRECTIVE("Compression",
--                                       "TAO_Compression",
-+                                       "libTAO_Compression-2.1.2.so",
-                                        "_make_TAO_Compression_Loader",
-                                        ""));
-       loader =
-@@ -2553,7 +2553,7 @@
-     {
-       this->configuration()->process_directive
-         (ACE_DYNAMIC_SERVICE_DIRECTIVE("TAO_POA_Current_Factory",
--                                       "TAO_PortableServer",
-+                                       "libTAO_PortableServer-2.1.2.so",
-                                        "_make_TAO_POA_Current_Factory",
-                                        ""));
-       loader =
-@@ -2582,7 +2582,7 @@
-     {
-       this->configuration ()->process_directive
-         (ACE_DYNAMIC_SERVICE_DIRECTIVE("PICurrent_Loader",
--                                       "TAO_PI",
-+                                       "libTAO_PI-2.1.2.so",
-                                        "_make_TAO_PICurrent_Loader",
-                                        ""));
-       loader =
-@@ -2613,7 +2613,7 @@
-     {
-       this->configuration ()->process_directive
-         (ACE_DYNAMIC_SERVICE_DIRECTIVE("DynamicAny_Loader",
--                                       "TAO_DynamicAny",
-+                                       "libTAO_DynamicAny-2.1.2.so",
-                                        "_make_TAO_DynamicAny_Loader",
-                                        ""));
-       loader =
-@@ -2640,7 +2640,7 @@
-     {
-       this->configuration()->process_directive
-         (ACE_DYNAMIC_SERVICE_DIRECTIVE("IORManip_Loader",
--                                       "TAO_IORManip",
-+                                       "libTAO_IORManip-2.1.2.so",
-                                        "_make_TAO_IORManip_Loader",
-                                        ""));
-       loader =
-@@ -2666,7 +2666,7 @@
-     {
-       this->configuration ()->process_directive
-         (ACE_DYNAMIC_SERVICE_DIRECTIVE("TAO_IORTable",
--                                       "TAO_IORTable",
-+                                       "libTAO_IORTable-2.1.2.so",
-                                        "_make_TAO_Table_Adapter_Factory",
-                                        ""));
-       factory =
-@@ -2701,7 +2701,7 @@
-     {
-       this->configuration ()->process_directive
-         (ACE_DYNAMIC_SERVICE_DIRECTIVE("Monitor_Init",
--                                       "TAO_Monitor",
-+                                       "libTAO_Monitor-2.1.2.so",
-                                        "_make_TAO_Monitor_Init",
-                                        ""));
-       loader =
---- pkg-ace.orig/TAO/tao/ORBInitializer_Registry.cpp
-+++ pkg-ace/TAO/tao/ORBInitializer_Registry.cpp
-@@ -48,7 +48,7 @@
-       {
-         ACE_Service_Config::process_directive (
-           ACE_DYNAMIC_SERVICE_DIRECTIVE("ORBInitializer_Registry",
--                                        "TAO_PI",
-+                                        "libTAO_PI-2.1.2.so",
-                                         "_make_ORBInitializer_Registry",
-                                         ""));
-         orbinitializer_registry_ =
---- pkg-ace.orig/TAO/tao/params.cpp
-+++ pkg-ace/TAO/tao/params.cpp
-@@ -55,7 +55,7 @@
-   , poa_factory_name_ ("TAO_Object_Adapter_Factory")
-   , poa_factory_directive_
-       (ACE_DYNAMIC_SERVICE_DIRECTIVE("TAO_Object_Adapter_Factory",
--                                     "TAO_PortableServer",
-+                                     "libTAO_PortableServer-2.1.2.so",
-                                      "_make_TAO_Object_Adapter_Factory",
-                                      ""))
-   , forward_invocation_on_object_not_exist_ (false)
---- pkg-ace.orig/TAO/tao/PI/ORBInitInfo.cpp
-+++ pkg-ace/TAO/tao/PI/ORBInitInfo.cpp
-@@ -117,7 +117,7 @@
-         {
-           ACE_Service_Config::process_directive (
-             ACE_DYNAMIC_SERVICE_DIRECTIVE("CodecFactory",
--                                          "TAO_CodecFactory",
-+                                          "libTAO_CodecFactory-2.1.2.so",
-                                           "_make_TAO_CodecFactory_Loader",
-                                           ""));
-           loader =
---- pkg-ace.orig/TAO/tao/PortableServer/LifespanStrategyPersistent.cpp
-+++ pkg-ace/TAO/tao/PortableServer/LifespanStrategyPersistent.cpp
-@@ -79,7 +79,7 @@
-             {
-               ACE_Service_Config::process_directive (
-                 ACE_DYNAMIC_SERVICE_DIRECTIVE(
--                  "ImR_Client_Adapter", "TAO_ImR_Client",
-+                  "ImR_Client_Adapter", "libTAO_ImR_Client-2.1.2.so",
-                   "_make_ImR_Client_Adapter_Impl", ""));
- 
-               adapter =
---- pkg-ace.orig/TAO/tao/RTCORBA/RT_ORBInitializer.cpp
-+++ pkg-ace/TAO/tao/RTCORBA/RT_ORBInitializer.cpp
-@@ -38,7 +38,7 @@
- static const ACE_TCHAR rt_poa_factory_directive[] =
-   ACE_DYNAMIC_SERVICE_DIRECTIVE(
-     "TAO_RT_Object_Adapter_Factory",
--    "TAO_RTPortableServer",
-+    "libTAO_RTPortableServer-2.1.2.so",
-     "_make_TAO_RT_Object_Adapter_Factory",
-     "");
- 
---- pkg-ace.orig/TAO/tao/TAO_Internal.cpp
-+++ pkg-ace/TAO/tao/TAO_Internal.cpp
-@@ -614,7 +614,7 @@
-             ACE_Service_Config::process_directive (
-               ACE_DYNAMIC_SERVICE_DIRECTIVE (
-                 "TAO_Codeset",
--                "TAO_Codeset",
-+                "libTAO_Codeset-2.1.2.so",
-                 "_make_TAO_Codeset_Manager_Factory",
-                 ""));
- 
---- pkg-ace.orig/TAO/tests/DLL_ORB/client.cpp
-+++ pkg-ace/TAO/tests/DLL_ORB/client.cpp
-@@ -30,7 +30,7 @@
-   if (ACE_Service_Config::process_directive (
-         ACE_DYNAMIC_SERVICE_DIRECTIVE(
-           "Client_Module",
--          "Test_Client_Module",
-+          "libTest_Client_Module-2.1.2.so",
-           "_make_Test_Client_Module",
-           "-k file://test.ior")) != 0)
-     {
---- pkg-ace.orig/TAO/tests/ORB_Local_Config/Bug_2612/Test.cpp
-+++ pkg-ace/TAO/tests/ORB_Local_Config/Bug_2612/Test.cpp
-@@ -13,7 +13,7 @@
-   // each parameter CANNOT be split into multiple quoted strings "line1" "nextline" with the expectation that
-   // they will be join together. Hence the long parameter 4.
-   ACE_DYNAMIC_SERVICE_DIRECTIVE ("testDllOrb",
--                                 "DllOrb",
-+                                 "DllOrb.so",
-                                  "_make_DllOrb",
- "DllOrb -t 1 -ORBGestalt Local -ORBDebugLevel 3 -ORBId testORB -ORBInitRef NameService=file:///tmp/test-ns.ior -ORBDottedDecimalAddresses 1"
-                                  );
---- pkg-ace.orig/TAO/tests/ORB_Local_Config/Service_Dependency/Test.cpp
-+++ pkg-ace/TAO/tests/ORB_Local_Config/Service_Dependency/Test.cpp
-@@ -153,7 +153,7 @@
-     {
-       one->process_directive (
-         ACE_DYNAMIC_SERVICE_DIRECTIVE("ORBInitializer_Registry",
--                                      "TAO_PI",
-+                                      "libTAO_PI-2.1.2.so",
-                                       "_make_ORBInitializer_Registry",
-                                       ""));
-       oir =
-@@ -252,7 +252,7 @@
- 
-   one->process_directive
-     (ACE_DYNAMIC_SERVICE_DIRECTIVE("PolicyFactory_Loader",
--                                   "TAO_PI",
-+                                   "libTAO_PI-2.1.2.so",
-                                    "_make_TAO_PolicyFactory_Loader",
-                                    ""));
- 
-@@ -292,7 +292,7 @@
- 
-     int result = one->process_directive
-       (ACE_DYNAMIC_SERVICE_DIRECTIVE("TAO_Codeset",
--                                     "TAO_Codeset",
-+                                     "libTAO_Codeset-2.1.2.so",
-                                      "_make_TAO_Codeset_Manager_Factory",
-                                      ""));
-     if (result != 0)
---- pkg-ace.orig/TAO/tests/TransportCurrent/Framework/simple.cpp
-+++ pkg-ace/TAO/tests/TransportCurrent/Framework/simple.cpp
-@@ -56,7 +56,7 @@
- #if !defined (TAO_AS_STATIC_LIBS)
-           int ret = ACE_Service_Config::process_directive
-             (ACE_DYNAMIC_SERVICE_DIRECTIVE("TAO_Transport_Current_Loader",
--                                           "TAO_Transport_Current",
-+                                           "libTAO_Transport_Current-2.1.2.so",
-                                            "_make_TAO_Transport_Current_Loader",
-                                            ""));
-           ACE_ASSERT (ret == 0);
diff --git a/ACE/debian/patches/series b/ACE/debian/patches/series
index 0cbc4d987cf..ab8b3888dc8 100644
--- a/ACE/debian/patches/series
+++ b/ACE/debian/patches/series
@@ -1,7 +1,4 @@
 reduce-doxygen-doc.diff
-15-fix-lzo-flags.diff
-20-versioned_libs.diff
-34-bts386713.diff
 90-patch-mpc-basedir.diff
 91-patch-dg-basedir.diff
 92-default-ACE_ROOT.diff
diff --git a/ACE/debian/platform_macros.GNU b/ACE/debian/platform_macros.GNU
index 76b032671f5..908a64e8191 100644
--- a/ACE/debian/platform_macros.GNU
+++ b/ACE/debian/platform_macros.GNU
@@ -17,6 +17,8 @@ bzip2          = 1
 lzo1           = 1
 zlib           = 1
 
+versioned_so   = 2
+
 # Work-around #593225
 ARMEL_TARGET := $(shell echo '__ARMEL__' | $(CC) -E - | tail -n 1)
 ifeq ($(ARMEL_TARGET),1)
diff --git a/ACE/include/makeinclude/platform_g++_common.GNU b/ACE/include/makeinclude/platform_g++_common.GNU
index 291c259a71e..c3e945b8bcd 100644
--- a/ACE/include/makeinclude/platform_g++_common.GNU
+++ b/ACE/include/makeinclude/platform_g++_common.GNU
@@ -117,6 +117,10 @@ ifneq ($(versioned_so),0)
   endif
 endif
 
+ifeq ($(versioned_so),2)
+  FLAGS_C_CC += -DACE_VERSIONED_SO=2
+endif
+
 static_libs_only ?=
 
 CXX_FULL_VERSION := $(shell $(CXX_FOR_VERSION_TEST) --version)