[SCM] openni/master: Move {licenses, modules}.xml to /var/lib/ni/ (closes #734768)

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

The following commit has been merged in the master branch:
commit 79b2ac45c9b74ef664065acc3568f30806aa47be
Author: Jochen Sprickerhof <jochen at sprickerhof.de>
Date:   Sat Feb 22 19:54:30 2014 +0100

    Move {licenses,modules}.xml to /var/lib/ni/ (closes #734768)

diff --git a/debian/control b/debian/control
index 4a1ff71..7d9f11d 100644
--- a/debian/control
+++ b/debian/control
@@ -21,6 +21,7 @@ Vcs-Browser: http://anonscm.debian.org/git/pkg-multimedia/openni.git
 
 Package: libopenni0
 Architecture: any
+Pre-Depends: dpkg (>= 1.15.7.2)
 Depends: ${shlibs:Depends},
          ${misc:Depends}
 Recommends: libopenni-sensor-pointclouds0 | libopenni-sensor-primesense0
diff --git a/debian/libopenni0.install b/debian/libopenni0.install
index 1c25869..3d3ec5d 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 etc/openni/
-debian/modules.xml etc/openni/
+debian/licenses.xml var/lib/ni/
+debian/modules.xml var/lib/ni/
diff --git a/debian/libopenni0.postinst b/debian/libopenni0.postinst
new file mode 100644
index 0000000..edeb096
--- /dev/null
+++ b/debian/libopenni0.postinst
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+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 -- "$@"
+
+#DEBHELPER#
+
+exit 0
diff --git a/debian/libopenni0.postrm b/debian/libopenni0.postrm
new file mode 100644
index 0000000..edeb096
--- /dev/null
+++ b/debian/libopenni0.postrm
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+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 -- "$@"
+
+#DEBHELPER#
+
+exit 0
diff --git a/debian/libopenni0.preinst b/debian/libopenni0.preinst
new file mode 100644
index 0000000..edeb096
--- /dev/null
+++ b/debian/libopenni0.preinst
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+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 -- "$@"
+
+#DEBHELPER#
+
+exit 0
diff --git a/debian/patches/0003-Change-path-of-config-files-to-etc-openni.patch b/debian/patches/0003-Change-path-of-config-files-to-etc-openni.patch
index 484736d..176ea1a 100644
--- a/debian/patches/0003-Change-path-of-config-files-to-etc-openni.patch
+++ b/debian/patches/0003-Change-path-of-config-files-to-etc-openni.patch
@@ -15,8 +15,7 @@ Subject: Change path of config files to /etc/openni
  Samples/NiUserSelection/UserTracker.cpp             |    2 +-
  Samples/NiUserTracker/main.cpp                      |    2 +-
  Samples/NiViewer/NiViewer.cpp                       |    2 +-
- Source/OpenNI/XnOpenNI.cpp                          |    4 ++--
- 13 files changed, 15 insertions(+), 15 deletions(-)
+ 12 files changed, 13 insertions(+), 13 deletions(-)
 
 diff --git a/Samples/NiAudioSample/NiAudioSample.cpp b/Samples/NiAudioSample/NiAudioSample.cpp
 index a7acdf3..b57463b 100644
@@ -181,19 +180,3 @@ index 9e9d8f4..72f5dfb 100644
  
  // --------------------------------
  // Types
-diff --git a/Source/OpenNI/XnOpenNI.cpp b/Source/OpenNI/XnOpenNI.cpp
-index 7bf268a..3ecb895 100644
---- a/Source/OpenNI/XnOpenNI.cpp
-+++ b/Source/OpenNI/XnOpenNI.cpp
-@@ -7061,9 +7061,9 @@ XN_C_API XnStatus xnScriptNodeRun(XnNodeHandle hScript, XnEnumerationErrors* pEr
- #if (XN_PLATFORM == XN_PLATFORM_WIN32)
- 	#define XN_OPEN_NI_FILES_LOCATION "\\Data\\"
- #elif (CE4100)
--	#define XN_OPEN_NI_FILES_LOCATION "/usr/etc/ni/"
-+	#define XN_OPEN_NI_FILES_LOCATION "/etc/openni/"
- #elif (XN_PLATFORM == XN_PLATFORM_LINUX_X86 || XN_PLATFORM == XN_PLATFORM_LINUX_ARM || XN_PLATFORM == XN_PLATFORM_MACOSX)
--	#define XN_OPEN_NI_FILES_LOCATION "/var/lib/ni/"
-+	#define XN_OPEN_NI_FILES_LOCATION "/etc/openni/"
- #elif (XN_PLATFORM == XN_PLATFORM_ANDROID_ARM)
- 	#define XN_OPEN_NI_FILES_LOCATION "/data/ni/"
- #else

-- 
openni packaging