[Pkg-ace-commits] [pkg-ace] r537 - in trunk/debian: . patches

[tgg at alioth.debian.org]

Author: tgg
Date: 2007-11-07 13:55:45 +0000 (Wed, 07 Nov 2007)
New Revision: 537

Modified:
   trunk/debian/changelog
   trunk/debian/patches/05-5.6-compat.dpatch
Log:
drop patch hunk supposed to revert an ABI change. It was *not* an ABI change.


Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2007-11-07 13:32:49 UTC (rev 536)
+++ trunk/debian/changelog	2007-11-07 13:55:45 UTC (rev 537)
@@ -7,7 +7,8 @@
   * Reenable IPv6 and enable IPv4/IPv6 migration.
   * Fix DEB_BUILD_OPTIONS=noopt.
   * Add zlib1g-dev and libzzip-dev build dependencies.
-  * New patch, 05-5.6-compat.dpatch, to be ABI compatible with ACE 5.6
+  * New patch, 05-5.6-compat.dpatch, to use a x.6 SONAME because ACE+TAO+CIAO
+    x.6.1 is ABI compatible with ACE+TAO+CIAO 5.6
   * Enable symbol visibility.
 
  -- Thomas Girard <thomas.g.girard at free.fr>  Tue, 06 Nov 2007 19:52:37 +0100

Modified: trunk/debian/patches/05-5.6-compat.dpatch
===================================================================
--- trunk/debian/patches/05-5.6-compat.dpatch	2007-11-07 13:32:49 UTC (rev 536)
+++ trunk/debian/patches/05-5.6-compat.dpatch	2007-11-07 13:55:45 UTC (rev 537)
@@ -2,7 +2,7 @@
 ## 05-5.6-compat.dpatch by Thomas Girard <thomas.g.girard at free.fr>
 ##
 ## All lines beginning with `## DP:' are a description of the patch.
-## DP: make ACE+TAO+CIAO x.6.1 ABI compatible with ACE+TAO+CIAO x.6
+## DP: use x.6 SONAME as x.6.1 is ABI compatible with x.6
 
 @DPATCH@
 --- ACE_wrappers.orig/configure.ac
@@ -27,17 +27,3 @@
      includes += $(TAO_BUILDDIR)
      libpaths -= $(ACE_ROOT)/lib
    }
---- ACE_wrappers.orig/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.h
-+++ ACE_wrappers/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.h
-@@ -59,9 +59,8 @@
-     CosNotifyChannelAdmin::EventChannelFactory_ptr factory);
- 
-   /// Create the Channel Factory.
--  virtual CosNotifyChannelAdmin::EventChannelFactory_ptr create (
--    PortableServer::POA_ptr default_POA,
--    const char* factory_name = "EventChannelFactory");
-+  virtual CosNotifyChannelAdmin::EventChannelFactory_ptr
-+    create (PortableServer::POA_ptr default_POA, const char* factory_name);
- 
-   /// Called by the factory when it is destroyed.
-   virtual void remove (TAO_Notify_EventChannelFactory* ecf);