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

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

Author: flub-guest
Date: Mon Oct 12 23:56:41 2009
New Revision: 196

URL: http://svn.debian.org/wsvn/pkg-corba/?sc=1&rev=196
Log:
Conflict with python-pyorbit-omg since only one ORB can be the default
for the CORBA bindings.

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

Modified: trunk/python-omniorb/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-corba/trunk/python-omniorb/debian/changelog?rev=196&op=diff
==============================================================================
--- trunk/python-omniorb/debian/changelog (original)
+++ trunk/python-omniorb/debian/changelog Mon Oct 12 23:56:41 2009
@@ -3,8 +3,9 @@
   * New upstream release
   * Bump Standards-Version to 3.8.2, no changes needed.
   * Drop transitional packages, they've made it into a stable release.
-
- -- Floris Bruynooghe <floris.bruynooghe at gmail.com>  Sat, 04 Jul 2009 16:23:37 +0100
+  * Let python-omniorb-omg conflict with python-pyorbit-omg (Closes: #550629).
+
+ -- Floris Bruynooghe <floris.bruynooghe at gmail.com>  Tue, 13 Oct 2009 00:53:37 +0100
 
 python-omniorb (3.2-2) unstable; urgency=low
 

Modified: trunk/python-omniorb/debian/control
URL: http://svn.debian.org/wsvn/pkg-corba/trunk/python-omniorb/debian/control?rev=196&op=diff
==============================================================================
--- trunk/python-omniorb/debian/control (original)
+++ trunk/python-omniorb/debian/control Mon Oct 12 23:56:41 2009
@@ -46,7 +46,7 @@
 Package: python-omniorb-omg
 Architecture: all
 Depends: python-omniorb (>= ${binary:Version})
-Conflicts: python2.4-omniorb2-omg, python-omniorb2-omg (<< 3.1-1)
+Conflicts: python2.4-omniorb2-omg, python-omniorb2-omg (<< 3.1-1), python-pyorbit-omg
 Replaces: python2.4-omniorb2-omg, python-omniorb2-omg
 XB-Python-Version: ${python:Versions}
 Description: CORBA OMG standard files for python-omniorb
@@ -57,7 +57,9 @@
  CORBA 2.6 compliant ORB.
  .
  This package includes the Python files that are necessary to
- fulfil the OMG standard 02-09-07.
+ fulfil the OMG standard 02-09-07.  It conflicts with
+ python-pyorbit-omg since only one package can provide the default
+ CORBA bindings.
 
 Package: omniidl-python
 Architecture: all