Dpkg/Shlibs/SymbolFile.pm: Replace DEPRECATED by MISSING

People understand better that symbols disappeared with the marker MISSING
than with the marker DEPRECATED (which look like it was done on purpose).
Continue to accept DEPRECATED in the input however.

diff --git a/ChangeLog b/ChangeLog
index 2d795fbfad5710b840748f11f419056ac4fa57b2..d577fe13b2751d006b69089d25800c4dba98f3d9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-01-04  Raphael Hertzog  <hertzog@debian.org>
+
+       * scripts/Dpkg/Shlibs/SymbolFile.pm: Replace #DEPRECATED by
+       #MISSING in the output and recognize both while parsing. People
+       understand better that way.
+
 2008-01-03  Raphael Hertzog  <hertzog@debian.org>
 
        * scripts/dpkg-shlibdeps.pl (find_symbols_file): When libraries

diff --git a/debian/changelog b/debian/changelog
index 249197e402ba0f987278976a89978eb0cd21eff2..b00822f7680d3b7695aefb0c1dde05cd656fc906 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,8 @@ dpkg (1.14.15) UNRELEASED; urgency=low
     debian/*/DEBIAN/symbols for a given soname. Closes: #458860
   * Add a -S<pkgbuilddir> option to dpkg-shlibdeps to indicate a package build
     tree to scan first when trying to find a needed library.
+  * Change dpkg-gensymbols to mark symbols that disappeared with #MISSING
+    instead of #DEPRECATED, it's clearer for people.
 
   [ Guillem Jover ]
   * Move compression related variables to a new Dpkg::Compression module.

diff --git a/scripts/Dpkg/Shlibs/SymbolFile.pm b/scripts/Dpkg/Shlibs/SymbolFile.pm
index 0035fe527d4cf43c1386d5680dc6be9d3f19ceaf..2c3640603dcf4c810e876d88df282a00bbc8c23b 100644 (file)
--- a/scripts/Dpkg/Shlibs/SymbolFile.pm
+++ b/scripts/Dpkg/Shlibs/SymbolFile.pm
@@ -120,7 +120,7 @@ sub load {
            my $dir = $file;
            $dir =~ s{[^/]+$}{}; # Strip filename
            $self->load("$dir$filename", $seen, $object);
-       } elsif (/^#DEPRECATED: ([^#]+)#\s*(\S+)\s(\S+)(?:\s(\d+))?/) {
+       } elsif (/^#(?:DEPRECATED|MISSING): ([^#]+)#\s*(\S+)\s(\S+)(?:\s(\d+))?/) {
            my $sym = {
                minver => $3,
                dep_id => defined($4) ? $4 : 0,
@@ -179,7 +179,7 @@ sub dump {
        foreach my $sym (sort keys %{$self->{objects}{$soname}{syms}}) {
            my $info = $self->{objects}{$soname}{syms}{$sym};
            next if $info->{deprecated} and not $with_deprecated;
-           print $fh "#DEPRECATED: $info->{deprecated}#" if $info->{deprecated};
+           print $fh "#MISSING: $info->{deprecated}#" if $info->{deprecated};
            print $fh " $sym $info->{minver}";
            print $fh " $info->{dep_id}" if $info->{dep_id};
            print $fh "\n";