Merge branch 'stable'

Conflicts:

	ChangeLog
	configure.ac
	debian/changelog

ChangeLog

@@ -66,6 +66,20 @@
 
 	* configure.ac: Bump version to 1.14.17~.
 
+2008-01-24  Raphael Hertzog  <hertzog@debian.org>
+
+	* configure.ac: Release 1.14.16.5.
+
+2008-01-24  Raphael Hertzog  <hertzog@debian.org>
+
+	* scripts/Dpkg/Shlibs/SymbolFile.pm (load): Remove the loaded file
+	from the %$seen hash at the end so that it's possible to include
+	multiple times the same file (at the same level and not from any
+	nested file obviously).
+
+	* scripts/Dpkg/Shlibs/SymbolFile.pm: Blacklist many armel specific
+	symbols.
+
 2008-01-23  Guillem Jover  <guillem@debian.org>
 
 	* configure.ac: Release 1.14.16.4.

debian/changelog

@@ -16,6 +16,15 @@ dpkg (1.14.17) UNRELEASED; urgency=low
 
  -- Guillem Jover <guillem@debian.org>  Mon, 21 Jan 2008 10:11:55 +0200
 
+dpkg (1.14.16.5) unstable; urgency=low
+
+  * Fix dpkg-gensymbols handling of #include so that one can include multiple
+    times the same file and have it properly taken into account.
+  * Add many armel-specific symbols to dpkg-gensymbols' blacklist.
+    Closes: #462318
+
+ -- Raphael Hertzog <hertzog@debian.org>  Thu, 24 Jan 2008 14:20:10 +0100
+
 dpkg (1.14.16.4) unstable; urgency=low
 
   * Import capit in Dpkg::Cdata from Dpkg::Fields. Closes: #462172

scripts/Dpkg/Shlibs/SymbolFile.pm

@@ -60,6 +60,15 @@ for (my $i = 14; $i <= 31; $i++) {
     $blacklist{"_savegpr_$i"} = 1;
 }
 
+# Many armel-specific symbols
+$blacklist{"__aeabi_$_"} = 1 foreach (qw(cdcmpeq cdcmple cdrcmple cfcmpeq
+cfcmple cfrcmple d2f d2iz d2lz d2uiz d2ulz dadd dcmpeq dcmpge dcmpgt
+dcmple dcmplt dcmpun ddiv dmul dneg drsub dsub f2d f2iz f2lz f2uiz f2ulz
+fadd fcmpeq fcmpge fcmpgt fcmple fcmplt fcmpun fdiv fmul fneg frsub fsub
+i2d i2f idiv idivmod l2d l2f lasr lcmp ldivmod llsl llsr lmul ui2d ui2f
+uidiv uidivmod ul2d ul2f ulcmp uldivmod unwind_cpp_pr0 unwind_cpp_pr1
+unwind_cpp_pr2 uread4 uread8 uwrite4 uwrite8));
+
 sub new {
     my $this = shift;
     my $file = shift;
@@ -158,6 +167,7 @@ sub load {
 	}
     }
     close($sym_file);
+    delete $seen->{$file};
 }
 
 sub save {