From: Raphael Hertzog <hertzog@debian.org>
Date: Mon, 8 Oct 2007 19:05:05 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.debian.org/git/dpkg/dpkg
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=96e0c9b0f935d615abe247a297469bc57692dd1f;p=dpkg

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

Conflicts:

	configure.ac
	debian/changelog
---

96e0c9b0f935d615abe247a297469bc57692dd1f
diff --cc ChangeLog
index 5d89eab3,322ba763..5aded80a
--- a/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.