[SCM] openni/master: manually generate modules.xml (Closes: #771518)

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

The following commit has been merged in the master branch:
commit 6dbdc8eabaa9d0065b0e2598164d805de6f18cea
Author: Jochen Sprickerhof <git at jochen.sprickerhof.de>
Date:   Tue Dec 2 00:13:06 2014 +0100

    manually generate modules.xml (Closes: #771518)

diff --git a/debian/control b/debian/control
index 4faf4cc..b651cea 100644
--- a/debian/control
+++ b/debian/control
@@ -23,8 +23,7 @@ Package: libopenni0
 Architecture: any
 Pre-Depends: dpkg (>= 1.15.7.2)
 Depends: ${shlibs:Depends},
-         ${misc:Depends},
-         openni-utils
+         ${misc:Depends}
 Recommends: libopenni-sensor-pointclouds0 | libopenni-sensor-primesense0
 Conflicts: openni-dev
 Description: framework for sensor-based 'Natural Interaction'
diff --git a/debian/libopenni0.postinst b/debian/libopenni0.postinst
index c618d88..ae9f206 100644
--- a/debian/libopenni0.postinst
+++ b/debian/libopenni0.postinst
@@ -5,9 +5,6 @@ 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
@@ -17,9 +14,14 @@ case "$1" in
     fi
     # Only register upon fresh install
     if [ -z "$2" ]; then
-      for module in $MODULES; do
-        niReg -r $MODULE_DIR/$module /etc/openni
-      done
+      # manually generate modules.xml, so we don't have a cyclic dependency to openni-utils
+      cat > /var/lib/ni/modules.xml <<EOF
+<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>
+EOF
     fi
     ;;
 esac
diff --git a/debian/libopenni0.prerm b/debian/libopenni0.prerm
deleted file mode 100644
index b4a4445..0000000
--- a/debian/libopenni0.prerm
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/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

-- 
openni packaging