[SCM] Debian Qt/KDE packaging tools branch, improved-gensymbols, updated. debian/0.5.3-19-gb419375

[Modestas Vainius]

The following commit has been merged in the improved-gensymbols branch:
commit b41937550305b7e043a4744bd882f1e91ceb6cac
Author: Modestas Vainius <modestas at vainius.eu>
Date:   Fri Jan 15 19:42:09 2010 +0200

    Update to the latest snapshot of dpkg.git master.
    
    01a4b244f36239bb6df336e201f51c185b2dd2d2
---
 symbolshelper/Dpkg/Shlibs/Symbol.pm |   26 ++++++++++++--------------
 symbolshelper/dpkg-gensymbols.1     |   10 ++++++++--
 2 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/symbolshelper/Dpkg/Shlibs/Symbol.pm b/symbolshelper/Dpkg/Shlibs/Symbol.pm
index 5ae47b8..2964f1d 100644
--- a/symbolshelper/Dpkg/Shlibs/Symbol.pm
+++ b/symbolshelper/Dpkg/Shlibs/Symbol.pm
@@ -157,23 +157,22 @@ sub initialize {
 	$type = 'alias-c++';
     }
 
+    # Support old style wildcard syntax. That's basically a symver
+    # with an optional tag.
+    if ($self->get_symbolname() =~ /^\*@(.*)$/) {
+	$self->add_tag("symver") unless $self->has_tag("symver");
+	$self->add_tag("optional") unless $self->has_tag("optional");
+	$self->{symbol} = $1;
+    }
+
     if ($self->has_tag('symver')) {
 	# Each symbol is matched against its version rather than full
 	# name at version string.
 	$type = (defined $type) ? 'generic' : 'alias-symver';
-    }
-    # Support old style wildcard syntax as well. That's basically a symver
-    # with implicit optional tag.
-    if ($self->get_symbolname() =~ /^\*@(.*)$/) {
-	error(_g("you can't use wildcards on unversioned symbols: %s"), $_) if $1 eq "Base";
-	# symver pattern needs symbol name to be its version. However, keeping
-	# dumping this as old style wildcard in the output.
-	unless (defined $self->{symbol_templ}) {
-	    $self->{symbol_templ} = $self->get_symbolname();
+	if ($self->get_symbolname() eq "Base") {
+	    error(_g("you can't use symver tag to catch unversioned symbols: %s"),
+	          $self->get_symbolspec(1));
 	}
-	$type = (defined $type) ? 'generic' : 'alias-symver';
-	$self->{symbol} = $1;
-	$self->{pattern}{old_wildcard} = 1;
     }
 
     # As soon as regex is involved, we need to match each real
@@ -270,8 +269,7 @@ sub equals {
 
 sub is_optional {
     my $self = shift;
-    return $self->has_tag("optional") ||
-           (exists $self->{pattern} && exists $self->{pattern}{old_wildcard});
+    return $self->has_tag("optional");
 }
 
 sub is_arch_specific {
diff --git a/symbolshelper/dpkg-gensymbols.1 b/symbolshelper/dpkg-gensymbols.1
index 43ed70f..0721d4e 100644
--- a/symbolshelper/dpkg-gensymbols.1
+++ b/symbolshelper/dpkg-gensymbols.1
@@ -176,13 +176,13 @@ symbols from the library. \fBdpkg-gensymbols\fR will attempt to match each
 pattern against each real symbol that does \fInot\fR have a specific symbol
 counterpart defined in the symbol file. Whenever the first matching pattern is
 found, all its tags and properties will be used as a basis specification of the
-symbol. If neither pattern matches, the symbol will be considered as new.
+symbol. If none of the patterns matches, the symbol will be considered as new.
 
 A pattern is considered lost if it does not match any symbol in the library. By
 default this will trigger a \fBdpkg-gensymbols\fR failure under \fI-c1\fR or
 higher level. However, if the failure is undesired, the pattern may be marked
 with the \fIoptional\fR tag. Then if the pattern does not match anything, it
-will only appear in the diff as MISSING. Moreover, like any symbol, the patten
+will only appear in the diff as MISSING. Moreover, like any symbol, the pattern
 may be limited to the specific architectures with the \fIarch\fR tag. Please
 refer to \fBStandard symbol tags\fR subsection above for more information.
 
@@ -420,6 +420,12 @@ Enable debug mode. Numerous messages are displayed to explain what
 .B dpkg\-gensymbols
 does.
 .TP
+.BI \-V
+Enable verbose mode. The generated symbols file contains deprecated
+symbols as comments. Furthermore in template mode, pattern symbols
+are followed by comments listing real symbols that have matched the
+pattern.
+.TP
 .BR \-h ", " \-\-help
 Show the usage message and exit.
 .TP

-- 
Debian Qt/KDE packaging tools