The branch, master has been updated
via 96e0c9b0f935d615abe247a297469bc57692dd1f (commit)
via 2c20a5c29a46acd5d18c7960fff8e23fd555c510 (commit)
via fe7f329c88c4fe3fffca4cf6fc0146dfe79aaeda (commit)
via 3aea890c6528e2df0533c07a703fc22a48ea6fe2 (commit)
via e6432291b26a13b64293af6284796bfaff6afe38 (commit)
via e6dd591b64e6186724d4e652db039652299ff314 (commit)
via 097a64746d783ea7c1b669c908b478438f1e61e3 (commit)
via 4a34d81475596fefea9cfa09b5a7538fbfa57fd3 (commit)
via f2e57dbefaa554a908b83f61d48a39f1e484dea9 (commit)
via 435c9a0bfeda19e1d6991eefba4735775c444f73 (commit)
via feff6012e0f1fa34f136a6440b233d47cfa56d89 (commit)
via 05c04ffc005ce29a4017a8e8c48389cca0911ed1 (commit)
via 2c9ec8dcf5a6e58d92750a8ae19d202f86aa868d (commit)
via 3d4a0d08f72807fe2fc47c66a91a65b4f9b49b14 (commit)
via 5876bfe77d1ea269f27b5d43b39a410e74d1492b (commit)
via 6329ea72633acd71925649088cf31bc7ff9caa3f (commit)
via 019102324b7b750ee79b31a60f0a3a297e1a2d43 (commit)
via dca270df7beb27b4ee72a7e54aad7dd9268a5749 (commit)
via d131b99fdb144d62cf93a1f3b2d75de4256d3555 (commit)
via ee9f8c8ae478206bda6bdab82256fb309e5d314f (commit)
via 6e02b2ef46aadde5ce142bb42b58e3165253eb58 (commit)
via 2e229f0686d243d31dea34e4664200f6c90e3333 (commit)
via b776c00b2570b0083172ea8a91820c9b34752624 (commit)
via 9f4c19234c7608b052e3d1dd5b0441b0727666b2 (commit)
via 8584f930e4085af71cb0b2bfddfde912c35176ac (commit)
via cff7c6ef26150d2c215eaef5ce52d9d75dd4ceb9 (commit)
via ba56d637aa7c4792c477bae452cbecb3211a8a7c (commit)
via eee7d3c8a14bc91f8b9b426f5b519b4ca1c3b40e (commit)
via 85637101b5df1ce82c845f55949c7ba607763716 (commit)
via 61ad4f1bc2ffd18706dea3b3226dd6f57bbce625 (commit)
via 40ed7b0685cfe9160dfd3a34b7babe3e604c8d7c (commit)
via 8d94cf7e7e959c5a6655a51ff159d6a8571f6226 (commit)
via fddb619b2d5d92bb7b735688ac78e260583b75a4 (commit)
via 1c2c6ce514c967348ebae88e5afc5ed3ff9da183 (commit)
via fb437163ca96a0df0e98e50852412e42030add54 (commit)
via 90dfbd7eb305b880935f8b6cb57bf81fa753e283 (commit)
via a1f219403f788cef4f4710e51c2e2e38abeed3a6 (commit)
via 4c973b204df272e62c3b484d436a7ae87bb4fe70 (commit)
via 7b5a5b0a4dc034506c8c604bb6b48775d5965f99 (commit)
via 2d895b020241d192a73261dde800a2f16520296f (commit)
via a0880440c9b169ced9a4fc9af84d44fe0ad94876 (commit)
via 0a44fac4b6c1678949d967edb4dfbecf9775159f (commit)
via a0e24d52a9eaabfacf0a59664a1efe3aa9ecfdb0 (commit)
via 9d20462cb884e9e5bc902080b44c38735dab6e39 (commit)
via 443b17b65af120745b12b6a40c87ca4f2e3edec9 (commit)
via f2b323254027d7e5693ec2e26b78dd2d71d65a70 (commit)
via fad6a8ea7f34fb073fabae2da819063a2781ad98 (commit)
via a3d50891445c5dae043efa11553f37021ef615c6 (commit)
via 33cef2fdb199fb486ea9eae40978691ded293fd3 (commit)
via 8af4fb045300584f7696302fa8d946adfa56651f (commit)
via 9345d9bbc3493f67ae06664b6563ec5c5bee1075 (commit)
via 0d0017fbaec62ac1b97cdb249c2f31fb2cf02179 (commit)
via 2d54fee2831f98ea26425ff688cae9f66b6978da (commit)
via 6a47b07bbb47f4ac864b127303d05ae2e21bd389 (commit)
via 194b2e9b607233f522d8c146abe921ebd3cd3c6e (commit)
via 10b50ae841f425a347e2a42751f4e30542addadc (commit)
via 86085ee760f3ad4c65cff42b97823c8c9b2761cf (commit)
via e1b3731a3cff433f2b29f0ec5d9859b398f08fd2 (commit)
via 9a557ad985605f7de7ef277b0803db2ae566ea7a (commit)
via 161a5337686fbd174cd2fcfec0caf98cd9e51db4 (commit)
via a5c4f07dbf4c9da41502671adfb305e06e04f2f8 (commit)
via 09cfd429c98f55e19626bd33c5bc8b0a51bca3db (commit)
via b4dac9dfb9bb632db6a29ca61c1772443f468bde (commit)
via 0a276d596f9d7c32251b69ebc4edd41efcf2fd38 (commit)
via b88af1c0ca635c3e3954067e95366b6080e5814f (commit)
via 5d029bf7c661a158d4c80844f37c2ca6d5382e3a (commit)
via 1d3477e3ef92d6e8e0e174d3003663f026417143 (commit)
via 5f28e0672e6937fe8146b627493c9fe2440f6e23 (commit)
via 3af649e9d42450c6f1c25e14c1595853501b74a9 (commit)
via 7ee696f92c584ed59e6012f895892ff65eebc69e (commit)
via c3b177ac4236e264dbc9eb9e1d6cce3d3b8795af (commit)
via 90916a8bb65726f881a6ad797ed802e605881bff (commit)
via 4eb4812344ca8dcd02d4e305faa913835fafb903 (commit)
via d3a5ca5a0f3d79c32d3a410501382686cc2f57e6 (commit)
via ca21cc6e5709c7cac4637dc9250495fce3e37ff2 (commit)
via 77f886c983992c1277500e31d523df8197df410b (commit)
from 6d66ede0563c13c1147e1763029012ca23cdc993 (commit)
- Shortlog ------------------------------------------------------------
96e0c9b Merge branch 'master' of ssh://git.debian.org/git/dpkg/dpkg
2c20a5c Updated changelogs with required information concerning the merge of
dpkg-shlibdeps-buxy
Summary of changes:
ChangeLog | 18 +
debian/changelog | 40 +-
debian/dpkg-dev.install | 10 +
man/Makefile.am | 2 +
man/deb-symbols.5 | 52 +
man/dpkg-gensymbols.1 | 164 ++
man/dpkg-shlibdeps.1 | 142 +-
scripts/Dpkg/ErrorHandling.pm | 50 +
scripts/Dpkg/Path.pm | 82 +
scripts/Dpkg/Shlibs.pm | 92 +
scripts/Dpkg/Shlibs/Objdump.pm | 339 +++
scripts/Dpkg/Shlibs/SymbolFile.pm | 326 +++
scripts/Dpkg/Version.pm | 205 ++
scripts/Makefile.am | 38 +-
scripts/dpkg-gensymbols.pl | 240 ++
scripts/dpkg-shlibdeps.pl | 749 ++++---
scripts/po/POTFILES.in | 7 +-
scripts/t/000_pod.t | 11 +
scripts/t/100_Dpkg_Version.t | 80 +
scripts/t/200_Dpkg_Shlibs.t | 148 ++
scripts/t/200_Dpkg_Shlibs/ld.so.conf | 9 +
.../200_Dpkg_Shlibs/ld.so.conf.d/inf_recurse.conf | 1 +
scripts/t/200_Dpkg_Shlibs/ld.so.conf.d/normal.conf | 1 +
.../t/200_Dpkg_Shlibs/ld.so.conf.d/recursive.conf | 1 +
scripts/t/200_Dpkg_Shlibs/ld.so.conf_2 | 1 +
scripts/t/200_Dpkg_Shlibs/objdump.glib-ia64 | 350 +++
scripts/t/200_Dpkg_Shlibs/objdump.libc6-2.3 | 2276 +++++++++++++++++++
scripts/t/200_Dpkg_Shlibs/objdump.libc6-2.6 | 2345 ++++++++++++++++++++
scripts/t/200_Dpkg_Shlibs/symbols.fake-1 | 4 +
scripts/t/200_Dpkg_Shlibs/symbols.fake-2 | 8 +
scripts/t/200_Dpkg_Shlibs/symbols.include-1 | 7 +
scripts/t/200_Dpkg_Shlibs/symbols.include-2 | 3 +
32 files changed, 7418 insertions(+), 383 deletions(-)
-----------------------------------------------------------------------
Details of changes:
commit 96e0c9b0f935d615abe247a297469bc57692dd1f
Merge: 2c20a5c29a46acd5d18c7960fff8e23fd555c510
6d66ede0563c13c1147e1763029012ca23cdc993
Author: Raphael Hertzog <[EMAIL PROTECTED]>
Date: Mon Oct 8 21:05:05 2007 +0200
Merge branch 'master' of ssh://git.debian.org/git/dpkg/dpkg
Conflicts:
configure.ac
debian/changelog
diff --combined ChangeLog
index 5d89eab,322ba76..5aded80
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,23 -1,9 +1,27 @@@
+2007-10-08 Raphael Hertzog <[EMAIL PROTECTED]>,
+ Frank Lichtenheld <[EMAIL PROTECTED]>
+
+ * 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 <[EMAIL PROTECTED]>
+ * configure.ac: Bump version to 1.14.8~.
+
+ 2007-10-08 Guillem Jover <[EMAIL PROTECTED]>
+
* configure.ac: Release 1.14.7.
2007-10-08 Guillem Jover <[EMAIL PROTECTED]>
commit 2c20a5c29a46acd5d18c7960fff8e23fd555c510
Author: Raphael Hertzog <[EMAIL PROTECTED]>
Date: Mon Oct 8 21:03:35 2007 +0200
Updated changelogs with required information concerning the merge of
dpkg-shlibdeps-buxy
diff --git a/ChangeLog b/ChangeLog
index 8eb4557..5d89eab 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,21 @@
+2007-10-08 Raphael Hertzog <[EMAIL PROTECTED]>,
+ Frank Lichtenheld <[EMAIL PROTECTED]>
+
+ * 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 <[EMAIL PROTECTED]>
* configure.ac: Release 1.14.7.
diff --git a/configure.ac b/configure.ac
index df83f25..08924c8 100644
--- 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], [EMAIL PROTECTED])
+AC_INIT([dpkg], [1.14.8], [EMAIL PROTECTED])
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 3b23a97..df6908a 100644
--- 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 <[EMAIL PROTECTED]> 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 <[EMAIL PROTECTED]> 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 <[EMAIL PROTECTED]> 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 <[EMAIL PROTECTED]> Tue, 25 Sep 2007 08:43:45 +0200
-
dpkg (1.14.6) unstable; urgency=low
[ Frank Lichtenheld ]
--
dpkg's main repository
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
