[libreoffice] 01/01: update scripts/get_libvlc_dep.sh (and build-depend on its result)
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch debian-experimental-4.2
in repository libreoffice.
commit 799eeb516460a8e4bcf5f8120b0bef0a222d8c6f
Author: Rene Engelhard <rene@debian.org>
Date: Fri Sep 6 08:41:09 2013 +0200
update scripts/get_libvlc_dep.sh (and build-depend on its result)
---
control | 2 ++
rules | 1 +
scripts/get_libvlc_dep.sh | 16 ++++++++--------
3 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/control b/control
index d5e3b6e..6c6f86b 100644
--- a/control
+++ b/control
@@ -96,6 +96,7 @@ Build-Depends: ant (>= 1.7.0),
libsuitesparse-dev (>= 1:3.4.0),
libvigraimpex-dev,
libvisio-dev,
+ libvlc5,
libwpd-dev (>= 0.9.5),
libwpg-dev (>= 0.2.0),
libwps-dev (>= 0.2.0),
@@ -4625,6 +4626,7 @@ Depends: ant (>= 1.7.0),
libsuitesparse-dev (>= 1:3.4.0),
libvigraimpex-dev,
libvisio-dev,
+ libvlc5,
libwpd-dev (>= 0.9.5),
libwpg-dev (>= 0.2.0),
libwps-dev (>= 0.2.0),
diff --git a/rules b/rules
index 0751e84..775006d 100755
--- a/rules
+++ b/rules
@@ -1312,6 +1312,7 @@ endif
ifeq "$(USE_VLC)" "y"
CONFIGURE_FLAGS += --enable-vlc
+ BUILD_DEPS += , $(shell debian/scripts/get_libvlc_dep.sh)
ifeq "$(AVMEDIA_BE_DEPENDS)" ""
AVMEDIA_BE_DEPENDS += , libreoffice-avmedia-backend-vlc
else
diff --git a/scripts/get_libvlc_dep.sh b/scripts/get_libvlc_dep.sh
index a3b1dce..80e97e7 100755
--- a/scripts/get_libvlc_dep.sh
+++ b/scripts/get_libvlc_dep.sh
@@ -1,17 +1,17 @@
#!/bin/sh
-libs=`grep libvlc.*\.so avmedia/source/vlc/wrapper/SymbolLoader.hxx | grep -v vlccore | perl -pe 's/\s+\"(.*)\".*/$1/'`
+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
+# # 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
fi
done
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: