Merge branch 'master' of ssh://git.debian.org/git/dpkg/dpkg

Conflicts:

	configure.ac
	debian/changelog

diff --cc ChangeLog
index 5d89eab322cd9c78b0accc7b22bed6fd3441df5e,322ba763dbfdf289d14a51d50aa05fc80a6ae68b..5aded80a4789225a646a8dbd4e68515dbd8d6563
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,21 -1,7 +1,25 @@@
 +2007-10-08  Raphael Hertzog  <hertzog@debian.org>,
 +          Frank Lichtenheld <djpig@debian.org>
 +
 +      * Merge dpkg-shlibdeps-buxy branch.
 +
 +      * scripts/dpkg-shlibdeps.pl: heavily reworked to support "symbols"
 +      files. Lots of the code has been modularized in perl modules
 +      Dpkg::Shlibs::*.
 +
 +      * scripts/dpkg-gensymbols.pl: new script used to generated symbols
 +      files at package build time. It shall be used by packages of libraries.
 +
 +      * man/dpkg-{shlibdeps,gensymbols}.1: updated and created manual
 +      pages documenting the changes above.
 +
 +      * scripts/t/*: Added some non-regression test on many parts of the
 +      newly introduced perl modules.
 +
+ 2007-10-08  Guillem Jover  <guillem@debian.org>
+ 
+       * configure.ac: Bump version to 1.14.8~.
+ 
  2007-10-08  Guillem Jover  <guillem@debian.org>
  
        * configure.ac: Release 1.14.7.