Dpkg::Shlibs::SymbolFile::merge_symbols() bugfix with deprecated symbols

Do not update the deprecated version of a symbol if it is already marked
deprecated.

diff --git a/ChangeLog b/ChangeLog
index c6d459bec74e136f091d8cbc1fc818d3a342dbe1..48754cf9f7e623cc6f524ea2ad1b6a0eb4a0f77a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-12-10  Raphael Hertzog  <hertzog@debian.org>
+
+       * scripts/Dpkg/Shlibs/SymbolFile.pm (merge_symbols): Do not update
+       the deprecated version of a a symbol if it is already marked
+       deprecated.
+
 2007-12-09  Raphael Hertzog  <hertzog@debian.org>
 
        * scripts/Dpkg/Shlibs/SymbolFile.pm (load): Pass the current

diff --git a/scripts/Dpkg/Shlibs/SymbolFile.pm b/scripts/Dpkg/Shlibs/SymbolFile.pm
index fcaed80b2bea1ef56e92b90202118bfcaa3a472c..a2cf9f2e09e7375b0de9df822e1d4818c7f64b35 100644 (file)
--- a/scripts/Dpkg/Shlibs/SymbolFile.pm
+++ b/scripts/Dpkg/Shlibs/SymbolFile.pm
@@ -232,6 +232,9 @@ sub merge_symbols {
     # the symbol was introduced)
     foreach my $sym (keys %{$self->{objects}{$soname}{syms}}) {
        if (! exists $dynsyms{$sym}) {
+           # Do nothing if already deprecated
+           next if $self->{objects}{$soname}{syms}{$sym}{deprecated};
+
            my $info = $self->{objects}{$soname}{syms}{$sym};
            if (vercmp($minver, $info->{minver}) > 0) {
                $self->{objects}{$soname}{syms}{$sym}{deprecated} = $minver;