[SCM] tango branch, master, updated. debian/8.0.5+dfsg-1-1-g1dd4c13

[Picca Frédéric-Emma?==?UTF-8?Q?nuel]

The following commit has been merged in the master branch:
commit 6e14dfb7157a8e83fdb60d2482ab06bcc4e0c960
Author: Picca Frédéric-Emmanuel <picca at debian.org>
Date:   Wed Jun 13 22:19:41 2012 +0200

    add conflict with libtango7-dev

diff --git a/debian/control b/debian/control
index eca32cf..6ee7450 100644
--- a/debian/control
+++ b/debian/control
@@ -99,6 +99,7 @@ Depends: libtango8 (= ${binary:Version}),
          ${misc:Depends},
          liblog4tango4-dev,
          libcos4-dev
+Conflicts: libtango7-dev
 Description: TANGO distributed control system - development library
  TANGO is an object-oriented distributed control system using CORBA. In
  TANGO all objects are representations of devices, which can be on the

-- 
TANGO distributed control system.