Explorar el Código

dpkg-gensymbols: do not output deprecated symbols

The deprecated symbols appear commented with “#MISSING:”, they should
appear in the explanatory diff but not in the file generated.
Raphael Hertzog hace 17 años
padre
commit
49f9f96178
Se han modificado 2 ficheros con 6 adiciones y 2 borrados
  1. 2 0
      debian/changelog
  2. 4 2
      scripts/dpkg-gensymbols.pl

+ 2 - 0
debian/changelog

@@ -23,6 +23,8 @@ dpkg (1.15.3) UNRELEASED; urgency=low
     restrict the set of architectures where the symbol is supposed to exist.
     Thanks to Modestas Vainius <modestas@vainius.eu> for the patch.
     See dpkg-gensymbols(1) for more information. Closes: #521551
+  * Do not include #MISSING lines in symbols files integrated in binary
+    packages. Closes: #526251
 
   [ Updated dpkg translations ]
   * Simplified Chinese (Deng Xiyue). Closes: #531387

+ 4 - 2
scripts/dpkg-gensymbols.pl

@@ -194,7 +194,8 @@ $symfile->clear_except(keys %{$od->{objects}});
 # Write out symbols files
 if ($stdout) {
     $output = "standard output";
-    $symfile->save("-", package => $oppackage, template_mode => $template_mode);
+    $symfile->save("-", package => $oppackage,
+                   template_mode => $template_mode, with_deprecated => 0);
 } else {
     unless (defined($output)) {
 	unless($symfile->is_empty()) {
@@ -204,7 +205,8 @@ if ($stdout) {
     }
     if (defined($output)) {
 	print "Storing symbols in $output.\n" if $debug;
-	$symfile->save($output, package => $oppackage, template_mode => $template_mode);
+	$symfile->save($output, package => $oppackage,
+                       template_mode => $template_mode, with_deprecated => 0);
     } else {
 	print "No symbol information to store.\n" if $debug;
     }