[libreoffice] 01/01: fix get_libvlc_dep.sh to work again with new multiarchified libvlc5

[Rene Engelhard]

This is an automated email from the git hooks/post-receive script.

rene pushed a commit to branch master
in repository libreoffice.

commit dc7168fecf6b278f114b726d5b794546c98552a3
Author: Rene Engelhard <rene at debian.org>
Date:   Fri Oct 21 23:57:48 2016 +0200

    fix get_libvlc_dep.sh to work again with new multiarchified libvlc5
---
 changelog                 |  7 +++++++
 scripts/get_libvlc_dep.sh | 27 +++++++++++++++++----------
 2 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/changelog b/changelog
index 32971df..cce1cc3 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,10 @@
+libreoffice (1:5.2.3~rc1-4) unstable; urgency=medium
+
+  * debian/scripts/get_libvlc_dep.sh: fix to work again (also) with
+    new multiarchified libvlc 5
+
+ -- Rene Engelhard <rene at debian.org>  Fri, 21 Oct 2016 23:56:08 +0200
+
 libreoffice (1:5.2.3~rc1-3) unstable; urgency=medium
 
   * debian/patches/fix-system-lpsolve-build.diff: fix -L in configure.ac so
diff --git a/scripts/get_libvlc_dep.sh b/scripts/get_libvlc_dep.sh
index 80e97e7..590c6d7 100755
--- a/scripts/get_libvlc_dep.sh
+++ b/scripts/get_libvlc_dep.sh
@@ -3,16 +3,23 @@
 libs=`grep libvlc.*\.so avmedia/source/vlc/wrapper/SymbolLoader.hxx | grep -v vlccore | cut -d= -f2 | perl -pe 's/\s+\"(.*)\".*/$1/'`
 
 for l in $libs; do
-	if [ -e "/usr/lib/$l" ]; then
-#		# sanity check: do the libs match with what we would get
-#		# for our libivlc version if we followed the .so symlink?
-#		l1=`readlink /usr/lib/$l`
-#		l2_tmp=`echo $l | perl -pe 's/(.*)\.\d+$/$1/'`
-#		l2=`readlink /usr/lib/$l2_tmp`
-#		if [ "$l1" = "$l2" ]; then
-			dep=`dpkg -S /usr/lib/$l | cut -d: -f1`
-#		fi
-	fi
+	if [ -e "/usr/lib/`dpkg-architecture -qDEB_HOST_MULTIARCH`/$l" ]; then
+		p=/usr/lib/`dpkg-architecture -qDEB_HOST_MULTIARCH`
+	else
+		if [ -e /usr/lib/$l ]; then
+			p=/usr/lib
+		else
+			continue
+		fi
+        fi
+#	# sanity check: do the libs match with what we would get
+#	# for our libebook version if we followed the .so symlink?
+#	l1=`readlink $p/$l`
+#	l2_tmp=`echo $l | perl -pe 's/(.*)\.\d+$/$1/'`
+#	l2=`readlink $p/$l2_tmp`
+#	if [ "$l1" = "$l2" ]; then
+		dep=`dpkg -S $p/$l | cut -d: -f1`
+#	fi
 done
 
 if [ -n "$dep" ]; then

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git