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

Conflicts:

	man/dpkg-source.1
	scripts/Makefile.am

(manually resolved)

1 files changed, 60 insertions, 0 deletions

diff --git a/debian/changelog b/debian/changelog
index c27ad5613..ab74c0e7a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,63 @@
+dpkg (1.14.8) UNRELEASED; urgency=low
+
+  [ Raphael Hertzog ]
+  * Merge dpkg-shlibdeps-buxy branch, 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
+
+  [ Frank Lichtenheld ]
+  * Add $(MAKE) check to build target
+  * Allow to use other compressions than gzip on dpkg-source -b
+    (NOTE: this will result in a Format: 2.0 source package!).
+    Closes: #382673
+
+  [ Updated dpkg translations ]
+  * Polish (Robert Luberda).
+
+  [ Updated man pages translations ]
+  * Polish (Robert Luberda).
+
+  [ Updated scripts translations ]
+  * Polish (Robert Luberda).
+
+ -- Raphael Hertzog <hertzog@debian.org>  Mon, 08 Oct 2007 20:49:51 +0200
+
+dpkg (1.14.8~newshlib) experimental; urgency=low
+
+  [ Raphael Hertzog ]
+  * Snapshot of upcoming dpkg 1.14.8 with improved dpkg-shlibdeps
+    supporting symbols files.
+
+  [ Updated man pages translations ]
+  * German (Helge Kreutzmann).
+
+ -- Raphael Hertzog <hertzog@debian.org>  Mon, 08 Oct 2007 20:22:57 +0200
+
 dpkg (1.14.7) unstable; urgency=low
 
   [ Guillem Jover ]