The branch, master has been updated
via 8cbf573fab7f0fcb242bc9b9f7487b046b993d8e (commit)
from f4f14579592f93767d19114f1209975078f06657 (commit)
- Shortlog ------------------------------------------------------------
8cbf573 Dpkg/Shlibs/SymbolFile.pm: Replace DEPRECATED by MISSING
Summary of changes:
ChangeLog | 6 ++++++
debian/changelog | 2 ++
scripts/Dpkg/Shlibs/SymbolFile.pm | 4 ++--
3 files changed, 10 insertions(+), 2 deletions(-)
-----------------------------------------------------------------------
Details of changes:
commit 8cbf573fab7f0fcb242bc9b9f7487b046b993d8e
Author: Raphael Hertzog <[EMAIL PROTECTED]>
Date: Fri Jan 4 14:16:06 2008 +0100
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 2d795fb..d577fe1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-01-04 Raphael Hertzog <[EMAIL PROTECTED]>
+
+ * 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 <[EMAIL PROTECTED]>
* scripts/dpkg-shlibdeps.pl (find_symbols_file): When libraries
diff --git a/debian/changelog b/debian/changelog
index 249197e..b00822f 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 0035fe5..2c36406 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";
--
dpkg's main repository
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
