[Pkg-ace-devel] r404 - in /trunk/debian: changelog control patches/31-gcc-4.1-fix.dpatch

Mon Jul 24 20:24:05 UTC 2006

Author: tgg-guest
Date: Mon Jul 24 20:24:04 2006
New Revision: 404

URL: http://svn.debian.org/wsvn/pkg-ace/?sc=1&rev=404
Log:
Merge with 5.4.7-10, describe pending changes.

Modified:
    trunk/debian/changelog
    trunk/debian/control
    trunk/debian/patches/31-gcc-4.1-fix.dpatch

Modified: trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ace/trunk/debian/changelog?rev=404&op=diff
==============================================================================

--- trunk/debian/changelog (original)
+++ trunk/debian/changelog Mon Jul 24 20:24:04 2006
@@ -1,4 +1,11 @@
-ace (5.4.7-10) UNRELEASED; urgency=low
+ace (5.4.7-11) UNRELEASED; urgency=low
+
+  * debian/control: package HTBP, the protocol over HTTP tunneling library.
+  * debian/control: split libace into libace + libace-ssl.
+
+ -- Thomas Girard <thomas.g.girard at free.fr>  Mon, 24 Jul 2006 22:21:02 +0200
+
+ace (5.4.7-10) unstable; urgency=low
 
   * debian/rules: fix and honor DEB_BUILD_OPTIONS.
   * debian/libace-dev.install: drop QoS header files as QoS in not compiled
@@ -8,7 +15,6 @@
   * debian/libtao-dev.install: do not distribute include files from TAO_IDL.
     They are not needed and don't get installed when using the autotools
     method.
-  * debian/control: package HTBP, the protocol over HTTP tunneling library.
   * debian/rules: rename mwc.pl and mpc.pl to mwc-ace and mpc-ace.
   * debian/ace-config*,debian/tao-config*: dropped. These files were no
     longer installed.
@@ -19,8 +25,14 @@
   * debian/control: simplify packages synopsis and descriptions.
   * debian/control: drop xerces dependency (Closes: #378605). Xerces is
     only needed by DAnCE, which is not packaged yet.
-
- -- Thomas Girard <thomas.g.girard at free.fr>  Tue, 18 Jul 2006 08:42:23 +0000
+  * debian/libace-dev.install: remove generate_export_file.pl for now.
+  * patches/31-gcc-4.1-fix.dpatch: add other type-punned fixes taken from
+    upstream.
+  * debian/mpc.sgml: new man page.
+  * debian/patches/32-bug1770-fix.dpatch,33-bug1805-fix.dpatch: backport
+    two patches for SSL wrappers.
+
+ -- Thomas Girard <thomas.g.girard at free.fr>  Thu, 20 Jul 2006 20:55:53 +0200
 
 ace (5.4.7-9) unstable; urgency=low
 

Modified: trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-ace/trunk/debian/control?rev=404&op=diff
==============================================================================
--- trunk/debian/control (original)
+++ trunk/debian/control Mon Jul 24 20:24:04 2006
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian ACE+TAO maintainers <pkg-ace-devel at lists.alioth.debian.org>
 Uploaders: Konstantinos Margaritis <markos at debian.org>, Brian Nelson <pyro at debian.org>, Thomas Girard <thomas.g.girard at free.fr>
-Build-Depends: debhelper (>= 5.0), libssl-dev (>= 0.9.7d), dpatch (>= 2.0.10), libxt-dev (>= 4.3.0), libfltk1.1-dev (>= 1.1.4), libqt3-mt-dev (>= 3:3.3.3), tk8.4-dev (>= 8.4.7), docbook-to-man, bzip2
+Build-Depends: debhelper (>= 5.0), libssl-dev (>= 0.9.7d), dpatch (>= 2.0.10), libxt-dev (>= 4.3.0), libfltk1.1-dev (>= 1.1.4), libqt3-mt-dev (>= 3:3.3.3), tk8.4-dev (>= 8.4.7), docbook-to-man, bzip2, dpkg-dev (>= 1.13.19)
 Standards-Version: 3.7.2
 
 Package: mpc-ace

Modified: trunk/debian/patches/31-gcc-4.1-fix.dpatch
URL: http://svn.debian.org/wsvn/pkg-ace/trunk/debian/patches/31-gcc-4.1-fix.dpatch?rev=404&op=diff
==============================================================================
--- trunk/debian/patches/31-gcc-4.1-fix.dpatch (original)
+++ trunk/debian/patches/31-gcc-4.1-fix.dpatch Mon Jul 24 20:24:04 2006
@@ -376,7 +376,7 @@
 +  void *temp = ts_obj; // Need this temp to keep G++ from complaining.
 +  if (ACE_Thread::getspecific (this->key_, &temp) == -1)
      return 0; // This should not happen!
-+  ts_obj = static_cast <TYPE*> (temp);
++  ts_obj = static_cast <TYPE *> (temp);
  
    // Check to see if this is the first time in for this thread.
    if (ts_obj == 0)
@@ -385,7 +385,7 @@
  #if defined (ACE_HAS_THR_C_DEST)
    // Return the underlying ts object.
 -  return (TYPE *) tss_adapter->ts_obj_;
-+  return static_cast<TYPE *> (tss_adapter->ts_obj_);
++  return static_cast <TYPE *> (tss_adapter->ts_obj_);
  #else
    return ts_obj;
  #endif /* ACE_HAS_THR_C_DEST */
@@ -405,9 +405,9 @@
 +    {
 +      tss_adapter = static_cast <ACE_TSS_Adapter *> (temp);
 +      {
-+	if (tss_adapter != 0)
-+	  // Extract the real TS object.
-+	  ts_obj = static_cast<TYPE *> (tss_adapter->ts_obj_);
++        if (tss_adapter != 0)
++            // Extract the real TS object.
++            ts_obj = static_cast <TYPE *> (tss_adapter->ts_obj_);
 +      }
 +    }
  #else
@@ -434,7 +434,7 @@
    if (tss_adapter != 0)
      {
 -      ts_obj = (TYPE *) tss_adapter->ts_obj_;
-+      ts_obj = static_cast<TYPE *> (tss_adapter->ts_obj_);
++      ts_obj = static_cast <TYPE *> (tss_adapter->ts_obj_);
        delete tss_adapter;       // don't need this anymore
      }
  
@@ -445,7 +445,7 @@
 +  void *temp = ts_obj; // Need this temp to keep G++ from complaining.
    if (ACE_Thread::getspecific (this->key_,
 -                               (void **) &ts_obj) == -1)
-+			       &temp) == -1)
++                               &temp) == -1)
      return 0; // This should not happen!
 +  ts_obj = static_cast <TYPE *> (temp);
    if (ACE_Thread::setspecific (this->key_,
@@ -464,7 +464,7 @@
 +  void *temp = tss_adapter; // Need this temp to keep G++ from complaining.
 +  ACE_Thread::getspecific (this->key_, &temp);
 +  tss_adapter = static_cast <ACE_TSS_Adapter *> (temp);
-+  guard = static_cast<ACE_Guard<ACE_LOCK> *> (tss_adapter->ts_obj_);
++  guard = static_cast <ACE_Guard<ACE_LOCK> *> (tss_adapter->ts_obj_);
 +#else
 +  void *temp = guard; // Need this temp to keep G++ from complaining.
 +  ACE_Thread::getspecific (this->key_, &temp);


