This is an automated email from the git hooks/post-receive script. rene pushed a commit to branch master in repository libreoffice.
commit 1fe8439abb8be46c85cd9dddb07b22d61495c190 Author: Rene Engelhard <[email protected]> Date: Sun Feb 21 13:38:37 2016 +0100 fix get_libebook_dep.sh to work with new multiarchified libebook --- changelog | 2 ++ scripts/get_libebook_dep.sh | 23 +++++++++++++++-------- 2 files changed, 17 insertions(+), 8 deletions(-) diff --git a/changelog b/changelog index 7875231..56adaa1 100644 --- a/changelog +++ b/changelog @@ -2,6 +2,8 @@ libreoffice (1:5.1.1~rc1-2) UNRELEASED; urgency=medium * debian/rules: - somewhen m68k vanished from OOO_ARCHS; readd ;) + * debian/scripts/get_libebook_dep.sh: fix to work with new multiarchified + libebook -- Rene Engelhard <[email protected]> Tue, 16 Feb 2016 13:06:26 +0100 diff --git a/scripts/get_libebook_dep.sh b/scripts/get_libebook_dep.sh index 6fefd62..b6e4115 100755 --- a/scripts/get_libebook_dep.sh +++ b/scripts/get_libebook_dep.sh @@ -3,15 +3,22 @@ libs=`grep libebook.*\.so connectivity/source/drivers/evoab2/EApi.cxx | 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 libebook 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` + 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 -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
