Hmm

diff --git a/scripts/dpkg-shlibdeps.pl b/scripts/dpkg-shlibdeps.pl
index af97a46e1212da614015cf8533469e40288ff598..56e0bfd96e0b3e59a82125cf9f5bf95583ecd890 100755 (executable)
--- a/scripts/dpkg-shlibdeps.pl
+++ b/scripts/dpkg-shlibdeps.pl
@@ -115,15 +115,7 @@ for ($i=0;$i<=$#exec;$i++) {
 if ($#libpaths >= 0) {
     grep(s/\[\?\*/\\$&/g, @libpaths);
     defined($c= open(P,"-|")) || syserr("cannot fork for dpkg --search");
-<<<<<<< dpkg-shlibdeps.pl
-    if (!$c) {
-        close STDERR; # we don't need to see dpkg's errors
-       open STDERR, "> /dev/null";
-        exec("dpkg","--search","--",@libpaths); syserr("cannot exec dpkg");
-    }
-=======
     if (!$c) { exec("dpkg","--search","--",@libpaths); syserr("cannot exec dpkg"); }
->>>>>>> 1.5
     while (<P>) {
        s/\n$//;
        if (m/^local diversion |^diversion by/) {