Author: hertzog
Date: 2007-07-16 22:47:45 +0000 (Mon, 16 Jul 2007)
New Revision: 873
Modified:
branches/dpkg-shlibdeps-buxy/scripts/dpkg-shlibdeps.pl
Log:
* Bugfix: really use /etc/dpkg/shlibs.default
* Improvement: only look for debian/*/DEBIAN/{symbols,shlibs} instead of
looking into subdirectories as well. File::Find is no more needed.
Modified: branches/dpkg-shlibdeps-buxy/scripts/dpkg-shlibdeps.pl
===================================================================
--- branches/dpkg-shlibdeps-buxy/scripts/dpkg-shlibdeps.pl 2007-07-15
10:55:09 UTC (rev 872)
+++ branches/dpkg-shlibdeps-buxy/scripts/dpkg-shlibdeps.pl 2007-07-16
22:47:45 UTC (rev 873)
@@ -43,12 +43,8 @@
my (@pkg_shlibs, @pkg_symbols);
if (-d "debian") {
- find sub {
- push @pkg_shlibs, $File::Find::name
- if ($File::Find::name =~ m{/DEBIAN/shlibs$});
- push @pkg_symbols, $File::Find::name
- if ($File::Find::name =~ m{/DEBIAN/symbols$});
- }, "debian";
+ push @pkg_symbols, <debian/*/DEBIAN/symbols>;
+ push @pkg_shlibs, <debian/*/DEBIAN/shlibs>;
}
my ($stdout, %exec);
@@ -310,7 +306,8 @@
sub add_shlibs_dep {
my ($soname, $pkg) = @_;
foreach my $file ($shlibslocal, $shlibsoverride, @pkg_shlibs,
- "$admindir/info/$pkg.shlibs")
+ "$admindir/info/$pkg.shlibs",
+ $shlibsdefault)
{
next if not -e $file;
my $dep = extract_from_shlibs($soname, $file);
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
