[SCM] openni/master: Move ni{Reg,License} back into openni-utils

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

The following commit has been merged in the master branch:
commit 0bf3ada308cac0235c6e4b85d00b7a0a75195e80
Author: Jochen Sprickerhof <git at jochen.sprickerhof.de>
Date:   Tue Nov 25 12:15:12 2014 +0100

    Move ni{Reg,License} back into openni-utils
    
    According to Policy §8.2, thanks Tobias Frost. This creates a circular
    dependency between libopenni0 and openni-utils

diff --git a/debian/changelog b/debian/changelog
index 76796ea..b24603b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,9 @@
-openni (1.5.4.0-8) unstable; urgency=medium
+openni (1.5.4.0-8) UNRELEASED; urgency=medium
 
-  * Add Doxygen db to clean target
-  * Generate {licenses,modules}.xml (Closes: #767653)
-  * postinst: register modules only upon fresh install
+  * Do not ship but generate {licenses,modules}.xml at install time
+    (Closes: #767653)
 
- -- Jochen Sprickerhof <debian at jochen.sprickerhof.de>  Sun, 23 Nov 2014 14:39:26 +0100
+ -- Jochen Sprickerhof <debian at jochen.sprickerhof.de>  Mon, 24 Nov 2014 22:33:38 +0100
 
 openni (1.5.4.0-7) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 8e028f5..4faf4cc 100644
--- a/debian/control
+++ b/debian/control
@@ -23,11 +23,10 @@ Package: libopenni0
 Architecture: any
 Pre-Depends: dpkg (>= 1.15.7.2)
 Depends: ${shlibs:Depends},
-         ${misc:Depends}
+         ${misc:Depends},
+         openni-utils
 Recommends: libopenni-sensor-pointclouds0 | libopenni-sensor-primesense0
 Conflicts: openni-dev
-Breaks: openni-utils (<< 1.5.4.0-8)
-Replaces: openni-utils (<< 1.5.4.0-8)
 Description: framework for sensor-based 'Natural Interaction'
  OpenNI is a framework for getting data to support 'Natural Interaction',
  i.e. skeleton tracking, gesture tracking, and similar ways of getting data
diff --git a/debian/libopenni0.install b/debian/libopenni0.install
index dfbf3ed..51a3ab3 100644
--- a/debian/libopenni0.install
+++ b/debian/libopenni0.install
@@ -1,4 +1,2 @@
 Platform/Linux/Bin/*-Release/lib*.so.* usr/lib/
 Data/SamplesConfig.xml etc/openni/
-Platform/Linux/Bin/*-Release/niReg usr/bin/
-Platform/Linux/Bin/*-Release/niLicense usr/bin/
diff --git a/debian/openni-utils.install b/debian/openni-utils.install
index e24ddfa..41b1fc5 100644
--- a/debian/openni-utils.install
+++ b/debian/openni-utils.install
@@ -1,2 +1,4 @@
 Platform/Linux/Bin/*-Release/NiViewer usr/bin/
 Platform/Linux/Bin/*-Release/Sample-* usr/bin/
+Platform/Linux/Bin/*-Release/niReg usr/bin/
+Platform/Linux/Bin/*-Release/niLicense usr/bin/

-- 
openni packaging