Merge branch 'master' into dpkg-shlibdeps-buxy. Prepare 1.14.8~newshlib

release.

Conflicts:

	configure.ac
	debian/changelog

diff --cc configure.ac
index 87a014c7b9cf274dee90d43333fe2d481513791f,5ce9f62053f8b13ace7f29f209c0381fadb0a7d8..df83f25d85c4b3c23fb9d749d7b9e07d793d45e5
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac
@@@ -1,7 -1,7 +1,7 @@@
  # Process this file with autoconf to produce a configure script.
  
  AC_PREREQ(2.59)
- AC_INIT([dpkg], [1.14.7~newshlib], [debian-dpkg@lists.debian.org])
 -AC_INIT([dpkg], [1.14.7], [debian-dpkg@lists.debian.org])
++AC_INIT([dpkg], [1.14.8~newshlib], [debian-dpkg@lists.debian.org])
  AC_CONFIG_SRCDIR([lib/dpkg.h])
  AC_CONFIG_MACRO_DIR([m4])
  AC_CONFIG_AUX_DIR([config])

diff --cc debian/changelog
index 9578eab9a9b7810ee4046d91223bc6a6110860fc,5cec0601478d54c79f76913aca6d6eea92e6e6ea..3b23a97cc38345d45e64a687abd9885091567ad3
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,40 -1,11 +1,15 @@@
- dpkg (1.14.7~newshlib.1) experimental; urgency=low
 -dpkg (1.14.8) UNRELEASED; urgency=low
++dpkg (1.14.8~newshlib) experimental; urgency=low
 +
-   * Fixes dpkg-gensymbols to use Dpkg::Gettext instead of recently
-     removed dpkg-gettext.pl.
++  [ Raphael Hertzog ]
++  * Snapshot of upcoming dpkg 1.14.8 with improved dpkg-shlibdeps
++    supporting symbols files.
  
-  -- Raphael Hertzog <hertzog@debian.org>  Tue, 25 Sep 2007 13:42:20 +0200
+   [ Updated man pages translations ]
+   * German (Helge Kreutzmann).
  
- dpkg (1.14.7~newshlib) experimental; urgency=low
 - --  <@debian.org>  Mon, 08 Oct 2007 18:47:34 +0300
++ -- Raphael Hertzog <hertzog@debian.org>  Mon, 08 Oct 2007 20:22:57 +0200
  
-   [ Raphael Hertzog ]
-   * dpkg-shlibdeps has been heavily reworked:
-     * it supports "symbols" files to generate finer-grained
-       dependencies. Closes: #430367
-       Those files can be created by the new dpkg-gensymbols
-       command.
-     * it uses now all paths in RPATH (instead of only the first).
-       Closes: #395942
-     * it's now able to parse include directives in /etc/ld.so.conf.
-       Closes: #431597
-     * libraries are also searched in the public directories of packages
-       being built and thus debian/shlibs.local can effectively define
-       dependencies for libraries that are being built. Closes: #80340
-     * "symbols" files use the full SONAME as key instead of splitting it in
-       (name, version) like the "shlibs" format requires it. This allows
-       binaries to be linked with unversioned libraries and not fail.
-       Closes: #48208
-       Note that unversioned libraries are still a very bad idea.
-     * dpkg-shlibdeps now supports "-x<package>" options that can be used
-       to exclude packages from generated dependencies. This is
-       particalularly useful to avoid dependencies on ourselves when a
-       package contains a binary and a library (without requiring an
-       shlibs.local file to override the usual shlibs file). It might also
-       be used to avoid other unwanted dependencies (use with care though).
-       Closes: #41907, #109954
-     * If dpkg-shlibdeps doesn't find any dependency information for a
-       shared library that is actively used, then it will fail. This can be
-       disabled with the option --ignore-missing-info. Closes: #10807
+ dpkg (1.14.7) unstable; urgency=low
  
    [ Guillem Jover ]
    * Add back $dpkglib into @INC, needed by the controllib.pl require in
@@@ -83,9 -71,10 +75,50 @@@
  
    [ Updated scripts translations ]
    * Correct a typo in the French translation. Closes: #443276
+   * Swedish (Peter Karlsson).
+ 
+  -- Guillem Jover <guillem@debian.org>  Mon, 08 Oct 2007 07:31:34 +0300
+ 
++dpkg (1.14.7~newshlib.1) experimental; urgency=low
++
++  * Fixes dpkg-gensymbols to use Dpkg::Gettext instead of recently
++    removed dpkg-gettext.pl.
++
++ -- Raphael Hertzog <hertzog@debian.org>  Tue, 25 Sep 2007 13:42:20 +0200
++
++dpkg (1.14.7~newshlib) experimental; urgency=low
++
++  [ Raphael Hertzog ]
++  * dpkg-shlibdeps has been heavily reworked:
++    * it supports "symbols" files to generate finer-grained
++      dependencies. Closes: #430367
++      Those files can be created by the new dpkg-gensymbols
++      command.
++    * it uses now all paths in RPATH (instead of only the first).
++      Closes: #395942
++    * it's now able to parse include directives in /etc/ld.so.conf.
++      Closes: #431597
++    * libraries are also searched in the public directories of packages
++      being built and thus debian/shlibs.local can effectively define
++      dependencies for libraries that are being built. Closes: #80340
++    * "symbols" files use the full SONAME as key instead of splitting it in
++      (name, version) like the "shlibs" format requires it. This allows
++      binaries to be linked with unversioned libraries and not fail.
++      Closes: #48208
++      Note that unversioned libraries are still a very bad idea.
++    * dpkg-shlibdeps now supports "-x<package>" options that can be used
++      to exclude packages from generated dependencies. This is
++      particalularly useful to avoid dependencies on ourselves when a
++      package contains a binary and a library (without requiring an
++      shlibs.local file to override the usual shlibs file). It might also
++      be used to avoid other unwanted dependencies (use with care though).
++      Closes: #41907, #109954
++    * If dpkg-shlibdeps doesn't find any dependency information for a
++      shared library that is actively used, then it will fail. This can be
++      disabled with the option --ignore-missing-info. Closes: #10807
 +
 + -- Raphael Hertzog <hertzog@debian.org>  Tue, 25 Sep 2007 08:43:45 +0200
 +
  dpkg (1.14.6) unstable; urgency=low
  
    [ Frank Lichtenheld ]