[Pkg-ace-commits] [pkg-ace] r746 - trunk/debian

Sat Feb 19 09:23:30 UTC 2011

Author: tgg
Date: 2011-02-19 09:23:27 +0000 (Sat, 19 Feb 2011)
New Revision: 746

Modified:
   trunk/debian/changelog
   trunk/debian/control
Log:
revert part of the previous commit as per Pau rationale


Modified: trunk/debian/changelog
===================================================================

--- trunk/debian/changelog	2011-02-17 21:47:42 UTC (rev 745)
+++ trunk/debian/changelog	2011-02-19 09:23:27 UTC (rev 746)
@@ -13,11 +13,9 @@
   * Register documentation with doc-base
 
   [ Thomas Girard ]
-  * Remove old Conflicts: Replaces: and transitional packages now that
-    Squeeze was released.
   * Build-depend on Tcl/Tk >= 8.5.
 
- -- Thomas Girard <thomas.g.girard at free.fr>  Thu, 17 Feb 2011 22:47:16 +0100
+ -- Thomas Girard <thomas.g.girard at free.fr>  Sat, 19 Feb 2011 10:22:32 +0100
 
 ace (6.0.0-1) experimental; urgency=low
 

Modified: trunk/debian/control
===================================================================
--- trunk/debian/control	2011-02-17 21:47:42 UTC (rev 745)
+++ trunk/debian/control	2011-02-19 09:23:27 UTC (rev 746)
@@ -13,6 +13,7 @@
 Architecture: all
 Depends: ${perl:Depends}, ${misc:Depends}
 Recommends: make
+Replaces: libace-dev (= 5.6.3-4)
 Suggests: libace-dev, pkg-config
 Description: makefile, project and workspace creator
  This package contains the Makefile, Project and Workspace Creator (MPC)
@@ -53,6 +54,7 @@
 Section: libdevel
 Depends: libace-6.0.1 (= ${binary:Version}), ${misc:Depends}
 Suggests: libace-doc, libtao-dev, pkg-config
+Replaces: mpc-ace (<< 5.6.3-4)
 Description: C++ network programming framework development files
  This package contains the header files and static library for the ACE
  framework.
@@ -143,6 +145,8 @@
 Package: ace-gperf
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Conflicts: gperf-ace (<< 5.7.7-1)
+Replaces: gperf-ace (<< 5.7.7-1)
 Description: ACE perfect hash function generator
  ace_gperf is the ACE version of gperf.
  .
@@ -150,6 +154,14 @@
  basically the same options and functionality. ace_gperf simply takes
  advantage of the some of the features provided by the ACE library.
 
+Package: gperf-ace
+Architecture: all
+Depends: ace-gperf, ${misc:Depends}
+Description: ACE perfect hash function generator (transitional package)
+ This package is a transitional package to ace-gperf.
+ .
+ It can be safely removed after installation.
+
 Package: libacexml-6.0.1
 Architecture: any
 Section: libs
@@ -165,6 +177,7 @@
 Package: libacexml-dev
 Architecture: any
 Section: libdevel
+Replaces: libace-dev (<< 5.7.7-4)
 Depends: libacexml-6.0.1 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
 Description: ACE SAX based XML parsing library development files
  This package contains the header files and static library for the ACE
@@ -320,6 +333,7 @@
 Package: libtao-dev
 Architecture: any
 Section: libdevel
+Replaces: libtao-orbsvcs-dev (<< 5.7.7-4)
 Depends: libtao-2.0.1 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
 Suggests: libtao-doc, libtao-orbsvcs-dev
 Description: ACE based CORBA ORB core libraries development files
@@ -346,6 +360,7 @@
 Package: libtao-orbsvcs-dev
 Architecture: any
 Section: libdevel
+Replaces: libtao-dev (<< 5.7.7-4)
 Depends: libtao-orbsvcs-2.0.1 (= ${binary:Version}), libtao-dev (= ${binary:Version}), ${misc:Depends}
 Description: TAO CORBA services development files
  This package contains the header files for the TAO CORBA services.
@@ -495,6 +510,8 @@
 Package: tao-cosnaming
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Conflicts: tao-naming (<< 5.7.7-1)
+Replaces: tao-naming (<< 5.7.7-1)
 Recommends: tao-utils
 Description: TAO naming service
  TAO implementation of CORBA interoperable naming service (INS).
@@ -506,9 +523,19 @@
  The following program is included:
   * tao_cosnaming
 
+Package: tao-naming
+Architecture: all
+Depends: tao-cosnaming, ${misc:Depends}
+Description: TAO naming service (transitional package)
+ This package is a transitional package to tao-cosnaming.
+ .
+ It can be safely removed after installation.
+
 Package: tao-costrading
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Conflicts: tao-trading (<< 5.7.7-1)
+Replaces: tao-trading (<< 5.7.7-1)
 Description: TAO trading service
  TAO implementation of CORBA trading service.
  .
@@ -519,9 +546,19 @@
  The following program is included:
   * tao_costrading
 
+Package: tao-trading
+Architecture: all
+Depends: tao-costrading, ${misc:Depends}
+Description: TAO trading service (transitional package)
+ This package is a transitional package to tao-costrading.
+ .
+ It can be safely removed after installation.
+
 Package: tao-cosevent
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Conflicts: tao-event (<< 5.7.7-1)
+Replaces: tao-event (<< 5.7.7-1)
 Description: TAO event service
  An event service creates channels where suppliers and consumers can
  push or pull events. This channel enables asynchronous, message based
@@ -533,6 +570,14 @@
  The following program is included:
   * tao_cosevent
 
+Package: tao-event
+Architecture: all
+Depends: tao-cosevent, ${misc:Depends}
+Description: TAO event service (transitional package)
+ This package is a transitional package to tao-cosevent.
+ .
+ It can be safely removed after installation.
+
 Package: tao-rtevent
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -563,6 +608,8 @@
 Package: tao-cosnotification
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Conflicts: tao-notify (<< 5.7.7-1)
+Replaces: tao-notify (<< 5.7.7-1)
 Description: TAO notification service
  A notification service enhances an event service. For more
  information on CORBA event service have a look at tao-cosevent
@@ -575,6 +622,14 @@
  This package contains:
   * tao_cosnotification
 
+Package: tao-notify
+Architecture: all
+Depends: tao-cosnotification, ${misc:Depends}
+Description: TAO notification service (transitional package)
+ This package is a transitional package to tao-cosnotification.
+ .
+ It can be safely removed after installation.
+
 Package: tao-load
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -589,6 +644,8 @@
 Package: tao-tls
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Conflicts: tao-log (<< 5.7.7-1)
+Replaces: tao-log (<< 5.7.7-1)
 Description: TAO telecom log services
  TAO implementations of CORBA telecom log service.
  .
@@ -598,6 +655,14 @@
   * tao_tls_notify
   * tao_tls_rtevent
 
+Package: tao-log
+Architecture: all
+Depends: tao-tls, ${misc:Depends}
+Description: TAO telecom log services (transitional package)
+ This package is a transitional package to tao-tls.
+ .
+ It can be safely removed after installation.
+
 Package: tao-scheduling
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -611,24 +676,46 @@
 Package: tao-cosconcurrency
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Conflicts: tao-concurrency (<< 5.7.7-1)
+Replaces: tao-concurrency (<< 5.7.7-1)
 Description: TAO concurrency service
  A concurrency service provides a mechanism to acquire and release
  locks in a distributed system.
  .
  TAO version does not support transactions.
 
+Package: tao-concurrency
+Architecture: all
+Depends: tao-cosconcurrency, ${misc:Depends}
+Description: TAO concurrency service (transitional package)
+ This package is a transitional package to tao-cosconcurrency.
+ .
+ It can be safely removed after installation.
+
 Package: tao-coslifecycle
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Conflicts: tao-lifecycle (<< 5.7.7-1)
+Replaces: tao-lifecycle (<< 5.7.7-1)
 Description: TAO lifecycle service
  The CORBA lifecycle service allows clients to create, delete, copy
  and move objects.
  .
  This package contains the TAO implementation of such service.
 
+Package: tao-lifecycle
+Architecture: all
+Depends: tao-coslifecycle, ${misc:Depends}
+Description: TAO lifecycle service (transitional package)
+ This package is a transitional package to tao-coslifecycle.
+ .
+ It can be safely removed after installation.
+
 Package: tao-costime
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Conflicts: tao-time (<< 5.7.7-1)
+Replaces: tao-time (<< 5.7.7-1)
 Description: TAO time service
  A time service offers globally synchronized time to clients.
  .
@@ -637,6 +724,14 @@
   * tao_costime_server, queried by clerks to keep their time
     synchronized
 
+Package: tao-time
+Architecture: all
+Depends: tao-costime, ${misc:Depends}
+Description: TAO time service (transitional package)
+ This package is a transitional package to tao-costime.
+ .
+ It can be safely removed after installation.
+
 Package: ace-netsvcs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}


