[Pkg-ace-devel] r489 - in /trunk/debian: changelog patches/34-bts386713.dpatch rules

tgg at users.alioth.debian.org tgg at users.alioth.debian.org
Thu Mar 15 20:02:28 CET 2007


Author: tgg
Date: Thu Mar 15 19:02:27 2007
New Revision: 489

URL: http://svn.debian.org/wsvn/pkg-ace/?sc=1&rev=489
Log:
Fix remaining issues:
 * library names were not correctly set
 * enable both ipv4 and ipv6

Modified:
    trunk/debian/changelog
    trunk/debian/patches/34-bts386713.dpatch
    trunk/debian/rules

Modified: trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ace/trunk/debian/changelog?rev=489&op=diff
==============================================================================
--- trunk/debian/changelog (original)
+++ trunk/debian/changelog Thu Mar 15 19:02:27 2007
@@ -21,7 +21,7 @@
   Konstantinos Margaritis:
     * changed URL in copyright to new one.
 
- -- Thomas Girard <thomas.g.girard at free.fr>  Thu,  8 Mar 2007 08:53:47 +0000
+ -- Thomas Girard <thomas.g.girard at free.fr>  Thu, 15 Mar 2007 19:25:04 +0000
 
 ace (5.4.7-11) unstable; urgency=low
 

Modified: trunk/debian/patches/34-bts386713.dpatch
URL: http://svn.debian.org/wsvn/pkg-ace/trunk/debian/patches/34-bts386713.dpatch?rev=489&op=diff
==============================================================================
--- trunk/debian/patches/34-bts386713.dpatch (original)
+++ trunk/debian/patches/34-bts386713.dpatch Thu Mar 15 19:02:27 2007
@@ -12,7 +12,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_GOA", "libTAO_PortableGroup-1.5.6.so", "_make_TAO_PG_Object_Adapter_Factory", "");
  
  TAO_BEGIN_VERSIONED_NAMESPACE_DECL
  
@@ -23,7 +23,7 @@
        (ACE_TEXT_ALWAYS_CHAR
          (ACE_DYNAMIC_SERVICE_DIRECTIVE("TAO_Object_Adapter_Factory",
 -                                       "TAO_PortableServer",
-+                                       "TAO_PortableServer-1.5.6",
++                                       "libTAO_PortableServer-1.5.6.so",
                                         "_make_TAO_Object_Adapter_Factory",
                                         ""))),
      alt_connection_timeout_hook_ (0)
@@ -32,7 +32,7 @@
        this->configuration ()->process_directive (
          ACE_DYNAMIC_SERVICE_DIRECTIVE("PolicyFactory_Loader",
 -                                      "TAO_PI",
-+                                      "TAO_PI-1.5.6",
++                                      "libTAO_PI-1.5.6.so",
                                        "_make_TAO_PolicyFactory_Loader",
                                        ""));
        loader =
@@ -41,7 +41,7 @@
        config->process_directive (
          ACE_DYNAMIC_SERVICE_DIRECTIVE ("ORBInitializer_Registry",
 -                                       "TAO_PI",
-+                                       "TAO_PI-1.5.6",
++                                       "libTAO_PI-1.5.6.so",
                                         "_make_ORBInitializer_Registry",
                                         ""));
        this->orbinitializer_registry_ =
@@ -50,7 +50,7 @@
        this->configuration ()->process_directive
          (ACE_DYNAMIC_SERVICE_DIRECTIVE("TypeCodeFactory",
 -                                       "TAO_TypeCodeFactory",
-+                                       "TAO_TypeCodeFactory-1.5.6",
++                                       "libTAO_TypeCodeFactory-1.5.6.so",
                                         "_make_TAO_TypeCodeFactory_Loader",
                                         ""));
        loader =
@@ -59,7 +59,7 @@
        this->configuration()->process_directive
          (ACE_DYNAMIC_SERVICE_DIRECTIVE("CodecFactory",
 -                                       "TAO_CodecFactory",
-+                                       "TAO_CodecFactory-1.5.6",
++                                       "libTAO_CodecFactory-1.5.6.so",
                                         "_make_TAO_CodecFactory_Loader",
                                         ""));
        loader =
@@ -68,7 +68,7 @@
        this->configuration()->process_directive
          (ACE_DYNAMIC_SERVICE_DIRECTIVE("Compression",
 -                                       "TAO_Compression",
-+                                       "TAO_Compression-1.5.6",
++                                       "libTAO_Compression-1.5.6.so",
                                         "_make_TAO_Compression_Loader",
                                         ""));
        loader =
@@ -77,7 +77,7 @@
        this->configuration()->process_directive
          (ACE_DYNAMIC_SERVICE_DIRECTIVE("TAO_POA_Current_Factory",
 -                                       "TAO_PortableServer",
-+                                       "TAO_PortableServer-1.5.6",
++                                       "libTAO_PortableServer-1.5.6.so",
                                         "_make_TAO_POA_Current_Factory",
                                         ""));
        loader =
@@ -86,7 +86,7 @@
        this->configuration ()->process_directive
          (ACE_DYNAMIC_SERVICE_DIRECTIVE("PICurrent_Loader",
 -                                       "TAO_PI",
-+                                       "TAO_PI-1.5.6",
++                                       "libTAO_PI-1.5.6.so",
                                         "_make_TAO_PICurrent_Loader",
                                         ""));
        loader =
@@ -95,7 +95,7 @@
        this->configuration ()->process_directive
          (ACE_DYNAMIC_SERVICE_DIRECTIVE("DynamicAny_Loader",
 -                                       "TAO_DynamicAny",
-+                                       "TAO_DynamicAny-1.5.6",
++                                       "libTAO_DynamicAny-1.5.6.so",
                                         "_make_TAO_DynamicAny_Loader",
                                         ""));
        loader =
@@ -104,7 +104,7 @@
        this->configuration()->process_directive
          (ACE_DYNAMIC_SERVICE_DIRECTIVE("IORManip_Loader",
 -                                       "TAO_IORManip",
-+                                       "TAO_IORManip-1.5.6",
++                                       "libTAO_IORManip-1.5.6.so",
                                         "_make_TAO_IORManip_Loader",
                                         ""));
        loader =
@@ -113,7 +113,7 @@
        this->configuration ()->process_directive
          (ACE_DYNAMIC_SERVICE_DIRECTIVE("TAO_IORTable",
 -                                       "TAO_IORTable",
-+                                       "TAO_IORTable-1.5.6",
++                                       "libTAO_IORTable-1.5.6.so",
                                         "_make_TAO_Table_Adapter_Factory",
                                         ""));
        factory =
@@ -124,7 +124,7 @@
          ACE_Service_Config::process_directive (
            ACE_DYNAMIC_SERVICE_DIRECTIVE("ORBInitializer_Registry",
 -                                        "TAO_PI",
-+                                        "TAO_PI-1.5.6",
++                                        "libTAO_PI-1.5.6.so",
                                          "_make_ORBInitializer_Registry",
                                          ""));
          orbinitializer_registry_ =
@@ -135,7 +135,7 @@
            ACE_Service_Config::process_directive (
              ACE_DYNAMIC_SERVICE_DIRECTIVE("CodecFactory",
 -                                          "TAO_CodecFactory",
-+                                          "TAO_CodecFactory-1.5.6",
++                                          "libTAO_CodecFactory-1.5.6.so",
                                            "_make_TAO_CodecFactory_Loader",
                                            ""));
            loader =
@@ -146,7 +146,7 @@
                ACE_Service_Config::process_directive (
                  ACE_DYNAMIC_SERVICE_DIRECTIVE(
 -                  "ImR_Client_Adapter", "TAO_ImR_Client",
-+                  "ImR_Client_Adapter", "TAO_ImR_Client-1.5.6",
++                  "ImR_Client_Adapter", "libTAO_ImR_Client-1.5.6.so",
                    "_make_ImR_Client_Adapter_Impl", ""));
  
                adapter =
@@ -157,7 +157,7 @@
                ACE_DYNAMIC_SERVICE_DIRECTIVE (
                  "TAO_Codeset",
 -                "TAO_Codeset",
-+                "TAO_Codeset-1.5.6",
++                "libTAO_Codeset-1.5.6.so",
                  "_make_TAO_Codeset_Manager_Factory",
                  ""));
  

Modified: trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-ace/trunk/debian/rules?rev=489&op=diff
==============================================================================
--- trunk/debian/rules (original)
+++ trunk/debian/rules Thu Mar 15 19:02:27 2007
@@ -236,7 +236,7 @@
 
 configure-stamp: patch-stamp pl-stamp
 	mkdir -p objdir
-	cd objdir && ../ACE_wrappers/configure $(confflags) --prefix=/usr --disable-tao-examples --disable-tao-tests --disable-ace-examples --disable-ace-tests --enable-fl-reactor --enable-qt-reactor --enable-tk-reactor  --enable-xt-reactor --enable-symbol-visibility --with-tclconfig=$(TCL_HOME) --with-tkconfig=$(TK_HOME) --enable-ipv6 --enable-inline --enable-probe
+	cd objdir && ../ACE_wrappers/configure $(confflags) --prefix=/usr --disable-tao-examples --disable-tao-tests --disable-ace-examples --disable-ace-tests --enable-fl-reactor --enable-qt-reactor --enable-tk-reactor  --enable-xt-reactor --enable-symbol-visibility --with-tclconfig=$(TCL_HOME) --with-tkconfig=$(TK_HOME) --enable-ipv6 --enable-ipv4-ipv6 --enable-inline --enable-probe
 	echo '#define ACE_GPERF "gperf-ace"' >> objdir/ace/config.h
 	echo '#define TAO_IDL_INCLUDE_DIR "/usr/include/tao"' >> objdir/ace/config.h
 	touch $@




More information about the Pkg-ace-devel mailing list