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

Bug#969083: marked as done (unblock: libomxil-bellagio/0.9.3-6)

Your message dated Mon, 31 Aug 2020 06:30:11 +0800
with message-id <CAKy7-kjk8U+9Xo80A8Csj=hniPfyRipg37dquuo6ZtNb_iXoXg@mail.gmail.com>
and subject line Re: Bug#969083: unblock: libomxil-bellagio/0.9.3-6
has caused the Debian Bug report #969083,
regarding unblock: libomxil-bellagio/0.9.3-6
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.)


-- 
969083: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=969083
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 libomxil-bellagio

[ Reason ]

libomxil-bellagio changes the library path to multi-arch.

gst-omx will use the library for autopkgtest. So newer gst-omx loads the
library

from multi-arch path. And thus failed to pass the test for older
libomxil-bellagio.


We should unblock libomxil-bellagio, and thus newer gst-omx should also
pass all the debci tests later and automatically migrate.


[ Impact ]
libomxil-bellagio remains using old non-multiarch library path.

[ Tests ]
gst-omx/1.16.2-1 tests ok with libomxil-bellagio/0.9.3-6.
It just failed with older libomxil-bellagio.

[ Risks ]
Should have no risks.  autopkgtest already passed on the latest version
of each package.

[ Checklist ]
  [X] all changes are documented in the d/changelog
  [X] I reviewed all changes and I approve them
  [X] attach debdiff against the package in testing

unblock libomxil-bellagio/0.9.3-6


diff -Nru libomxil-bellagio-0.9.3/debian/changelog libomxil-bellagio-0.9.3/debian/changelog
--- libomxil-bellagio-0.9.3/debian/changelog	2018-09-23 03:56:46.000000000 +0800
+++ libomxil-bellagio-0.9.3/debian/changelog	2020-08-12 15:16:26.000000000 +0800
@@ -1,3 +1,25 @@
+libomxil-bellagio (0.9.3-6) unstable; urgency=low
+
+  * Use linktrees instead of links.
+
+ -- Ying-Chun Liu (PaulLiu) <paulliu@debian.org>  Wed, 12 Aug 2020 15:16:26 +0800
+
+libomxil-bellagio (0.9.3-5) unstable; urgency=low
+
+  * Multi-arch support
+     - Move libs to multiarch path (Closes: #928847)
+     - Add Multi-Arch foreign to -doc package. (Closes: #949568)
+  * Bump Standards-Version to 4.5.0: Nothing needs to be changed.
+  * Bump debhelper compat to 11
+    - Remove Build-Depends on autotools-dev and dh-autoreconf
+    - Add debian/patches/0014_fix_hardening.patch: fix hardening error
+  * Remove Vcs-Git and Vcs-Browser field
+  * Remove *-dbg packages. Now we have -dbgsym packages. (Closes: #620832)
+  * Add debian/patches/0015_port_gcc_10.patch: port to gcc 10.
+    - (Closes: #957453)
+
+ -- Ying-Chun Liu (PaulLiu) <paulliu@debian.org>  Sun, 09 Aug 2020 15:48:03 +0800
+
 libomxil-bellagio (0.9.3-4.1) unstable; urgency=medium
 
   * Non-maintainer upload.
diff -Nru libomxil-bellagio-0.9.3/debian/clean libomxil-bellagio-0.9.3/debian/clean
--- libomxil-bellagio-0.9.3/debian/clean	1970-01-01 08:00:00.000000000 +0800
+++ libomxil-bellagio-0.9.3/debian/clean	2020-08-09 15:48:03.000000000 +0800
@@ -0,0 +1 @@
+debian/libomxil-bellagio-bin.triggers
diff -Nru libomxil-bellagio-0.9.3/debian/compat libomxil-bellagio-0.9.3/debian/compat
--- libomxil-bellagio-0.9.3/debian/compat	2016-11-13 02:59:37.000000000 +0800
+++ libomxil-bellagio-0.9.3/debian/compat	2020-08-09 15:48:03.000000000 +0800
@@ -1 +1 @@
-8
+11
diff -Nru libomxil-bellagio-0.9.3/debian/control libomxil-bellagio-0.9.3/debian/control
--- libomxil-bellagio-0.9.3/debian/control	2016-11-13 04:44:17.000000000 +0800
+++ libomxil-bellagio-0.9.3/debian/control	2020-08-12 15:16:26.000000000 +0800
@@ -2,12 +2,16 @@
 Section: libs
 Priority: optional
 Maintainer: Ying-Chun Liu (PaulLiu) <paulliu@debian.org>
-Build-Depends: debhelper (>= 8), dh-autoreconf,
- autotools-dev, libasound2-dev, libmad0-dev, libvorbis-dev,
- doxygen, libjs-jquery
-Standards-Version: 3.9.8
-Vcs-Browser: http://git.debian.org/?p=collab-maint/libomxil-bellagio.git
-Vcs-Git: git://git.debian.org/git/collab-maint/libomxil-bellagio.git
+Build-Depends: debhelper (>= 11),
+               dh-exec,
+               dh-linktree,
+               doxygen,
+               libasound2-dev,
+               libjs-jquery,
+               libmad0-dev,
+               libvorbis-dev,
+               node-jquery
+Standards-Version: 4.5.0
 Homepage: http://sourceforge.net/projects/omxil/
 
 Package: libomxil-bellagio0
@@ -15,7 +19,7 @@
 Suggests: libomxil-bellagio0-components-base
 Architecture: any
 Section: libs
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
 Description: implementation of OpenMAX IL, run-time library
  OpenMAX Integration Layer (IL) is a standard API to access Multimedia
  Components on mobile platforms. It has been defined by the Khronos
@@ -34,7 +38,7 @@
 Package: libomxil-bellagio-bin
 Architecture: any
 Section: utils
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
 Replaces: libomxil-bellagio0 (<< 0.9.3-4)
 Breaks: libomxil-bellagio0 (<< 0.9.3-4)
 Description: implementation of OpenMAX IL, run-time library (utilities)
@@ -57,7 +61,7 @@
 Package: libomxil-bellagio0-components-base
 Architecture: any
 Section: libs
-Depends: ${shlibs:Depends}, ${misc:Depends}, libomxil-bellagio-bin
+Depends: libomxil-bellagio-bin, ${misc:Depends}, ${shlibs:Depends}
 Description: components for Bellagio OpenMAX IL
  OpenMAX Integration Layer (IL) is a standard API to access Multimedia
  Components on mobile platforms. It has been defined by the Khronos
@@ -70,13 +74,13 @@
  It is intended to show the usage of the IL API and to allow people to
  start developing components.
 
-Package: libomxil-bellagio-dev
-Provides: libomxil-dev
-Architecture: any
-Section: libdevel
-Depends: libomxil-bellagio0 (= ${binary:Version}), ${misc:Depends}
-Suggests: libomxil-bellagio-doc
-Description: implementation of OpenMAX IL, development files
+Package: libomxil-bellagio-doc
+Architecture: all
+Multi-Arch: foreign
+Section: doc
+Depends: libjs-jquery, lynx | www-browser, ${misc:Depends}
+Recommends: ${misc:Recommends}
+Description: Documentation of the Bellagio OpenMAX IL
  OpenMAX Integration Layer (IL) is a standard API to access Multimedia
  Components on mobile platforms. It has been defined by the Khronos
  group.  By means of the OpenMAX IL API, multimedia frameworks can
@@ -88,29 +92,15 @@
  It is intended to show the usage of the IL API and to allow people to
  start developing components.
  .
- This package provides the OpenMAX IL core development files.
+ This package contains the HTML documentation.
 
-Package: libomxil-bellagio0-dbg
+Package: libomxil-bellagio-dev
+Provides: libomxil-dev
 Architecture: any
-Section: debug
+Section: libdevel
 Depends: libomxil-bellagio0 (= ${binary:Version}), ${misc:Depends}
-Priority: extra
-Description: implementation of OpenMAX IL, debugging symbols
- Debug symbols for libomxil-bellagio.
-
-Package: libomxil-bellagio0-components-base-dbg
-Architecture: any
-Section: debug
-Depends: libomxil-bellagio0-components-base (= ${binary:Version}), ${misc:Depends}
-Priority: extra
-Description: components for Bellagio OpenMAX IL, debugging symbols
- Debug symbols for libomxil-bellagio.
-
-Package: libomxil-bellagio-doc
-Architecture: all
-Section: doc
-Depends: lynx | www-browser, libjs-jquery, ${misc:Depends}
-Description: Documentation of the Bellagio OpenMAX IL
+Suggests: libomxil-bellagio-doc
+Description: implementation of OpenMAX IL, development files
  OpenMAX Integration Layer (IL) is a standard API to access Multimedia
  Components on mobile platforms. It has been defined by the Khronos
  group.  By means of the OpenMAX IL API, multimedia frameworks can
@@ -122,4 +112,4 @@
  It is intended to show the usage of the IL API and to allow people to
  start developing components.
  .
- This package contains the HTML documentation.
+ This package provides the OpenMAX IL core development files.
diff -Nru libomxil-bellagio-0.9.3/debian/copyright libomxil-bellagio-0.9.3/debian/copyright
--- libomxil-bellagio-0.9.3/debian/copyright	2014-02-20 03:02:53.000000000 +0800
+++ libomxil-bellagio-0.9.3/debian/copyright	2020-08-09 15:48:03.000000000 +0800
@@ -25,16 +25,16 @@
 
 Files: include/*.h
 Copyright: 2008 The Khronos Group Inc.
-License:
+License: MIT
  Permission is hereby granted, free of charge, to any person obtaining
  a copy of this software and associated documentation files (the
  "Software"), to deal in the Software without restriction, including
  without limitation the rights to use, copy, modify, merge, publish,
  distribute, sublicense, and/or sell copies of the Software, and to
  permit persons to whom the Software is furnished to do so, subject
- to the following conditions: 
+ to the following conditions:
  The above copyright notice and this permission notice shall be included
- in all copies or substantial portions of the Software. 
+ in all copies or substantial portions of the Software.
  .
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
  OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
@@ -42,11 +42,11 @@
  IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
  CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
  TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
- SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. 
+ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 Files: m4/*
 Copyright: 1996-2008 Free Software Foundation, Inc.
-License:
+License: FSF
  This file is free software; the Free Software Foundation gives
  unlimited permission to copy and/or distribute it, with or without
  modifications, as long as this notice is preserved.
diff -Nru libomxil-bellagio-0.9.3/debian/libomxil-bellagio0-components-base.install libomxil-bellagio-0.9.3/debian/libomxil-bellagio0-components-base.install
--- libomxil-bellagio-0.9.3/debian/libomxil-bellagio0-components-base.install	2011-07-19 13:20:49.000000000 +0800
+++ libomxil-bellagio-0.9.3/debian/libomxil-bellagio0-components-base.install	2020-08-09 15:48:03.000000000 +0800
@@ -1 +1 @@
-usr/lib/libomxil-bellagio0
+usr/lib/*/libomxil-bellagio0
diff -Nru libomxil-bellagio-0.9.3/debian/libomxil-bellagio0.dirs libomxil-bellagio-0.9.3/debian/libomxil-bellagio0.dirs
--- libomxil-bellagio-0.9.3/debian/libomxil-bellagio0.dirs	2016-11-13 02:49:53.000000000 +0800
+++ libomxil-bellagio-0.9.3/debian/libomxil-bellagio0.dirs	2020-08-09 15:48:03.000000000 +0800
@@ -1 +1,2 @@
-usr/lib/libomxil-bellagio0
+#!/usr/bin/dh-exec
+usr/lib/${DEB_HOST_MULTIARCH}/libomxil-bellagio0
diff -Nru libomxil-bellagio-0.9.3/debian/libomxil-bellagio0.install libomxil-bellagio-0.9.3/debian/libomxil-bellagio0.install
--- libomxil-bellagio-0.9.3/debian/libomxil-bellagio0.install	2016-11-13 02:46:10.000000000 +0800
+++ libomxil-bellagio-0.9.3/debian/libomxil-bellagio0.install	2020-08-09 15:48:03.000000000 +0800
@@ -1 +1 @@
-usr/lib/libomxil*.so.*
+usr/lib/*/libomxil*.so.*
diff -Nru libomxil-bellagio-0.9.3/debian/libomxil-bellagio-bin.install libomxil-bellagio-0.9.3/debian/libomxil-bellagio-bin.install
--- libomxil-bellagio-0.9.3/debian/libomxil-bellagio-bin.install	2016-11-13 02:46:08.000000000 +0800
+++ libomxil-bellagio-0.9.3/debian/libomxil-bellagio-bin.install	2020-08-09 15:48:03.000000000 +0800
@@ -1,3 +1,3 @@
-usr/bin/omxregister-bellagio
 debian/omxregister-bellagio-0 usr/bin/
+usr/bin/omxregister-bellagio
 usr/share/man/man1
diff -Nru libomxil-bellagio-0.9.3/debian/libomxil-bellagio-bin.triggers libomxil-bellagio-0.9.3/debian/libomxil-bellagio-bin.triggers
--- libomxil-bellagio-0.9.3/debian/libomxil-bellagio-bin.triggers	2011-07-19 13:20:49.000000000 +0800
+++ libomxil-bellagio-0.9.3/debian/libomxil-bellagio-bin.triggers	1970-01-01 08:00:00.000000000 +0800
@@ -1 +0,0 @@
-interest /usr/lib/libomxil-bellagio0
diff -Nru libomxil-bellagio-0.9.3/debian/libomxil-bellagio-bin.triggers.in libomxil-bellagio-0.9.3/debian/libomxil-bellagio-bin.triggers.in
--- libomxil-bellagio-0.9.3/debian/libomxil-bellagio-bin.triggers.in	1970-01-01 08:00:00.000000000 +0800
+++ libomxil-bellagio-0.9.3/debian/libomxil-bellagio-bin.triggers.in	2020-08-09 15:48:03.000000000 +0800
@@ -0,0 +1,3 @@
+# The package triggers this is important. Without the registry being
+# generated, it won't work.
+interest-await /usr/lib/#MULTIARCH#/libomxil-bellagio0
diff -Nru libomxil-bellagio-0.9.3/debian/libomxil-bellagio-dev.install libomxil-bellagio-0.9.3/debian/libomxil-bellagio-dev.install
--- libomxil-bellagio-0.9.3/debian/libomxil-bellagio-dev.install	2011-07-19 13:20:49.000000000 +0800
+++ libomxil-bellagio-0.9.3/debian/libomxil-bellagio-dev.install	2020-08-09 15:48:03.000000000 +0800
@@ -1,4 +1,4 @@
 usr/include
-usr/lib/libomxil*.so
-usr/lib/libomxil*.a
-usr/lib/pkgconfig
+usr/lib/*/libomxil*.a
+usr/lib/*/libomxil*.so
+usr/lib/*/pkgconfig
diff -Nru libomxil-bellagio-0.9.3/debian/libomxil-bellagio-doc.docs libomxil-bellagio-0.9.3/debian/libomxil-bellagio-doc.docs
--- libomxil-bellagio-0.9.3/debian/libomxil-bellagio-doc.docs	2011-07-19 13:20:49.000000000 +0800
+++ libomxil-bellagio-0.9.3/debian/libomxil-bellagio-doc.docs	2020-08-09 15:48:03.000000000 +0800
@@ -1,5 +1,5 @@
 ChangeLog
+NEWS
 README
 TODO
 doc/libomxil-bellagio/html
-NEWS
diff -Nru libomxil-bellagio-0.9.3/debian/libomxil-bellagio-doc.links libomxil-bellagio-0.9.3/debian/libomxil-bellagio-doc.links
--- libomxil-bellagio-0.9.3/debian/libomxil-bellagio-doc.links	2014-02-20 02:32:34.000000000 +0800
+++ libomxil-bellagio-0.9.3/debian/libomxil-bellagio-doc.links	1970-01-01 08:00:00.000000000 +0800
@@ -1 +0,0 @@
-usr/share/javascript/jquery/jquery.js usr/share/doc/libomxil-bellagio-doc/html/jquery.js
diff -Nru libomxil-bellagio-0.9.3/debian/libomxil-bellagio-doc.linktrees libomxil-bellagio-0.9.3/debian/libomxil-bellagio-doc.linktrees
--- libomxil-bellagio-0.9.3/debian/libomxil-bellagio-doc.linktrees	1970-01-01 08:00:00.000000000 +0800
+++ libomxil-bellagio-0.9.3/debian/libomxil-bellagio-doc.linktrees	2020-08-12 15:16:26.000000000 +0800
@@ -0,0 +1 @@
+embed-weakdep usr/share/nodejs/jquery/dist/jquery.js usr/share/doc/libomxil-bellagio-doc/html/jquery.js
diff -Nru libomxil-bellagio-0.9.3/debian/omxregister-bellagio-0 libomxil-bellagio-0.9.3/debian/omxregister-bellagio-0
--- libomxil-bellagio-0.9.3/debian/omxregister-bellagio-0	2011-07-19 13:20:49.000000000 +0800
+++ libomxil-bellagio-0.9.3/debian/omxregister-bellagio-0	2020-08-09 15:48:03.000000000 +0800
@@ -1,7 +1,9 @@
 #!/bin/sh -e
 
+DEB_BUILD_MULTIARCH=`dpkg-architecture -qDEB_BUILD_MULTIARCH`
+
 if type dpkg-trigger >/dev/null 2>&1 && \
-   dpkg-trigger /usr/lib/libomxil-bellagio0; then
+   dpkg-trigger /usr/lib/"$DEB_BUILD_MULTIARCH"/libomxil-bellagio0; then
       exit 0
 fi
 
diff -Nru libomxil-bellagio-0.9.3/debian/patches/0014_fix_hardening.patch libomxil-bellagio-0.9.3/debian/patches/0014_fix_hardening.patch
--- libomxil-bellagio-0.9.3/debian/patches/0014_fix_hardening.patch	1970-01-01 08:00:00.000000000 +0800
+++ libomxil-bellagio-0.9.3/debian/patches/0014_fix_hardening.patch	2020-08-09 15:48:03.000000000 +0800
@@ -0,0 +1,32 @@
+Description: fix hardening errors
+ Debian now enable hardening, and found several bugs inside the code.
+ We fix all of them in this patch.
+Author: Ying-Chun Liu (PaulLiu) <paulliu@debian.org>
+Last-Update: 2020-08-09
+
+Index: libomxil-bellagio-0.9.3/src/base/omx_base_component.c
+===================================================================
+--- libomxil-bellagio-0.9.3.orig/src/base/omx_base_component.c
++++ libomxil-bellagio-0.9.3/src/base/omx_base_component.c
+@@ -827,7 +827,7 @@ OSCL_EXPORT_REF OMX_ERRORTYPE omx_base_c
+   uuid[0] = (OMX_U32)omx_component;
+   uuid[1] = getpid();
+   uuid[2] = getuid();
+-  memcpy(*pComponentUUID, uuid, 3*sizeof(uuid));
++  memcpy(*pComponentUUID, uuid, sizeof(uuid));
+ 
+   DEBUG(DEB_LEV_FUNCTION_NAME, "Out of %s for component %p\n", __func__, hComponent);
+   return OMX_ErrorNone;
+Index: libomxil-bellagio-0.9.3/src/omx_create_loaders_linux.c
+===================================================================
+--- libomxil-bellagio-0.9.3.orig/src/omx_create_loaders_linux.c
++++ libomxil-bellagio-0.9.3/src/omx_create_loaders_linux.c
+@@ -98,7 +98,7 @@ int createComponentLoaders() {
+ 		libraryFileName = malloc(MAX_LINE_LENGTH);
+ 		while(1) {
+ 			index_readline = 0;
+-			while(index_readline < MAX_LINE_LENGTH) {
++			while(index_readline + 1 < MAX_LINE_LENGTH) {
+ 				*(libraryFileName + index_readline) = fgetc(loaderFP);
+ 				if ((*(libraryFileName + index_readline) == '\n') || (*(libraryFileName + index_readline) == '\0')) {
+ 					break;
diff -Nru libomxil-bellagio-0.9.3/debian/patches/0015_port_gcc_10.patch libomxil-bellagio-0.9.3/debian/patches/0015_port_gcc_10.patch
--- libomxil-bellagio-0.9.3/debian/patches/0015_port_gcc_10.patch	1970-01-01 08:00:00.000000000 +0800
+++ libomxil-bellagio-0.9.3/debian/patches/0015_port_gcc_10.patch	2020-08-09 15:48:03.000000000 +0800
@@ -0,0 +1,37 @@
+Description: porting to gcc 10
+ Some multiple definitions fixed in this patch.
+Author: Ying-Chun Liu (PaulLiu) <paulliu@debian.org>
+Bug-Debian: https://bugs.debian.org/957453
+Last-Update: 2020-08-09
+
+--- libomxil-bellagio-0.9.3.orig/src/omx_reference_resource_manager.c
++++ libomxil-bellagio-0.9.3/src/omx_reference_resource_manager.c
+@@ -30,6 +30,11 @@
+ #include "base/omx_base_component.h"
+ #include "queue.h"
+ 
++int globalIndex;
++NameIndexType *listOfcomponentRegistered;
++ComponentListType **globalComponentList;
++ComponentListType **globalWaitingComponentList;
++
+ /**
+  * This is the static base pointer of the list
+  */
+--- libomxil-bellagio-0.9.3.orig/src/omx_reference_resource_manager.h
++++ libomxil-bellagio-0.9.3/src/omx_reference_resource_manager.h
+@@ -49,10 +49,10 @@ struct NameIndexType {
+ };
+ 
+ 
+-int globalIndex;
+-NameIndexType *listOfcomponentRegistered;
+-ComponentListType **globalComponentList;
+-ComponentListType **globalWaitingComponentList;
++extern int globalIndex;
++extern NameIndexType *listOfcomponentRegistered;
++extern ComponentListType **globalComponentList;
++extern ComponentListType **globalWaitingComponentList;
+ 
+ OMX_ERRORTYPE RM_RegisterComponent(char *name, int max_components);
+ OMX_ERRORTYPE addElemToList(ComponentListType **list, OMX_COMPONENTTYPE *openmaxStandComp, int index, OMX_BOOL bIsWaiting);
diff -Nru libomxil-bellagio-0.9.3/debian/patches/series libomxil-bellagio-0.9.3/debian/patches/series
--- libomxil-bellagio-0.9.3/debian/patches/series	2018-08-19 07:18:19.000000000 +0800
+++ libomxil-bellagio-0.9.3/debian/patches/series	2020-08-09 15:48:03.000000000 +0800
@@ -9,3 +9,5 @@
 0009_fix_BOSA_ST_InitComponentLoader_buffer_overrun.patch
 0010_Fix_FTBFS_Hurd_FreeBSD.patch
 0011_makefile_dependencies.patch
+0014_fix_hardening.patch
+0015_port_gcc_10.patch
diff -Nru libomxil-bellagio-0.9.3/debian/rules libomxil-bellagio-0.9.3/debian/rules
--- libomxil-bellagio-0.9.3/debian/rules	2018-09-23 03:56:46.000000000 +0800
+++ libomxil-bellagio-0.9.3/debian/rules	2020-08-12 15:16:26.000000000 +0800
@@ -6,12 +6,18 @@
 GIT_URL = git://omxil.git.sourceforge.net/gitroot/omxil/omxil
 
 %:
-	dh  $@ --with autoreconf
+	dh $@ --with autoreconf,linktree
 
 override_dh_auto_configure:
 	dh_auto_configure -- --enable-videosrc --disable-jpeg
 
 override_dh_auto_install:
+	set -e; for script in triggers; do \
+		sed -e"s/#MULTIARCH#/$(DEB_HOST_MULTIARCH)/g" \
+			-e"s/#ARCH#/$(DEB_HOST_ARCH)/g" \
+			debian/libomxil-bellagio-bin.$$script.in \
+			> debian/libomxil-bellagio-bin.$$script ; \
+        done
 	dh_auto_install
 	find $(CURDIR)/debian/tmp -name "*.la" -delete
 	rm -f $(CURDIR)/doc/libomxil-bellagio/html/jquery.js
@@ -19,9 +25,9 @@
 override_dh_makeshlibs:
 	dh_makeshlibs -Xusr/lib/libomxil-bellagio0/
 
-override_dh_strip:
-	dh_strip -plibomxil-bellagio0-components-base --dbg-package=libomxil-bellagio0-components-base-dbg
-	dh_strip --remaining-packages --dbg-package=libomxil-bellagio0-dbg
+override_dh_installdocs:
+	dh_installdocs -plibomxil-bellagio-doc --doc-main-package=libomxil-bellagio-doc
+	dh_installdocs --remaining-packages
 
 update-patch-series:
 	mkdir -p $(CURDIR)/debian/patches
diff -Nru libomxil-bellagio-0.9.3/debian/tests/test-registry-file libomxil-bellagio-0.9.3/debian/tests/test-registry-file
--- libomxil-bellagio-0.9.3/debian/tests/test-registry-file	2016-11-13 04:39:14.000000000 +0800
+++ libomxil-bellagio-0.9.3/debian/tests/test-registry-file	2020-08-09 15:48:03.000000000 +0800
@@ -8,49 +8,49 @@
 
 grep -q "libomxclocksrc.so" "$REGISTRYFILE"
 if [ $? -eq 0 ] ; then
-    echo "Pass"
+    echo "Pass - libomxclocksrc.so"
 else
-    echo "Fail"
+    echo "Fail - libomxclocksrc.so"
     exit 1
 fi
 
 grep -q "libomxaudio_effects.so" "$REGISTRYFILE"
 if [ $? -eq 0 ] ; then
-    echo "Pass"
+    echo "Pass - libomxaudio_effects.so"
 else
-    echo "Fail"
+    echo "Fail - libomxaudio_effects.so"
     exit 2
 fi
 
 grep -q "libomxvideosched.so" "$REGISTRYFILE"
 if [ $? -eq 0 ] ; then
-    echo "Pass"
+    echo "Pass - libomxvideosched.so"
 else
-    echo "Fail"
+    echo "Fail - libomxvideosched.so"
     exit 3
 fi
 
 grep -q "OMX.st.clocksrc" "$REGISTRYFILE"
 if [ $? -eq 0 ] ; then
-    echo "Pass"
+    echo "Pass - OMX.st.clocksrc"
 else
-    echo "Fail"
+    echo "Fail - OMX.st.clocksrc"
     exit 4
 fi
 
 grep -q "OMX.st.audio.mixer" "$REGISTRYFILE"
 if [ $? -eq 0 ] ; then
-    echo "Pass"
+    echo "Pass - OMX.st.audio.mixer"
 else
-    echo "Fail"
+    echo "Fail - OMX.st.audio.mixer"
     exit 5
 fi
 
 grep -q "OMX.st.video.scheduler" "$REGISTRYFILE"
 if [ $? -eq 0 ] ; then
-    echo "Pass"
+    echo "Pass - OMX.st.video.scheduler"
 else
-    echo "Fail"
+    echo "Fail - OMX.st.video.scheduler"
     exit 6
 fi

Attachment: signature.asc
Description: OpenPGP digital signature


--- End Message ---
--- Begin Message ---

Fix it by modifying test scripts.


On Fri, Aug 28, 2020 at 1:14 AM Paul Gevers <elbrus@debian.org> wrote:
Hi Paul

On 27-08-2020 13:22, Ying-Chun Liu (PaulLiu) wrote:
> libomxil-bellagio0 can be a "plugin" of gst-omx. That means gst-omx can
> be run by itself without libomxil-bellagio0 at all.
> The problem happens in autopkgtest. In test, we use libomxil-bellagio0
> as a plugin to test gst-omx.

So, the *test* needs a *versioned* dependency? And one can still argue
that the new libomxil-bellagio breaks the version of gst-omx in testing?

> Thus gst-omx originally loads that plugin (in debian/tests scripts) from
> /usr/lib. But now it needs to load
>
> that plugin through test scripts from multi-arch path.

Paul


--- End Message ---
Reply to: