Merge branch 'sid' (through tag '1.15.3.1')

Conflicts:
	configure.ac
	debian/changelog

debian/changelog

@@ -34,6 +34,13 @@ dpkg (1.15.4) UNRELEASED; urgency=low
 
  -- Guillem Jover <guillem@debian.org>  Sat, 27 Jun 2009 19:25:30 +0200
 
+dpkg (1.15.3.1) unstable; urgency=low
+
+  [ Modestas Vainius ]
+  * Fix wildcard support in symbol files. Closes: #536034
+
+ -- Guillem Jover <guillem@debian.org>  Wed, 08 Jul 2009 11:26:36 +0200
+
 dpkg (1.15.3) unstable; urgency=low
 
   [ Guillem Jover ]

scripts/Dpkg/Shlibs/SymbolFile.pm

@@ -336,7 +336,7 @@ sub symbol_match_wildcard {
         my $w_sym = $obj->{wildcards}{$version};
         return undef unless $w_sym->arch_is_concerned($self->{arch});
         $self->{used_wildcards}++;
-        return $w_sym->clone(symbol => $name . '@' . $version);
+        return $w_sym->clone(symbol => $name);
     }
     return undef;
 }

scripts/t/200_Dpkg_Shlibs.t

@@ -1,6 +1,6 @@
 # -*- mode: cperl;-*-
 
-use Test::More tests => 61;
+use Test::More tests => 62;
 use IO::String;
 
 use strict;
@@ -123,6 +123,17 @@ is_deeply($sym, Dpkg::Shlibs::Symbol->new( 'symbol' => '_errno@GLIBC_2.0',
 		  'deprecated' => '2.6-1', 'depends' => '',
 		  'soname' => 'libc.so.6' ), 'deprecated symbol');
 
+# Wildcard test
+$sym = Dpkg::Shlibs::Symbol->new(symbol => '*@GLIBC_PRIVATE', minver => '2.3.6.wildcard');
+$sym_file_old->add_symbol('libc.so.6', $sym);
+$sym_file_old->merge_symbols($obj, "2.6-1");
+$sym = $sym_file_old->lookup_symbol('__nss_services_lookup@GLIBC_PRIVATE', ['libc.so.6']);
+is_deeply($sym, Dpkg::Shlibs::Symbol->new( 'symbol' => '__nss_services_lookup@GLIBC_PRIVATE',
+		  'minver' => '2.3.6.wildcard', 'dep_id' => 0,
+		  'deprecated' => 0, 'depends' => '',
+		  'soname' => 'libc.so.6' ), 'wildcarded symbol');
+
+# Save -> Load test
 use File::Temp;
 
 my $save_file = new File::Temp;