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

[tgg at users.alioth.debian.org]

Author: tgg
Date: Tue Oct 28 17:32:04 2014
New Revision: 311

URL: http://svn.debian.org/wsvn/pkg-corba/?sc=1&rev=311
Log:
target experimental; too late for Jessie :-(

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=311&op=diff
==============================================================================
--- trunk/omniorb/debian/changelog	(original)
+++ trunk/omniorb/debian/changelog	Tue Oct 28 17:32:04 2014
@@ -1,4 +1,4 @@
-omniorb-dfsg (4.2.0-1) unstable; urgency=low
+omniorb-dfsg (4.2.0-1) experimental; urgency=low
 
   [ Floris Bruynooghe ]
   * New upstream release (Closes: #737948)
@@ -16,8 +16,9 @@
   * d/control:
     - bump standards-version to 3.9.6.
     - rename packages to reflect new 4.2 ABI.
-
- -- Thomas Girard <thomas.g.girard at free.fr>  Fri, 10 Oct 2014 17:06:33 +0200
+    - add appropriate Conflicts: Replaces: wherever needed.
+
+ -- Thomas Girard <thomas.g.girard at free.fr>  Tue, 28 Oct 2014 18:00:53 +0100
 
 omniorb-dfsg (4.1.6-2) unstable; urgency=low
 

Modified: trunk/omniorb/debian/control
URL: http://svn.debian.org/wsvn/pkg-corba/trunk/omniorb/debian/control?rev=311&op=diff
==============================================================================
--- trunk/omniorb/debian/control	(original)
+++ trunk/omniorb/debian/control	Tue Oct 28 17:32:04 2014
@@ -60,6 +60,8 @@
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Conflicts: libcos4-1
+Replaces: libcos4-1
 Description: omniORB CORBA services stubs
  omniORB4 is a freely available Common Object Request Broker
  Architecture (CORBA) 2.6 compliant object request broker (ORB)