From: Raphael Hertzog <hertzog@debian.org>
Date: Fri, 4 Jan 2008 13:16:06 +0000 (+0100)
Subject: Dpkg/Shlibs/SymbolFile.pm: Replace DEPRECATED by MISSING
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8cbf573fab7f0fcb242bc9b9f7487b046b993d8e;p=dpkg

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 2d795fbf..d577fe13 100644
--- 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 249197e4..b00822f7 100644
--- 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 0035fe52..2c364060 100644
--- 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";