Updated changelogs with required information concerning the merge of dpkg-shlibdeps...

diff --git a/ChangeLog b/ChangeLog
index 8eb4557222bd4bb0e31752af7ac8756b54aa5513..5d89eab322cd9c78b0accc7b22bed6fd3441df5e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,21 @@
+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: Release 1.14.7.

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

diff --git a/debian/changelog b/debian/changelog
index 3b23a97cc38345d45e64a687abd9885091567ad3..df6908afa73f41441813433d44ee614ea9686613 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,37 @@
+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
+
+ -- Raphael Hertzog <hertzog@debian.org>  Mon, 08 Oct 2007 20:49:51 +0200
+
 dpkg (1.14.8~newshlib) experimental; urgency=low
 
   [ Raphael Hertzog ]
@@ -79,46 +113,6 @@ dpkg (1.14.7) unstable; urgency=low
 
  -- 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 ]