[Pkg-corba-commits] r237 - /trunk/omniorb/debian/control

[flub-guest at users.alioth.debian.org]

Author: flub-guest
Date: Tue Mar 22 21:46:58 2011
New Revision: 237

URL: http://svn.debian.org/wsvn/pkg-corba/?sc=1&rev=237
Log:
Add conflict with previous versions of omniidl-python

This is the simplest migration strategy, at the cost of possibly
having a temporarily uninstallable omniidl in sid/testing (at least if
you want to keep omniidl-python available).  The alternative would be
to hack omniidl with __path__ stuff in order to look in the previous
and the current place.  But then we're stuck with that patch till the
next release and the upgrade cost is not that much, a stable upgrade
won't notice this.

Modified:
    trunk/omniorb/debian/control

Modified: trunk/omniorb/debian/control
URL: http://svn.debian.org/wsvn/pkg-corba/trunk/omniorb/debian/control?rev=237&op=diff
==============================================================================
--- trunk/omniorb/debian/control (original)
+++ trunk/omniorb/debian/control Tue Mar 22 21:46:58 2011
@@ -191,7 +191,7 @@
 Architecture: any
 Depends: ${shlibs:Depends}, ${python:Depends}, ${misc:Depends}
 Suggests: omniidl-python
-Conflicts: omniidl4 (<< 4.1.3-1)
+Conflicts: omniidl4 (<< 4.1.3-1), omniidl-python (<< 3.5-1)
 Replaces: omniidl4 (<< 4.1.3-1)
 Description: omniORB IDL to C++ and Python compiler
  omniORB4 is a freely available Common Object Request Broker