* dh_shlibdeps: Change "-L pkg" to cause "-Sdebian/pkg" to be passed to

  dpkg-shlibdeps. The old behavior of passing -L to dpkg-shlibdeps didn't
  affect where it looked for symbols files. Closes: #459224
* Depend on dpkg-dev 1.14.15, the first to support dpkg-shlibdeps -S.

1 files changed, 11 insertions, 4 deletions

diff --git a/dh_shlibdeps b/dh_shlibdeps
index cfbfa2de..a076537a 100755
--- a/dh_shlibdeps
+++ b/dh_shlibdeps
@@ -55,10 +55,11 @@ path.
 =item B<-L>I<package>, B<--libpackage=>I<package>
 
 With recent versions of dpkg-shlibdeps, this option is generally not
-needed.
+needed, unless your package builds multiple flavors of the same library.
 
-Tell dpkg-shlibdeps to use the shlibs file automatically generated by
-dh_makeshlibs for the named package instead of the shlibs.local file.
+It tells dpkg-shlibdeps (via its -S parameter) to look first in the package
+build directory for the specified package, when searching for libraries,
+symbol files, and shlibs files.
 
 =back
 
@@ -76,6 +77,12 @@ libfoo1, and using that file and the libfoo1 library in the
 debian/libfoo1/usr/lib directory to calculate shared library dependency
 information.
 
+If a libbar1 package is also produced, that is an alternate build of
+libfoo, and is installed into /usr/lib/bar/, you can make libfoo-bin depend
+on libbar1 as follows:
+
+	dh_shlibdeps -Llibbar1 -l/usr/lib/bar
+
 =cut
 
 init();
@@ -122,7 +129,7 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
 	if (@filelist) {
 		my @opts;
 		if (defined $dh{LIBPACKAGE} && length $dh{LIBPACKAGE}) {
-			@opts=("-L".tmpdir($dh{LIBPACKAGE}."/DEBIAN/shlibs"));
+			@opts=("-S".tmpdir($dh{LIBPACKAGE}));
 		}
 		
 		push @opts, "-tudeb" if is_udeb($package);