[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#771053: marked as done (unblock: openni/1.5.4.0-8)

Your message dated Fri, 28 Nov 2014 19:00:04 +0000
with message-id <20141128190004.GC23644@lupin.home.powdarrmonkey.net>
and subject line Re: Bug#771053: unblock: openni/1.5.4.0-8
has caused the Debian Bug report #771053,
regarding unblock: openni/1.5.4.0-8
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact owner@bugs.debian.org
immediately.)


-- 
771053: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=771053
Debian Bug Tracking System
Contact owner@bugs.debian.org with problems
--- Begin Message --- 
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock

Please unblock package openni

The version in unstable fixes a serious bug in the config file handling:
* Do not ship but generate {licenses,modules}.xml at install time
* (Closes: #767653)

The xml files are modified from plugin packages as well, which is a
policy violation. The new version generated the files in the postinst
script.

Thanks for consideration!

Cheers Jochen

unblock openni/1.5.4.0-8

-- System Information:
Debian Release: jessie/sid
  APT prefers unstable
  APT policy: (500, 'unstable'), (1, 'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
armhf

Kernel: Linux 3.16.0-4-amd64 (SMP w/12 CPU cores)
Locale: LANG=de_DE.UTF-8, LC_CTYPE=de_DE.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

diff -Nru openni-1.5.4.0/debian/changelog openni-1.5.4.0/debian/changelog
--- openni-1.5.4.0/debian/changelog	2014-02-25 17:30:30.000000000 +0100
+++ openni-1.5.4.0/debian/changelog	2014-11-25 20:11:55.000000000 +0100
@@ -1,3 +1,10 @@
+openni (1.5.4.0-8) unstable; urgency=medium
+
+  * Do not ship but generate {licenses,modules}.xml at install time
+    (Closes: #767653)
+
+ -- Jochen Sprickerhof <debian@jochen.sprickerhof.de>  Mon, 24 Nov 2014 22:33:38 +0100
+
 openni (1.5.4.0-7) unstable; urgency=low
 
   [ Jochen Sprickerhof ]
diff -Nru openni-1.5.4.0/debian/control openni-1.5.4.0/debian/control
--- openni-1.5.4.0/debian/control	2014-02-25 17:26:18.000000000 +0100
+++ openni-1.5.4.0/debian/control	2014-11-25 20:03:45.000000000 +0100
@@ -23,7 +23,8 @@
 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
 Description: framework for sensor-based 'Natural Interaction'
diff -Nru openni-1.5.4.0/debian/libopenni0.dirs openni-1.5.4.0/debian/libopenni0.dirs
--- openni-1.5.4.0/debian/libopenni0.dirs	1970-01-01 01:00:00.000000000 +0100
+++ openni-1.5.4.0/debian/libopenni0.dirs	2014-11-24 21:58:21.000000000 +0100
@@ -0,0 +1 @@
+/var/lib/ni
diff -Nru openni-1.5.4.0/debian/libopenni0.install openni-1.5.4.0/debian/libopenni0.install
--- openni-1.5.4.0/debian/libopenni0.install	2014-02-25 17:26:06.000000000 +0100
+++ openni-1.5.4.0/debian/libopenni0.install	2014-11-25 20:03:45.000000000 +0100
@@ -1,4 +1,2 @@
 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/
diff -Nru openni-1.5.4.0/debian/libopenni0.postinst openni-1.5.4.0/debian/libopenni0.postinst
--- openni-1.5.4.0/debian/libopenni0.postinst	2014-02-25 17:26:06.000000000 +0100
+++ openni-1.5.4.0/debian/libopenni0.postinst	2014-11-24 21:58:21.000000000 +0100
@@ -5,6 +5,26 @@
 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
+    fi
+    # Only register upon fresh install
+    if [ -z "$2" ]; then
+      niLicense PrimeSense 0KOIk2JeIBYClPWVnMoRKn5cdY4=
+      for module in $MODULES; do
+        niReg -r $MODULE_DIR/$module /etc/openni
+      done
+    fi
+    ;;
+esac
+
 #DEBHELPER#
 
 exit 0
diff -Nru openni-1.5.4.0/debian/libopenni0.postrm openni-1.5.4.0/debian/libopenni0.postrm
--- openni-1.5.4.0/debian/libopenni0.postrm	2014-02-25 17:26:06.000000000 +0100
+++ openni-1.5.4.0/debian/libopenni0.postrm	2014-11-24 21:58:21.000000000 +0100
@@ -5,6 +5,13 @@
 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 -Nru openni-1.5.4.0/debian/libopenni0.preinst openni-1.5.4.0/debian/libopenni0.preinst
--- openni-1.5.4.0/debian/libopenni0.preinst	2014-02-25 17:26:06.000000000 +0100
+++ openni-1.5.4.0/debian/libopenni0.preinst	2014-11-24 21:58:21.000000000 +0100
@@ -5,6 +5,15 @@
 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 -Nru openni-1.5.4.0/debian/libopenni0.prerm openni-1.5.4.0/debian/libopenni0.prerm
--- openni-1.5.4.0/debian/libopenni0.prerm	1970-01-01 01:00:00.000000000 +0100
+++ openni-1.5.4.0/debian/libopenni0.prerm	2014-11-24 21:58:21.000000000 +0100
@@ -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 -Nru openni-1.5.4.0/debian/licenses.xml openni-1.5.4.0/debian/licenses.xml
--- openni-1.5.4.0/debian/licenses.xml	2013-05-20 05:25:26.000000000 +0200
+++ openni-1.5.4.0/debian/licenses.xml	1970-01-01 01:00:00.000000000 +0100
@@ -1,3 +0,0 @@
-<Licenses>
-    <License vendor="PrimeSense" key="0KOIk2JeIBYClPWVnMoRKn5cdY4=" />
-</Licenses>
diff -Nru openni-1.5.4.0/debian/modules.xml openni-1.5.4.0/debian/modules.xml
--- openni-1.5.4.0/debian/modules.xml	2013-05-20 05:25:26.000000000 +0200
+++ openni-1.5.4.0/debian/modules.xml	1970-01-01 01:00:00.000000000 +0100
@@ -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>

--- End Message ---
--- Begin Message --- 
Control: tag -1 wontfix

On Thu, Nov 27, 2014 at 04:20:43PM +0100, Jochen Sprickerhof wrote:
> * Jonathan Wiltshire <jmw@debian.org> [2014-11-26 22:19]:
> > On Wed, Nov 26, 2014 at 12:06:18PM +0100, Jochen Sprickerhof wrote:
> > > +    if [ -z "$2" ]; then
> > > +      niLicense PrimeSense 0KOIk2JeIBYClPWVnMoRKn5cdY4=
> > 
> > Er, what's this and are we allowed to distribute it?
> 
> Good point, it's actually needed for an other package
> (primesense-nite-nonfree) and I've filled a bug to resolve this:
> #771189. I guess we need an other package upload to resolve this, should
> I fill a new unblock request, once it's done?

Yes, please.

Thanks,

-- 
Jonathan Wiltshire                                      jmw@debian.org
Debian Developer                         http://people.debian.org/~jmw

4096R: 0xD3524C51 / 0A55 B7C5 1223 3942 86EC  74C3 5394 479D D352 4C51

Attachment: signature.asc
Description: Digital signature


--- End Message ---
Reply to: