[SCM] openni/master: Generate {licenses, modules}.xml (Closes: #767653)

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

The following commit has been merged in the master branch:
commit 8adf73e0873bee3efb50ce5b022caa04b558f7ba
Author: Jochen Sprickerhof <git at jochen.sprickerhof.de>
Date:   Sun Nov 2 15:26:46 2014 +0100

    Generate {licenses,modules}.xml (Closes: #767653)
    
    - Move ni{License,Reg} into libopenni0 to break circular dependency with
      openni-utils.
    - Remove /var/lib/ni/{licenses,modules}.xml upon purge
    - Preserve changes to {licenses,modules}.xml when upgrading from older
      versions.

diff --git a/debian/control b/debian/control
index b651cea..8e028f5 100644
--- a/debian/control
+++ b/debian/control
@@ -26,6 +26,8 @@ Depends: ${shlibs:Depends},
          ${misc:Depends}
 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.dirs b/debian/libopenni0.dirs
new file mode 100644
index 0000000..3d7f1d2
--- /dev/null
+++ b/debian/libopenni0.dirs
@@ -0,0 +1 @@
+/var/lib/ni
diff --git a/debian/libopenni0.install b/debian/libopenni0.install
index 3d3ec5d..dfbf3ed 100644
--- a/debian/libopenni0.install
+++ b/debian/libopenni0.install
@@ -1,4 +1,4 @@
 Platform/Linux/Bin/*-Release/lib*.so.* usr/lib/
 Data/SamplesConfig.xml etc/openni/
-debian/licenses.xml var/lib/ni/
-debian/modules.xml var/lib/ni/
+Platform/Linux/Bin/*-Release/niReg usr/bin/
+Platform/Linux/Bin/*-Release/niLicense usr/bin/
diff --git a/debian/libopenni0.postinst b/debian/libopenni0.postinst
index edeb096..8bb557e 100644
--- a/debian/libopenni0.postinst
+++ b/debian/libopenni0.postinst
@@ -5,6 +5,24 @@ set -e
 dpkg-maintscript-helper mv_conffile /etc/openni/modules.xml /var/lib/ni/modules.xml 1.5.4.0-7~ libopenni0 -- "$@"
 dpkg-maintscript-helper mv_conffile /etc/openni/licenses.xml /var/lib/ni/licenses.xml 1.5.4.0-7~ libopenni0 -- "$@"
 
+MODULE_DIR="/usr/lib/"
+MODULES="libnimMockNodes.so.0 libnimCodecs.so.0 libnimRecorder.so.0"
+
+case "$1" in
+  configure)
+    # Fix for #767653
+    if [ -n "$2" ] && dpkg --compare-versions "$2" lt-nl "1.5.4.0-8"; then
+      mv /var/lib/ni/licenses.xml.dpkg-old /var/lib/ni/licenses.xml
+      mv /var/lib/ni/modules.xml.dpkg-old /var/lib/ni/modules.xml
+    else
+      niLicense PrimeSense 0KOIk2JeIBYClPWVnMoRKn5cdY4=
+      for module in $MODULES; do
+        niReg -r $MODULE_DIR/$module /etc/openni
+      done
+    fi
+    ;;
+esac
+
 #DEBHELPER#
 
 exit 0
diff --git a/debian/libopenni0.postrm b/debian/libopenni0.postrm
index edeb096..34ef7fa 100644
--- a/debian/libopenni0.postrm
+++ b/debian/libopenni0.postrm
@@ -5,6 +5,13 @@ set -e
 dpkg-maintscript-helper mv_conffile /etc/openni/modules.xml /var/lib/ni/modules.xml 1.5.4.0-7~ libopenni0 -- "$@"
 dpkg-maintscript-helper mv_conffile /etc/openni/licenses.xml /var/lib/ni/licenses.xml 1.5.4.0-7~ libopenni0 -- "$@"
 
+case "$1" in
+  purge)
+    rm -f /var/lib/ni/modules.xml 2>/dev/null
+    rm -f /var/lib/ni/licenses.xml 2>/dev/null
+    ;;
+esac
+
 #DEBHELPER#
 
 exit 0
diff --git a/debian/libopenni0.preinst b/debian/libopenni0.preinst
index edeb096..1578e66 100644
--- a/debian/libopenni0.preinst
+++ b/debian/libopenni0.preinst
@@ -5,6 +5,15 @@ set -e
 dpkg-maintscript-helper mv_conffile /etc/openni/modules.xml /var/lib/ni/modules.xml 1.5.4.0-7~ libopenni0 -- "$@"
 dpkg-maintscript-helper mv_conffile /etc/openni/licenses.xml /var/lib/ni/licenses.xml 1.5.4.0-7~ libopenni0 -- "$@"
 
+case "$1" in
+  upgrade)
+    # Fix for #767653
+    if dpkg --compare-versions "$2" lt "1.5.4.0-8"; then
+      mv /var/lib/ni/licenses.xml /var/lib/ni/licenses.xml.dpkg-old
+      mv /var/lib/ni/modules.xml /var/lib/ni/modules.xml.dpkg-old
+    fi
+esac
+
 #DEBHELPER#
 
 exit 0
diff --git a/debian/libopenni0.prerm b/debian/libopenni0.prerm
new file mode 100644
index 0000000..b4a4445
--- /dev/null
+++ b/debian/libopenni0.prerm
@@ -0,0 +1,18 @@
+#!/bin/sh
+
+set -e
+
+MODULE_DIR="/usr/lib/"
+MODULES="libnimMockNodes.so.0 libnimCodecs.so.0 libnimRecorder.so.0"
+
+case "$1" in
+  remove)
+    for module in $MODULES; do
+      niReg -u $MODULE_DIR/$module /etc/openni
+    done
+    ;;
+esac
+
+#DEBHELPER#
+
+exit 0
diff --git a/debian/licenses.xml b/debian/licenses.xml
deleted file mode 100644
index e5967fd..0000000
--- a/debian/licenses.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<Licenses>
-    <License vendor="PrimeSense" key="0KOIk2JeIBYClPWVnMoRKn5cdY4=" />
-</Licenses>
diff --git a/debian/modules.xml b/debian/modules.xml
deleted file mode 100644
index b00f7fe..0000000
--- a/debian/modules.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<Modules>
-    <Module path="/usr/lib/libnimMockNodes.so.0" configDir="/etc/openni" />
-    <Module path="/usr/lib/libnimCodecs.so.0" configDir="/etc/openni" />
-    <Module path="/usr/lib/libnimRecorder.so.0" configDir="/etc/openni" />
-</Modules>
diff --git a/debian/openni-utils.install b/debian/openni-utils.install
index 41b1fc5..e24ddfa 100644
--- a/debian/openni-utils.install
+++ b/debian/openni-utils.install
@@ -1,4 +1,2 @@
 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