[Pkg-ace-devel] r497 - in /branches/5.5.6/debian: changelog control

[tgg at users.alioth.debian.org]

Author: tgg
Date: Fri Mar 23 22:26:26 2007
New Revision: 497

URL: http://svn.debian.org/wsvn/pkg-ace/?sc=1&rev=497
Log:
Remerge what was made in tags/5.5.6-1.

Modified:
    branches/5.5.6/debian/changelog
    branches/5.5.6/debian/control

Modified: branches/5.5.6/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ace/branches/5.5.6/debian/changelog?rev=497&op=diff
==============================================================================
--- branches/5.5.6/debian/changelog (original)
+++ branches/5.5.6/debian/changelog Fri Mar 23 22:26:26 2007
@@ -1,3 +1,11 @@
+ace (5.5.6-2) experimental; urgency=low
+
+  * debian/control: fix broken Conflicts: fields. Package split for
+    libtao-orbsvcs happened in libtao-orbsvcs1.4.7c2a 5.4.7-11 and this should
+    not be changed.
+
+ -- Thomas Girard <thomas.g.girard at free.fr>  Fri, 23 Mar 2007 18:38:41 +0000
+
 ace (5.5.6-1) experimental; urgency=low
 
   Thomas Girard:

Modified: branches/5.5.6/debian/control
URL: http://svn.debian.org/wsvn/pkg-ace/branches/5.5.6/debian/control?rev=497&op=diff
==============================================================================
--- branches/5.5.6/debian/control (original)
+++ branches/5.5.6/debian/control Fri Mar 23 22:26:26 2007
@@ -75,7 +75,7 @@
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}
-Conflicts: libace-5.5.6 (<< 5.4.7-11)
+Conflicts: libace5.4.7c2a (<< 5.4.7-11)
 Description: ACE secure socket layer library
  This package contains wrappers that integrate the OpenSSL library in the
  ACE framework.
@@ -443,7 +443,7 @@
 Architecture: any
 Section: devel
 Depends: ${shlibs:Depends}
-Conflicts: libtao-orbsvcs-1.5.6 (<< 5.4.7-11)
+Conflicts: libtao-orbsvcs1.4.7c2a (<< 5.4.7-11)
 Description: TAO interface repository
  CORBA-aware programs can contact an interface repository to get objects
  interfaces at run-time. Then they can use the Dynamic Invocation
@@ -457,7 +457,7 @@
 Architecture: any
 Section: devel
 Depends: ${shlibs:Depends}
-Conflicts: libtao-orbsvcs-1.5.6 (<< 5.4.7-11)
+Conflicts: libtao-orbsvcs1.4.7c2a (<< 5.4.7-11)
 Description: TAO implementation repository
  An implementation repository activates CORBA servers on demand.
  .
@@ -470,7 +470,7 @@
 Architecture: any
 Section: devel
 Depends: ${shlibs:Depends}
-Conflicts: libtao-orbsvcs-1.5.6 (<< 5.4.7-11)
+Conflicts: libtao-orbsvcs1.4.7c2a (<< 5.4.7-11)
 Description: TAO fault tolerant services
  TAO supports Fault Tolerance for CORBA Objects.
  .
@@ -500,7 +500,7 @@
 Section: devel
 Depends: ${shlibs:Depends}
 Recommends: tao-nsutils
-Conflicts: libtao-orbsvcs-1.5.6 (<< 5.4.7-11)
+Conflicts: libtao-orbsvcs1.4.7c2a (<< 5.4.7-11)
 Description: TAO naming service
  TAO implementation of CORBA interoperable naming service (INS).
  .
@@ -512,7 +512,7 @@
 Architecture: any
 Section: devel
 Depends: ${shlibs:Depends}
-Conflicts: libtao-orbsvcs-1.5.6 (<< 5.4.7-11)
+Conflicts: libtao-orbsvcs1.4.7c2a (<< 5.4.7-11)
 Description: TAO trading service
  TAO implementation of CORBA trading service.
  .
@@ -523,7 +523,7 @@
 Architecture: any
 Section: devel
 Depends: ${shlibs:Depends}
-Conflicts: libtao-orbsvcs-1.5.6 (<< 5.4.7-11)
+Conflicts: libtao-orbsvcs1.4.7c2a (<< 5.4.7-11)
 Description: TAO event service
  An event service creates channels where suppliers and consumers
  can push or pull events. This channel enables asynchronous, message
@@ -536,7 +536,7 @@
 Architecture: any
 Section: devel
 Depends: ${shlibs:Depends}
-Conflicts: libtao-orbsvcs-1.5.6 (<< 5.4.7-11)
+Conflicts: libtao-orbsvcs1.4.7c2a (<< 5.4.7-11)
 Description: TAO real-time event service
  Another TAO implementation of CORBA event service. For more information on
  CORBA event service have a look at tao-event package.
@@ -548,7 +548,7 @@
 Architecture: any
 Section: devel
 Depends: ${shlibs:Depends}
-Conflicts: libtao-orbsvcs-1.5.6 (<< 5.4.7-11)
+Conflicts: libtao-orbsvcs1.4.7c2a (<< 5.4.7-11)
 Description: TAO fault-tolerant real-time event service
  TAO fault-tolerant, real-time CORBA event service. For more information on
  CORBA event service have a look at tao-event package.
@@ -562,7 +562,7 @@
 Architecture: any
 Section: devel
 Depends: ${shlibs:Depends}
-Conflicts: libtao-orbsvcs-1.5.6 (<< 5.4.7-11)
+Conflicts: libtao-orbsvcs1.4.7c2a (<< 5.4.7-11)
 Description: TAO notification service
  A notification service enhances an event service. For more information on
  CORBA event service have a look at tao-event package.
@@ -575,7 +575,7 @@
 Architecture: any
 Section: devel
 Depends: ${shlibs:Depends}
-Conflicts: libtao-orbsvcs-1.5.6 (<< 5.4.7-11)
+Conflicts: libtao-orbsvcs1.4.7c2a (<< 5.4.7-11)
 Description: TAO load balancing service
  TAO implementation of OMG Load Balancing and Monitoring specification.
  .
@@ -587,7 +587,7 @@
 Architecture: any
 Section: devel
 Depends: ${shlibs:Depends}
-Conflicts: libtao-orbsvcs-1.5.6 (<< 5.4.7-11)
+Conflicts: libtao-orbsvcs1.4.7c2a (<< 5.4.7-11)
 Description: TAO telecom log services
  TAO implementations of CORBA telecom log service.
  .
@@ -601,7 +601,7 @@
 Architecture: any
 Section: devel
 Depends: ${shlibs:Depends}
-Conflicts: libtao-orbsvcs-1.5.6 (<< 5.4.7-11)
+Conflicts: libtao-orbsvcs1.4.7c2a (<< 5.4.7-11)
 Description: TAO scheduling service
  TAO implementation of CORBA scheduling service.
  .
@@ -613,7 +613,7 @@
 Architecture: any
 Section: devel
 Depends: ${shlibs:Depends}
-Conflicts: libtao-orbsvcs-1.5.6 (<< 5.4.7-11)
+Conflicts: libtao-orbsvcs1.4.7c2a (<< 5.4.7-11)
 Description: TAO concurrency service
  A concurrency service provides a mechanism to acquire and release locks in
  a distributed system.
@@ -624,7 +624,7 @@
 Architecture: any
 Section: devel
 Depends: ${shlibs:Depends}
-Conflicts: libtao-orbsvcs-1.5.6 (<< 5.4.7-11)
+Conflicts: libtao-orbsvcs1.4.7c2a (<< 5.4.7-11)
 Description: TAO lifecycle service
  The CORBA lifecycle service allows clients to create, delete, copy and move
  objects.
@@ -635,7 +635,7 @@
 Architecture: any
 Section: devel
 Depends: ${shlibs:Depends}
-Conflicts: libtao-orbsvcs-1.5.6 (<< 5.4.7-11)
+Conflicts: libtao-orbsvcs1.4.7c2a (<< 5.4.7-11)
 Description: TAO time service
  A time service offers globally synchronized time to clients.
  .