[libreoffice] 04/04: Fix get_libebook_dep.sh for libebook1.2-dev (>= 3.24)

Rene Engelhard rene at moszumanska.debian.org
Mon Jul 24 17:26:01 UTC 2017


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

rene pushed a commit to branch master
in repository libreoffice.

commit b1687dc302be4ea522f154d6be2aeef65a8e7c0a
Author: Rico Tzschichholz <ricotz at ubuntu.com>
Date:   Mon Jul 24 14:28:00 2017 +0200

    Fix get_libebook_dep.sh for libebook1.2-dev (>= 3.24)
    
    The cmake buildsys creates a different symlink chain which we need to
    take into account.
    
    /usr/lib/x86_64-linux-gnu/libebook-1.2.so -> libebook-1.2.so.19
    /usr/lib/x86_64-linux-gnu/libebook-1.2.so.19 -> libebook-1.2.so.19.1.3
    /usr/lib/x86_64-linux-gnu/libebook-1.2.so.19.1.3
---
 scripts/get_libebook_dep.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/scripts/get_libebook_dep.sh b/scripts/get_libebook_dep.sh
index b6e4115..8eb2ef2 100755
--- a/scripts/get_libebook_dep.sh
+++ b/scripts/get_libebook_dep.sh
@@ -17,7 +17,8 @@ for l in $libs; do
 	l1=`readlink $p/$l`
 	l2_tmp=`echo $l | perl -pe 's/(.*)\.\d+$/$1/'`
 	l2=`readlink $p/$l2_tmp`
-	if [ "$l1" = "$l2" ]; then
+	l3=`readlink $p/$l2`
+	if [ "$l1" = "$l2" -o "$l1" = "$l3" ]; 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



More information about the Pkg-openoffice-commits mailing list