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

[tgg at users.alioth.debian.org]

Author: tgg
Date: Fri Apr  8 15:24:31 2011
New Revision: 262

URL: http://svn.debian.org/wsvn/pkg-corba/?sc=1&rev=262
Log:
use Break: instead of Conflicts:

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=262&op=diff
==============================================================================
--- trunk/omniorb/debian/changelog (original)
+++ trunk/omniorb/debian/changelog Fri Apr  8 15:24:31 2011
@@ -22,9 +22,11 @@
   * 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 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
+  * Remove Conflicts: and Replaces: no longer needed now that Squeeze was
+    released.
+  * Use Breaks: instead of Conflicts: for omniidl change on omniidl-python.
+
+ -- Thomas Girard <thomas.g.girard at free.fr>  Fri, 08 Apr 2011 17:19:28 +0200
 
 omniorb-dfsg (4.1.3-1) unstable; urgency=low
 

Modified: trunk/omniorb/debian/control
URL: http://svn.debian.org/wsvn/pkg-corba/trunk/omniorb/debian/control?rev=262&op=diff
==============================================================================
--- trunk/omniorb/debian/control (original)
+++ trunk/omniorb/debian/control Fri Apr  8 15:24:31 2011
@@ -183,7 +183,7 @@
 Architecture: any
 Depends: ${shlibs:Depends}, ${python:Depends}, ${misc:Depends}
 Suggests: omniidl-python
-Conflicts: omniidl-python (<< 3.5-1)
+Breaks: 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)