summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjoeyh <joeyh>2006-01-28 18:02:30 +0000
committerjoeyh <joeyh>2006-01-28 18:02:30 +0000
commit5c464ea0173ddcde1abe5fbfad079218a4fff19b (patch)
tree303e6115769568607431b2904027cb7946a39669
parent62a94850bb899dfd239354150e5475c654ac448c (diff)
r1872: * dh_shlibdeps: pass -tudeb to dpkg-shlibdeps for udebs. Closes: #345472
* Depends on dpkg-dev 1.13.13 for dh_shlibdeps change.
-rw-r--r--debian/changelog4
-rw-r--r--debian/control2
-rwxr-xr-xdh_shlibdeps2
3 files changed, 6 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog
index 46db5d0..630fec9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,10 @@ debhelper (5.0.22) UNRELEASED; urgency=low
* dh_makeshlibs: add support for adding udeb: lines to shlibs file
via --add-udeb parameter. Closes: #345471
+ * dh_shlibdeps: pass -tudeb to dpkg-shlibdeps for udebs. Closes: #345472
+ * Depends on dpkg-dev 1.13.13 for dh_shlibdeps change.
- -- Joey Hess <joeyh@debian.org> Sat, 28 Jan 2006 12:53:00 -0500
+ -- Joey Hess <joeyh@debian.org> Sat, 28 Jan 2006 13:01:00 -0500
debhelper (5.0.21) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 6f4d78f..5055608 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Build-Depends-Indep: po4a (>= 0.23)
Package: debhelper
Architecture: all
-Depends: ${perl:Depends}, ${misc:Depends}, coreutils | fileutils (>= 4.0-2.1), file (>= 3.23-1), dpkg-dev (>= 1.7.0), html2text, debconf-utils (>= 1.1.1), binutils, po-debconf
+Depends: ${perl:Depends}, ${misc:Depends}, coreutils | fileutils (>= 4.0-2.1), file (>= 3.23-1), dpkg-dev (>= 1.13.13), html2text, debconf-utils (>= 1.1.1), binutils, po-debconf
Suggests: dh-make
Conflicts: dpkg-cross (<< 1.18)
Description: helper programs for debian/rules
diff --git a/dh_shlibdeps b/dh_shlibdeps
index b5b0ff5..dad0165 100755
--- a/dh_shlibdeps
+++ b/dh_shlibdeps
@@ -125,6 +125,8 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
@opts=("-L".tmpdir($dh{LIBPACKAGE}."/DEBIAN/shlibs"));
}
+ push @opts, "-tudeb" if is_udeb($package);
+
my $ld_library_path_orig=$ENV{LD_LIBRARY_PATH};
if ($dh{L_PARAMS}) {
$ENV{LD_LIBRARY_PATH}=$dh{L_PARAMS};