r376: * Rats, the previous change makes duplicate lines be created in the

     shlibs file, and lintian conplains. Added some hackery that should
     prevent that. Closes: #73052

diff --git a/debian/changelog b/debian/changelog
index 6ae0b669bf9619d0c197d5b30823dbbd5c1f40b4..3342181b5537c5197be2fd71f18f8ce87bedf679 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+debhelper (2.1.14) unstable; urgency=low
+
+  * Rats, the previous change makes duplicate lines be created in the
+    shlibs file, and lintian conplains. Added some hackery that should
+    prevent that. Closes: #73052
+
+ -- Joey Hess <joeyh@debian.org>  Tue,  3 Oct 2000 12:32:22 -0700
+
 debhelper (2.1.13) unstable; urgency=low
 
   * Typo, Closes: #72932

diff --git a/dh_makeshlibs b/dh_makeshlibs
index bfded282885620b883892547d8042446078fb357..66781c7e6c3715efeeba1424f2179b5f30722444 100755 (executable)
--- a/dh_makeshlibs
+++ b/dh_makeshlibs
@@ -8,6 +8,8 @@ init();
 foreach $PACKAGE (@{$dh{DOPACKAGES}}) {
        $TMP=tmpdir($PACKAGE);
 
+       my %seen;
+
        doit("rm", "-f", "$TMP/DEBIAN/shlibs");
 
        open (FIND, "find $TMP -xtype f -name '*.so.*' |");
@@ -34,7 +36,12 @@ foreach $PACKAGE (@{$dh{DOPACKAGES}}) {
                }
                if (defined($library) && defined($major) && defined($deps) && 
                    $library ne '' && $major ne '' && $deps ne '') {
-                       complex_doit("echo '$library $major $deps' >>$TMP/DEBIAN/shlibs");
+                       # Prevent duplicate lines from entering the file.
+                       my $line="$library $major $deps";
+                       if (! $seen{$line}) {
+                               $seen{$line}=1;
+                               complex_doit("echo '$line' >>$TMP/DEBIAN/shlibs");
+                       }
                }
        }
        close FIND;