r1352 - in /unstable/vlc/debian: changelog rules

[lool at users.alioth.debian.org]

Author: lool
Date: Fri Aug 22 16:21:25 2008
New Revision: 1352

URL: http://svn.debian.org/wsvn/pkg-multimedia/?sc=1&rev=1352
Log:
Use objdump -x instead of ldd to check for links on libX11 as ldd might
resolve libvlc to the system's version if the system has libvlc installed.

Modified:
    unstable/vlc/debian/changelog
    unstable/vlc/debian/rules

Modified: unstable/vlc/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/vlc/debian/changelog?rev=1352&op=diff
==============================================================================
--- unstable/vlc/debian/changelog (original)
+++ unstable/vlc/debian/changelog Fri Aug 22 16:21:25 2008
@@ -8,6 +8,8 @@
   [ Loic Minier ]
   * Minor cleanups.
   * Use DEB_HOST_ARCH instead of DEB_BUILD_ARCH in rules.
+  * Use objdump -x instead of ldd to check for links on libX11 as ldd might
+    resolve libvlc to the system's version if the system has libvlc installed.
 
  -- Christophe Mutricy <xtophe at videolan.org>  Thu, 21 Aug 2008 20:19:39 +0100
 

Modified: unstable/vlc/debian/rules
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/vlc/debian/rules?rev=1352&op=diff
==============================================================================
--- unstable/vlc/debian/rules (original)
+++ unstable/vlc/debian/rules Fri Aug 22 16:21:25 2008
@@ -168,7 +168,7 @@
 	# Check that we did not install a plugin linked with libX11 in vlc-nox
 	BORKED=no; \
 	for file in $$(find debian/vlc-nox/usr/lib/vlc -name '*.so'); do \
-	  if ldd $$file | grep -q libX11; then \
+	  if objdump -x $$file | egrep -q '^ +NEEDED +libX11\.so'; then \
 	    BORKED=yes; \
 	    echo $$file depends on libX11; \
 	  fi; \