[SCM] openni-sensor-pointclouds/master: Add conflicts against other driver packages

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

The following commit has been merged in the master branch:
commit d4ba911beb879870cef8afd9946d4dc79a3104c5
Author: Jochen Sprickerhof <jochen at sprickerhof.de>
Date:   Sun Nov 24 12:34:46 2013 +0100

    Add conflicts against other driver packages

diff --git a/debian/control b/debian/control
index 2ca58f4..b919945 100644
--- a/debian/control
+++ b/debian/control
@@ -19,6 +19,7 @@ Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends},
          libopenni-sensor-pointclouds0 (= ${binary:Version})
+Conflicts: openni-sensor-primesense-dev, openni-sensor-avin2-dev
 Description: headers for Kinect sensor modules for the OpenNI framework
  OpenNI is a framework for getting data to support 'Natural Interaction',
  i.e. skeleton tracking, gesture tracking, and similar ways of getting data
@@ -36,6 +37,7 @@ Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends},
          openni-utils
+Conflicts: openni-sensor-primesense0
 Description: Microsoft Kinect sensor modules for the OpenNI framework
  OpenNI is a framework for getting data to support 'Natural Interaction',
  i.e. skeleton tracking, gesture tracking, and similar ways of getting data

-- 
openni-sensor-pointclouds packaging