Merge branch 'stable'

Conflicts:

	configure.ac
	debian/changelog

ChangeLog

@@ -82,6 +82,18 @@
 
 	* configure.ac: Bump version to 1.14.17~.
 
+2008-01-26  Raphael Hertzog  <hertzog@debian.org>
+
+	* configure.ac: Release 1.14.16.6.
+
+2008-01-26  Raphael Hertzog  <hertzog@debian.org>
+
+	* scripts/dpkg-gensymbols: Don't scan directories which are
+	symlinks. They might point outside of the package build dir which
+	results in addition of libraries which are not in the package.
+	The libc6 package on amd64 is affected with a symlink "lib64" ->
+	"/lib".
+
 2008-01-24  Raphael Hertzog  <hertzog@debian.org>
 
 	* configure.ac: Release 1.14.16.5.

debian/changelog

@@ -24,6 +24,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.6) unstable; urgency=medium
+
+  * Let dpkg-gensymbols skip directories which are just symlinks when scanning
+    the package build dir.
+  * Bump urgency to medium to compensate lost days in testing migration due to
+    the two last uploads.
+
+ -- Raphael Hertzog <hertzog@debian.org>  Sat, 26 Jan 2008 19:20:40 +0100
+
 dpkg (1.14.16.5) unstable; urgency=low
 
   * Fix dpkg-gensymbols handling of #include so that one can include multiple

scripts/dpkg-gensymbols.pl

@@ -140,7 +140,9 @@ if (not scalar @files) {
     foreach my $path (@librarypaths) {
 	my $libdir = "$packagebuilddir$path";
 	$libdir =~ s{/+}{/}g;
-	next if not -d $libdir;
+	lstat $libdir;
+	next if not -d _;
+	next if -l _; # Skip directories which are symlinks
 	opendir(DIR, "$libdir") ||
 	    syserr(_g("Can't read directory %s: %s"), $libdir, $!);
 	push @files, grep {