[Pkg-corba-commits] r261 - in /trunk/omniorb/debian: changelog control

[tgg at users.alioth.debian.org]

Author: tgg
Date: Fri Apr  8 14:58:22 2011
New Revision: 261

URL: http://svn.debian.org/wsvn/pkg-corba/?sc=1&rev=261
Log:
remove obsolete Conflicts: and Replaces:

Modified:
    trunk/omniorb/debian/changelog
    trunk/omniorb/debian/control

Modified: trunk/omniorb/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-corba/trunk/omniorb/debian/changelog?rev=261&op=diff
==============================================================================
--- trunk/omniorb/debian/changelog (original)
+++ trunk/omniorb/debian/changelog Fri Apr  8 14:58:22 2011
@@ -21,7 +21,8 @@
   [ Thomas Girard ]
   * Simplify build process: we no longer need to force CC and CXX.
   * Bump shlibs to 4.1.5, due to changes in private headers.
-  * Add buil-dependency on pkg-config.
+  * Add build-dependency on pkg-config.
+  * Remove obsolete Conflicts: and Replaces:
 
  -- Thomas Girard <thomas.g.girard at free.fr>  Thu, 07 Apr 2011 13:02:02 +0200
 

Modified: trunk/omniorb/debian/control
URL: http://svn.debian.org/wsvn/pkg-corba/trunk/omniorb/debian/control?rev=261&op=diff
==============================================================================
--- trunk/omniorb/debian/control (original)
+++ trunk/omniorb/debian/control Fri Apr  8 14:58:22 2011
@@ -12,8 +12,6 @@
 Package: omniorb
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Conflicts: omniorb4 (<< 4.1.3-1)
-Replaces: omniorb4 (<< 4.1.3-1)
 Description: IOR and naming service utilities for omniORB
  omniORB is a freely available Common Object Request Broker
  Architecture (CORBA) 2.6 compliant object request broker (ORB)
@@ -24,8 +22,6 @@
 Package: omniorb-idl
 Architecture: all
 Depends: ${misc:Depends}
-Conflicts: omniorb4-idl (<< 4.1.3-1)
-Replaces: omniorb4-idl (<< 4.1.3-1)
 Description: omniORB CORBA services idl files
  omniORB is a freely available Common Object Request Broker
  Architecture (CORBA) 2.6 compliant object request broker (ORB)
@@ -38,8 +34,6 @@
 Package: omniorb-nameserver
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Conflicts: omniorb4-nameserver (<< 4.1.3-1)
-Replaces: omniorb4-nameserver (<< 4.1.3-1)
 Description: omniORB naming service
  omniORB is a freely available Common Object Request Broker
  Architecture (CORBA) 2.6 compliant object request broker (ORB)
@@ -52,8 +46,6 @@
 Package: omniorb-doc
 Architecture: all
 Depends: ${misc:Depends}
-Conflicts: omniorb4-doc (<< 4.1.3-1)
-Replaces: omniorb4-doc (<< 4.1.3-1)
 Section: doc
 Description: omniORB documentation
  omniORB4 is a freely available Common Object Request Broker
@@ -191,8 +183,7 @@
 Architecture: any
 Depends: ${shlibs:Depends}, ${python:Depends}, ${misc:Depends}
 Suggests: omniidl-python
-Conflicts: omniidl4 (<< 4.1.3-1), omniidl-python (<< 3.5-1)
-Replaces: omniidl4 (<< 4.1.3-1)
+Conflicts: omniidl-python (<< 3.5-1)
 Description: omniORB IDL to C++ and Python compiler
  omniORB4 is a freely available Common Object Request Broker
  Architecture (CORBA) 2.6 compliant object request broker (ORB)