[Pkg-ace-devel] r481 - in /trunk/debian/patches: 00list
34-bts386713.dpatch
tgg-guest at users.alioth.debian.org
tgg-guest at users.alioth.debian.org
Tue Feb 13 13:38:13 CET 2007
Author: tgg-guest
Date: Tue Feb 13 13:38:13 2007
New Revision: 481
URL: http://svn.debian.org/wsvn/pkg-ace/?sc=1&rev=481
Log:
update 34-bts386713.
Modified:
trunk/debian/patches/00list
trunk/debian/patches/34-bts386713.dpatch
Modified: trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-ace/trunk/debian/patches/00list?rev=481&op=diff
==============================================================================
--- trunk/debian/patches/00list (original)
+++ trunk/debian/patches/00list Tue Feb 13 13:38:13 2007
@@ -7,7 +7,7 @@
08-fix-perl-shebang
15-fix-fltk-include
#21-always-inline
-#34-bts386713
+34-bts386713
90-patch-mpc-basedir
91-patch-dg-basedir
92-default-ACE_ROOT
Modified: trunk/debian/patches/34-bts386713.dpatch
URL: http://svn.debian.org/wsvn/pkg-ace/trunk/debian/patches/34-bts386713.dpatch?rev=481&op=diff
==============================================================================
--- trunk/debian/patches/34-bts386713.dpatch (original)
+++ trunk/debian/patches/34-bts386713.dpatch Tue Feb 13 13:38:13 2007
@@ -5,188 +5,159 @@
## DP: load libraries with their complete name.
@DPATCH@
-
---- ACE_wrappers.orig/TAO/tao/default_resource.cpp 2006-09-22 19:14:31.165056750 +0200
-+++ ACE_wrappers/TAO/tao/default_resource.cpp 2006-09-22 19:14:35.669338250 +0200
-@@ -1022,7 +1022,7 @@
- ACE_Service_Config::process_directive("remove TAO_Codeset");
- ACE_Service_Config::process_directive
- (ACE_DYNAMIC_SERVICE_DIRECTIVE("TAO_Codeset",
-- "TAO_Codeset",
-+ "libTAO_Codeset.so.1.4.7",
- "_make_TAO_Codeset_Manager_Factory",
+--- ACE_wrappers.orig/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.cpp 2007-01-25 18:04:11.000000000 +0000
++++ ACE_wrappers/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.cpp 2007-02-13 11:45:38.000000000 +0000
+@@ -14,7 +14,7 @@
+
+ static const char pg_poa_factory_name[] = "TAO_GOA";
+ static const char pg_poa_factory_directive[] = ACE_DYNAMIC_SERVICE_DIRECTIVE(
+- "TAO_GOA", "TAO_PortableGroup", "_make_TAO_PG_Object_Adapter_Factory", "");
++ "TAO_GOA", "TAO_PortableGroup-1.5.6", "_make_TAO_PG_Object_Adapter_Factory", "");
+
+ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
+--- ACE_wrappers.orig/TAO/tao/ORB_Core.cpp 2007-01-25 19:59:59.000000000 +0000
++++ ACE_wrappers/TAO/tao/ORB_Core.cpp 2007-02-13 12:33:58.000000000 +0000
+@@ -166,7 +166,7 @@
+ poa_factory_directive_
+ (ACE_TEXT_ALWAYS_CHAR
+ (ACE_DYNAMIC_SERVICE_DIRECTIVE("TAO_Object_Adapter_Factory",
+- "TAO_PortableServer",
++ "TAO_PortableServer-1.5.6",
+ "_make_TAO_Object_Adapter_Factory",
+ ""))),
+ alt_connection_timeout_hook_ (0)
+@@ -1596,7 +1596,7 @@
+ {
+ this->configuration ()->process_directive (
+ ACE_DYNAMIC_SERVICE_DIRECTIVE("PolicyFactory_Loader",
+- "TAO_PI",
++ "TAO_PI-1.5.6",
+ "_make_TAO_PolicyFactory_Loader",
+ ""));
+ loader =
+@@ -1635,7 +1635,7 @@
+ {
+ config->process_directive (
+ ACE_DYNAMIC_SERVICE_DIRECTIVE ("ORBInitializer_Registry",
+- "TAO_PI",
++ "TAO_PI-1.5.6",
+ "_make_ORBInitializer_Registry",
+ ""));
+ this->orbinitializer_registry_ =
+@@ -2432,7 +2432,7 @@
+ {
+ this->configuration ()->process_directive
+ (ACE_DYNAMIC_SERVICE_DIRECTIVE("TypeCodeFactory",
+- "TAO_TypeCodeFactory",
++ "TAO_TypeCodeFactory-1.5.6",
+ "_make_TAO_TypeCodeFactory_Loader",
+ ""));
+ loader =
+@@ -2465,7 +2465,7 @@
+ {
+ this->configuration()->process_directive
+ (ACE_DYNAMIC_SERVICE_DIRECTIVE("CodecFactory",
+- "TAO_CodecFactory",
++ "TAO_CodecFactory-1.5.6",
+ "_make_TAO_CodecFactory_Loader",
+ ""));
+ loader =
+@@ -2492,7 +2492,7 @@
+ {
+ this->configuration()->process_directive
+ (ACE_DYNAMIC_SERVICE_DIRECTIVE("Compression",
+- "TAO_Compression",
++ "TAO_Compression-1.5.6",
+ "_make_TAO_Compression_Loader",
+ ""));
+ loader =
+@@ -2519,7 +2519,7 @@
+ {
+ this->configuration()->process_directive
+ (ACE_DYNAMIC_SERVICE_DIRECTIVE("TAO_POA_Current_Factory",
+- "TAO_PortableServer",
++ "TAO_PortableServer-1.5.6",
+ "_make_TAO_POA_Current_Factory",
+ ""));
+ loader =
+@@ -2549,7 +2549,7 @@
+ {
+ this->configuration ()->process_directive
+ (ACE_DYNAMIC_SERVICE_DIRECTIVE("PICurrent_Loader",
+- "TAO_PI",
++ "TAO_PI-1.5.6",
+ "_make_TAO_PICurrent_Loader",
+ ""));
+ loader =
+@@ -2581,7 +2581,7 @@
+ {
+ this->configuration ()->process_directive
+ (ACE_DYNAMIC_SERVICE_DIRECTIVE("DynamicAny_Loader",
+- "TAO_DynamicAny",
++ "TAO_DynamicAny-1.5.6",
+ "_make_TAO_DynamicAny_Loader",
+ ""));
+ loader =
+@@ -2609,7 +2609,7 @@
+ {
+ this->configuration()->process_directive
+ (ACE_DYNAMIC_SERVICE_DIRECTIVE("IORManip_Loader",
+- "TAO_IORManip",
++ "TAO_IORManip-1.5.6",
+ "_make_TAO_IORManip_Loader",
+ ""));
+ loader =
+@@ -2636,7 +2636,7 @@
+ {
+ this->configuration ()->process_directive
+ (ACE_DYNAMIC_SERVICE_DIRECTIVE("TAO_IORTable",
+- "TAO_IORTable",
++ "TAO_IORTable-1.5.6",
+ "_make_TAO_Table_Adapter_Factory",
""));
factory =
---- ACE_wrappers.orig/TAO/tao/ORB_Core.cpp 2006-09-22 19:15:20.568144250 +0200
-+++ ACE_wrappers/TAO/tao/ORB_Core.cpp 2006-09-22 19:20:36.587894250 +0200
-@@ -129,7 +129,7 @@
- iorinterceptor_adapter_factory_name_ ("IORInterceptor_Adapter_Factory"),
- valuetype_adapter_name_ ("Valuetype_Adapter"),
- poa_factory_name_ ("TAO_Object_Adapter_Factory"),
-- poa_factory_directive_ (ACE_DYNAMIC_SERVICE_DIRECTIVE("TAO_Object_Adapter_Factory", "TAO_PortableServer", "_make_TAO_Object_Adapter_Factory", ""))
-+ poa_factory_directive_ (ACE_DYNAMIC_SERVICE_DIRECTIVE("TAO_Object_Adapter_Factory", "libTAO_PortableServer.so.1.4.7", "_make_TAO_Object_Adapter_Factory", ""))
- {
- }
-
-@@ -1442,7 +1442,7 @@
- {
- ACE_Service_Config::process_directive (
- ACE_DYNAMIC_SERVICE_DIRECTIVE("TAO_PolicyFactory_Registry_Factory",
-- "TAO_PI",
-+ "libTAO_PI.so.1.4.7",
- "_make_PolicyFactory_Loader",
- ""));
- loader =
-@@ -1475,7 +1475,7 @@
- {
- ACE_Service_Config::process_directive (
- ACE_DYNAMIC_SERVICE_DIRECTIVE("ORBInitializer_Registry",
-- "TAO_PI",
-+ "libTAO_PI.so.1.4.7",
- "_make_ORBInitializer_Registry",
- ""));
- orbinitializer_registry_ =
-@@ -2212,7 +2212,7 @@
- {
- ACE_Service_Config::process_directive (
- ACE_DYNAMIC_SERVICE_DIRECTIVE("TypeCodeFactory",
-- "TAO_TypeCodeFactory",
-+ "libTAO_TypeCodeFactory.so.1.4.7",
- "_make_TAO_TypeCodeFactory_Loader",
- ""));
- loader =
-@@ -2233,7 +2233,7 @@
- {
- ACE_Service_Config::process_directive (
- ACE_DYNAMIC_SERVICE_DIRECTIVE("CodecFactory",
-- "TAO_CodecFactory",
-+ "libTAO_CodecFactory.so.1.4.7",
- "_make_TAO_CodecFactory_Loader",
- ""));
- loader =
-@@ -2257,7 +2257,7 @@
- {
- ACE_Service_Config::process_directive (
- ACE_DYNAMIC_SERVICE_DIRECTIVE("PICurrent_Loader",
-- "TAO",
-+ "libTAO.so.1.4.7",
- "_make_TAO_PICurrent_Loader",
- ""));
- loader =
-@@ -2286,7 +2286,7 @@
- {
- ACE_Service_Config::process_directive (
- ACE_DYNAMIC_SERVICE_DIRECTIVE("DynamicAny_Loader",
-- "TAO_DynamicAny",
-+ "libTAO_DynamicAny.so.1.4.7",
- "_make_TAO_DynamicAny_Loader",
- ""));
- loader =
-@@ -2310,7 +2310,7 @@
- {
- ACE_Service_Config::process_directive (
- ACE_DYNAMIC_SERVICE_DIRECTIVE("IORManip_Loader",
-- "TAO_IORManip",
-+ "libTAO_IORManip.so.1.4.7",
- "_make_TAO_IORManip_Loader",
- ""));
- loader =
-@@ -2332,7 +2332,7 @@
- {
- ACE_Service_Config::process_directive (
- ACE_DYNAMIC_SERVICE_DIRECTIVE("TAO_IORTable",
-- "TAO_IORTable",
-+ "libTAO_IORTable.so.1.4.7",
- "_make_TAO_Table_Adapter_Factory",
- ""));
- factory =
---- ACE_wrappers.orig/TAO/tao/ORBInitializer_Registry.cpp 2006-09-22 19:21:37.603707500 +0200
-+++ ACE_wrappers/TAO/tao/ORBInitializer_Registry.cpp 2006-09-22 19:21:42.420008500 +0200
-@@ -56,7 +56,7 @@
+--- ACE_wrappers.orig/TAO/tao/ORBInitializer_Registry.cpp 2007-01-24 16:37:36.000000000 +0000
++++ ACE_wrappers/TAO/tao/ORBInitializer_Registry.cpp 2007-02-13 12:30:53.000000000 +0000
+@@ -57,7 +57,7 @@
{
ACE_Service_Config::process_directive (
ACE_DYNAMIC_SERVICE_DIRECTIVE("ORBInitializer_Registry",
- "TAO_PI",
-+ "libTAO_PI.so.1.4.7",
++ "TAO_PI-1.5.6",
"_make_ORBInitializer_Registry",
""));
orbinitializer_registry_ =
---- ACE_wrappers.orig/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.cpp 2006-09-22 19:27:32.897912000 +0200
-+++ ACE_wrappers/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.cpp 2006-09-22 19:27:42.962541000 +0200
-@@ -14,7 +14,7 @@
-
- static const char pg_poa_factory_name[] = "TAO_PG_POA";
- static const char pg_poa_factory_directive[] = ACE_DYNAMIC_SERVICE_DIRECTIVE(
-- "TAO_PG_POA", "TAO_PortableGroup", "_make_TAO_PG_Object_Adapter_Factory", "");
-+ "TAO_PG_POA", "libTAO_PortableGroup.so.1.4.7", "_make_TAO_PG_Object_Adapter_Factory", "");
-
- void
- TAO_PortableGroup_ORBInitializer::pre_init (
---- ACE_wrappers.orig/TAO/tao/PI/ORBInitInfo.cpp 2006-09-22 19:34:41.908723500 +0200
-+++ ACE_wrappers/TAO/tao/PI/ORBInitInfo.cpp 2006-09-22 19:34:47.833093750 +0200
-@@ -129,7 +129,7 @@
+--- ACE_wrappers.orig/TAO/tao/PI/ORBInitInfo.cpp 2007-01-24 18:43:15.000000000 +0000
++++ ACE_wrappers/TAO/tao/PI/ORBInitInfo.cpp 2007-02-13 12:30:07.000000000 +0000
+@@ -128,7 +128,7 @@
{
ACE_Service_Config::process_directive (
ACE_DYNAMIC_SERVICE_DIRECTIVE("CodecFactory",
- "TAO_CodecFactory",
-+ "libTAO_CodecFactory.so.1.4.7",
++ "TAO_CodecFactory-1.5.6",
"_make_TAO_CodecFactory_Loader",
""));
loader =
---- ACE_wrappers.orig/TAO/tao/Codeset/Codeset_Manager_i.cpp 2006-09-22 19:40:20.161863000 +0200
-+++ ACE_wrappers/TAO/tao/Codeset/Codeset_Manager_i.cpp 2006-09-22 19:40:31.182551750 +0200
-@@ -339,7 +339,7 @@
- if (fact == 0)
- ACE_Service_Config::process_directive
- (ACE_DYNAMIC_SERVICE_DIRECTIVE ("UTF8_Latin1_Factory",
-- "TAO_Codeset",
-+ "libTAO_Codeset.so.1.4.7",
- "_make_TAO_UTF8_Latin1_Factory",
- ""));
- else
-@@ -356,7 +356,7 @@
- if (fact == 0)
- ACE_Service_Config::process_directive
- (ACE_DYNAMIC_SERVICE_DIRECTIVE ("UTF16_BOM_Factory",
-- "TAO_Codeset",
-+ "libTAO_Codeset.so.1.4.7",
- "_make_TAO_UTF16_BOM_Factory",
- ""));
- else
---- ACE_wrappers.orig/TAO/tao/PortableServer/LifespanStrategyPersistent.cpp 2006-09-22 19:41:00.716397500 +0200
-+++ ACE_wrappers/TAO/tao/PortableServer/LifespanStrategyPersistent.cpp 2006-09-22 19:41:05.936723750 +0200
-@@ -84,7 +84,7 @@
+--- ACE_wrappers.orig/TAO/tao/PortableServer/LifespanStrategyPersistent.cpp 2007-01-24 16:37:36.000000000 +0000
++++ ACE_wrappers/TAO/tao/PortableServer/LifespanStrategyPersistent.cpp 2007-02-13 11:46:59.000000000 +0000
+@@ -85,7 +85,7 @@
{
ACE_Service_Config::process_directive (
ACE_DYNAMIC_SERVICE_DIRECTIVE(
- "ImR_Client_Adapter", "TAO_ImR_Client",
-+ "ImR_Client_Adapter", "libTAO_ImR_Client.so.1.4.7",
++ "ImR_Client_Adapter", "TAO_ImR_Client-1.5.6",
"_make_ImR_Client_Adapter_Impl", ""));
adapter =
---- ACE_wrappers.orig/TAO/tao/RTCORBA/RT_ORBInitializer.cpp 2006-09-22 19:41:41.370938250 +0200
-+++ ACE_wrappers/TAO/tao/RTCORBA/RT_ORBInitializer.cpp 2006-09-22 19:41:46.219241250 +0200
-@@ -39,7 +39,7 @@
- static const char *rt_poa_factory_name = "TAO_RT_Object_Adapter_Factory";
- static const char *rt_poa_factory_directive =
- ACE_DYNAMIC_SERVICE_DIRECTIVE(
- "TAO_RT_Object_Adapter_Factory",
-- "TAO_RTPortableServer",
-+ "libTAO_RTPortableServer.so.1.4.7",
- "_make_TAO_RT_Object_Adapter_Factory",
- "");
---- ACE_wrappers.orig/ace/DLL_Manager.cpp 2006-09-22 20:11:22.738266750 +0200
-+++ ACE_wrappers/ace/DLL_Manager.cpp 2006-09-22 20:16:12.672386500 +0200
-@@ -319,6 +319,12 @@
- // Build the array of DLL names to try on this platform by applying the
- // proper prefixes and/or suffixes to the specified dll_name.
- ACE_TString base (dll_name);
-+
-+ // short-circuit this.
-+ try_names.size(1);
-+ try_names.set(base, 0);
-+ return;
-+
- ACE_TString base_dir, base_file, base_suffix;
+--- ACE_wrappers.orig/TAO/tao/TAO_Internal.cpp 2006-12-28 11:46:39.000000000 +0000
++++ ACE_wrappers/TAO/tao/TAO_Internal.cpp 2007-02-13 11:47:57.000000000 +0000
+@@ -484,7 +484,7 @@
+ ACE_Service_Config::process_directive (
+ ACE_DYNAMIC_SERVICE_DIRECTIVE (
+ "TAO_Codeset",
+- "TAO_Codeset",
++ "TAO_Codeset-1.5.6",
+ "_make_TAO_Codeset_Manager_Factory",
+ ""));
- // 1. Separate the dll_name into the dir part and the file part. We
More information about the Pkg-ace-devel
mailing list