Sfoglia il codice sorgente

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.
Raphael Hertzog 18 anni fa
parent
commit
8cbf573fab
3 ha cambiato i file con 10 aggiunte e 2 eliminazioni
  1. 6 0
      ChangeLog
  2. 2 0
      debian/changelog
  3. 2 2
      scripts/Dpkg/Shlibs/SymbolFile.pm

+ 6 - 0
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>
 2008-01-03  Raphael Hertzog  <hertzog@debian.org>
 
 
 	* scripts/dpkg-shlibdeps.pl (find_symbols_file): When libraries
 	* scripts/dpkg-shlibdeps.pl (find_symbols_file): When libraries

+ 2 - 0
debian/changelog

@@ -10,6 +10,8 @@ dpkg (1.14.15) UNRELEASED; urgency=low
     debian/*/DEBIAN/symbols for a given soname. Closes: #458860
     debian/*/DEBIAN/symbols for a given soname. Closes: #458860
   * Add a -S<pkgbuilddir> option to dpkg-shlibdeps to indicate a package build
   * Add a -S<pkgbuilddir> option to dpkg-shlibdeps to indicate a package build
     tree to scan first when trying to find a needed library.
     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 ]
   [ Guillem Jover ]
   * Move compression related variables to a new Dpkg::Compression module.
   * Move compression related variables to a new Dpkg::Compression module.

+ 2 - 2
scripts/Dpkg/Shlibs/SymbolFile.pm

@@ -120,7 +120,7 @@ sub load {
 	    my $dir = $file;
 	    my $dir = $file;
 	    $dir =~ s{[^/]+$}{}; # Strip filename
 	    $dir =~ s{[^/]+$}{}; # Strip filename
 	    $self->load("$dir$filename", $seen, $object);
 	    $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 = {
 	    my $sym = {
 		minver => $3,
 		minver => $3,
 		dep_id => defined($4) ? $4 : 0,
 		dep_id => defined($4) ? $4 : 0,
@@ -179,7 +179,7 @@ sub dump {
 	foreach my $sym (sort keys %{$self->{objects}{$soname}{syms}}) {
 	foreach my $sym (sort keys %{$self->{objects}{$soname}{syms}}) {
 	    my $info = $self->{objects}{$soname}{syms}{$sym};
 	    my $info = $self->{objects}{$soname}{syms}{$sym};
 	    next if $info->{deprecated} and not $with_deprecated;
 	    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 " $sym $info->{minver}";
 	    print $fh " $info->{dep_id}" if $info->{dep_id};
 	    print $fh " $info->{dep_id}" if $info->{dep_id};
 	    print $fh "\n";
 	    print $fh "\n";