[SCM] dpkg's main repository branch, master, updated. 1.14.9-7-g50f4a31

2007-11-22 Thread Raphael Hertzog
The branch, master has been updated
   via  50f4a319f649589e016894a8375ad516db25042d (commit)
  from  a7c9cb9869838f92e98a71ec2ba1cc641cbeac44 (commit)


- Shortlog 
50f4a31 dpkg-shlibdeps: add more debug messages

Summary of changes:
 ChangeLog |4 
 debian/changelog  |4 +++-
 scripts/dpkg-shlibdeps.pl |7 ++-
 3 files changed, 13 insertions(+), 2 deletions(-)
---
Details of changes:

commit 50f4a319f649589e016894a8375ad516db25042d
Author: Raphael Hertzog [EMAIL PROTECTED]
Date:   Thu Nov 22 09:29:35 2007 +0100

dpkg-shlibdeps: add more debug messages

diff --git a/ChangeLog b/ChangeLog
index 684e269..be1775e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2007-11-22  Raphael Hertzog  [EMAIL PROTECTED]
+
+   * scripts/dpkg-shlibdeps.pl: Add more debug messages.
+
 2007-11-21  Raphael Hertzog  [EMAIL PROTECTED]
 
* scripts/Dpkg/Shlibs/Objdump.pm: Fix the checks in is_executable() and
diff --git a/debian/changelog b/debian/changelog
index 70832f5..e784fa0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,9 +2,11 @@ dpkg (1.14.10) UNRELEASED; urgency=low
 
   [ Raphael Hertzog ]
   * dpkg-shlibdeps now correctly identify private libraries (avoid many
-warnings with perl/python modules).
+warnings with perl/python modules). Closes: #452338
   * Move capit() to a Dpkg::Fields module and use it in dpkg-shlibdeps.
 Closes: #452262
+  * Add more debug messages to dpkg-shlibdeps to ease collecting information
+in case of problems.
 
   [ Updated man pages translations ]
   * Swedish (Peter Karlsson)
diff --git a/scripts/dpkg-shlibdeps.pl b/scripts/dpkg-shlibdeps.pl
index 8902b94..800460d 100755
--- a/scripts/dpkg-shlibdeps.pl
+++ b/scripts/dpkg-shlibdeps.pl
@@ -100,7 +100,8 @@ foreach my $file (keys %exec) {
failure(_g(couldn't find library %s (note: only packages with  .
   'shlibs' files are looked into).), $soname)
unless defined($lib);
-   $libfiles{$lib} = $soname if defined($lib);
+   $libfiles{$lib} = $soname;
+   print Library $soname found in $lib\n if $debug;
 }
 my $file2pkg = find_packages(keys %libfiles);
 my $symfile = Dpkg::Shlibs::SymbolFile-new();
@@ -114,6 +115,7 @@ foreach my $file (keys %exec) {
# Empty package name will lead to consideration of symbols
# file from the package being built only
$file2pkg-{$lib} = [];
+   print No associated package found for $lib\n if $debug;
}
 
# Load symbols/shlibs files from packages providing libraries
@@ -327,6 +329,7 @@ Dependency fields recognised are:
 
 sub add_shlibs_dep {
 my ($soname, $pkg) = @_;
+print Looking up shlibs dependency of $soname provided by '$pkg'\n if 
$debug;
 foreach my $file ($shlibslocal, $shlibsoverride, @pkg_shlibs,
$admindir/info/$pkg.shlibs,
$shlibsdefault)
@@ -334,12 +337,14 @@ sub add_shlibs_dep {
next if not -e $file;
my $dep = extract_from_shlibs($soname, $file);
if (defined($dep)) {
+   print Found $dep in $file\n if $debug;
foreach (split(/,\s*/, $dep)) {
$dependencies{$cur_field}{$_} = 1;
}
return 1;
}
 }
+print Found nothing\n if $debug;
 return 0;
 }
 

-- 
dpkg's main repository


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]



[SCM] dpkg's main repository branch, master, updated. 1.14.9-18-g98ff090

2007-11-22 Thread Guillem Jover
The branch, master has been updated
   via  98ff0909d51cfe3536b34932207eb0820318bf3e (commit)
   via  4b0164aafcf24a468697589890b1bca9685820b3 (commit)
   via  ac7d8b96b7b86ab74b3448554970b1ba64d4b5dd (commit)
   via  b3fd1ae7a819ab8d1ab89cc3f289e0298ddd56be (commit)
   via  baf956813b135f7688f47bc4faef002234e51af8 (commit)
   via  1f38d79b65fd024883007e712e61a1112566b1a0 (commit)
   via  8fd4c5df34a5b5497584cde7787ef04b5b69aed7 (commit)
  from  1073aae7127d1912acbebbcc6dfd3379b1b06d74 (commit)


- Shortlog 
98ff090 Bump version to 1.14.11~
4b0164a Release 1.14.10
ac7d8b9 Dpkg::Arch: Make get_host_arch and get_build_arch read from the 
environment
b3fd1ae dpkg-architecture: use a hash instead of independent variables
baf9568 dpkg-gensymbols: Remove duplicated declaration of @librarypaths
1f38d79 Dpkg::Fields: Declare private variable with 'my' instead of 'our'
8fd4c5d dpkg-name: Add support for Package-Type

Summary of changes:
 ChangeLog|   49 +
 configure.ac |2 +-
 debian/changelog |   15 +++-
 man/ChangeLog|4 ++
 man/dpkg-name.1  |   11 +++---
 scripts/Dpkg/Arch.pm |   19 --
 scripts/Dpkg/Fields.pm   |2 +-
 scripts/dpkg-architecture.pl |   83 --
 scripts/dpkg-gensymbols.pl   |1 -
 scripts/dpkg-name.sh |   11 --
 10 files changed, 128 insertions(+), 69 deletions(-)
---
Details of changes:

commit 98ff0909d51cfe3536b34932207eb0820318bf3e
Author: Guillem Jover [EMAIL PROTECTED]
Date:   Fri Nov 23 06:51:21 2007 +0200

Bump version to 1.14.11~

diff --git a/ChangeLog b/ChangeLog
index 6a9bcc9..74dc96e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2007-11-23  Guillem Jover  [EMAIL PROTECTED]
 
+   * configure.ac: Bump version to 1.14.11~.
+
+2007-11-23  Guillem Jover  [EMAIL PROTECTED]
+
* configure.ac: Release 1.14.10.
 
 2007-11-23  Guillem Jover  [EMAIL PROTECTED]
diff --git a/configure.ac b/configure.ac
index a2da5a8..07afb54 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.10], [EMAIL PROTECTED])
+AC_INIT([dpkg], [1.14.11~], [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 6d7e8da..5eefeec 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+dpkg (1.14.11) UNRELEASED; urgency=low
+
+  *
+
+ -- Guillem Jover [EMAIL PROTECTED]  Fri, 23 Nov 2007 06:50:02 +0200
+
 dpkg (1.14.10) unstable; urgency=low
 
   [ Raphael Hertzog ]

commit 4b0164aafcf24a468697589890b1bca9685820b3
Author: Guillem Jover [EMAIL PROTECTED]
Date:   Fri Nov 23 06:32:55 2007 +0200

Release 1.14.10

diff --git a/ChangeLog b/ChangeLog
index 18c52e3..6a9bcc9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2007-11-23  Guillem Jover  [EMAIL PROTECTED]
 
+   * configure.ac: Release 1.14.10.
+
+2007-11-23  Guillem Jover  [EMAIL PROTECTED]
+
* scripts/Dpkg/Arch.pm (get_build_arch): Rename to ...
(get_raw_build_arch): ... this.
(get_build_arch): New function.
diff --git a/configure.ac b/configure.ac
index 2047356..a2da5a8 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.10~], [EMAIL PROTECTED])
+AC_INIT([dpkg], [1.14.10], [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 25584a0..6d7e8da 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-dpkg (1.14.10) UNRELEASED; urgency=low
+dpkg (1.14.10) unstable; urgency=low
 
   [ Raphael Hertzog ]
   * dpkg-shlibdeps now correctly identify private libraries (avoid many
@@ -26,7 +26,7 @@ dpkg (1.14.10) UNRELEASED; urgency=low
   [ Added scripts translations ]
   * Swedish (Peter Karlsson)
 
- -- Guillem Jover [EMAIL PROTECTED]  Tue, 20 Nov 2007 07:27:44 +0200
+ -- Guillem Jover [EMAIL PROTECTED]  Fri, 23 Nov 2007 06:32:27 +0200
 
 dpkg (1.14.9) unstable; urgency=low
 

commit ac7d8b96b7b86ab74b3448554970b1ba64d4b5dd
Author: Guillem Jover [EMAIL PROTECTED]
Date:   Fri Nov 23 04:42:25 2007 +0200

Dpkg::Arch: Make get_host_arch and get_build_arch read from the environment

All scripts calling get_host_arch are expected to support getting the
value overriden by the environment when cross building. Except for
dpkg-architecture, which needs more fine grained control, and calls
directly the get_raw_ functions.

diff --git a/ChangeLog b/ChangeLog
index 7c950e1..18c52e3 100644
---