The following commit has been merged in the ubuntu-oneiric-3.4 branch: commit 24d69db0dcfbce33b7b3574bfe7775fe4d5ce192 Author: Bjoern Michaelsen <bjoern.michael...@canonical.com> Date: Mon Jul 18 10:36:45 2011 +0200
fix get_libebook_dep script diff --git a/scripts/aotcompile.pyc b/scripts/aotcompile.pyc new file mode 100644 index 0000000..6eaf27f Binary files /dev/null and b/scripts/aotcompile.pyc differ diff --git a/scripts/get_libebook_dep.sh b/scripts/get_libebook_dep.sh index 38410fe..25d10bf 100755 --- a/scripts/get_libebook_dep.sh +++ b/scripts/get_libebook_dep.sh @@ -1,8 +1,8 @@ #!/bin/sh -libs=`grep libebook.*\.so build/connectivity/source/drivers/evoab2/EApi.cxx | perl -pe 's/\s+\"(.*)\".*/$1/'` - +libs=`grep -o libebook.*\.so build/connectivity/source/drivers/evoab2/EApi.cxx|sort|uniq` for l in $libs; do + echo "Testing candidate library $l" >&2 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? @@ -11,6 +11,8 @@ for l in $libs; do l2=`readlink /usr/lib/$l2_tmp` if [ "$l1" = "$l2" ]; then dep=`dpkg -S /usr/lib/$l | cut -d: -f1` + else + echo "$l failed sanity check, because $l1 is not $l2." >&2 fi fi done @@ -18,7 +20,8 @@ done if [ -n "$dep" ]; then echo $dep else - echo "Cannot find libebook dependency. None of the following libs found:" echo $libs + echo "Cannot find libebook dependency. None of the following libs found:" >&2 + echo $libs >&2 exit 1 fi -- LibreOffice packaging repository -- To UNSUBSCRIBE, email to debian-openoffice-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/e1qinjx-0002nq...@vasks.debian.org