Fix style of code in dpkg-gensymbols/dpkg-shlibdeps. Also fix changelogs.

diff --git a/ChangeLog b/ChangeLog
index 18a74b39b316bbe321521482a919a211ad4a5c66..4c02b388a50cc521c7f0a28024d7a7b9065b6b02 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,11 +1,16 @@
+2007-11-25  Raphael Hertzog  <hertzog@debian.org>
+
+       * scripts/Dpkg/Shlibs.pm (find_library): Canonicalize paths before
+       returning them as bad RPATH can lead to non-canonical paths
+       causing us troubles in dpkg-shlibdeps.
+       * scripts/dpkg-gensymbols.pl: Some formatting fixes.
+       * scripts/dpkg-shlibdeps.pl: Likewise.
+
 2007-11-24  Raphael Hertzog  <hertzog@debian.org>
 
        * scripts/dpkg-gensymbols.pl: Add a new -I<file> option to force
        the usage of a specific file as basis for the generated symbols
        file.
-       * scripts/Dpkg/Shlibs.pm (find_library): Canonicalize paths before
-       returning them as bad RPATH can lead to non-canonical paths
-       causing us troubles in dpkg-shlibdeps.
 
 2007-11-24  Guillem Jover  <guillem@debian.org>
 

diff --git a/debian/changelog b/debian/changelog
index edaabd241693ca76c1d62f8bf27200d2a8be9048..87c3292eb710d13e1ea6acf23c80e025a3d18680 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 dpkg (1.14.12) UNRELEASED; urgency=low
 
-  [ Raphael Hertzog ]
+  [ Raphael Hertzog ]
+  * Add -I<file> option to dpkg-gensymbols to force the usage of a specific
+    symbols file.
   * Dpkg::Shlibs::find_library() now returns canonicalized paths.
 
  -- Guillem Jover <guillem@debian.org>  Sat, 24 Nov 2007 07:38:13 +0200

diff --git a/scripts/dpkg-gensymbols.pl b/scripts/dpkg-gensymbols.pl
index 687e831c235f17862265306e9a43a5de6d8d814e..787eabe3b45f58c85f78f1f0e911786ded2ab482 100755 (executable)
--- a/scripts/dpkg-gensymbols.pl
+++ b/scripts/dpkg-gensymbols.pl
@@ -73,9 +73,9 @@ Options:
 
 my @files;
 while (@ARGV) {
-    $_=shift(@ARGV);
+    $_ = shift(@ARGV);
     if (m/^-p([-+0-9a-z.]+)$/) {
-       $oppackage= $1;
+       $oppackage = $1;
     } elsif (m/^-c(\d)?$/) {
        $compare = defined($1) ? $1 : 1;
     } elsif (m/^-d$/) {
@@ -95,11 +95,11 @@ while (@ARGV) {
        $packagebuilddir = $1;
        $packagebuilddir =~ s{/+$}{};
     } elsif (m/^-O$/) {
-       $stdout= 1;
+       $stdout = 1;
     } elsif (m/^-I(.+)$/) {
        $input = $1;
     } elsif (m/^-O(.+)$/) {
-       $output= $1;
+       $output = $1;
     } elsif (m/^-(h|-help)$/) {
        &usage; exit(0);
     } elsif (m/^--version$/) {
@@ -116,7 +116,7 @@ if (not defined($sourceversion)) {
 if (not defined($oppackage)) {
     parsecontrolfile($controlfile);
     my @packages = grep(m/^C /, keys %p2i);
-    @packages==1 ||
+    @packages == 1 ||
        error(_g("must specify package since control info has many (%s)"),
              "@packages");
     $oppackage = $packages[0];

diff --git a/scripts/dpkg-shlibdeps.pl b/scripts/dpkg-shlibdeps.pl
index 039284f4f21790afc750a96d70267f8a55164a94..1fe4b7a9f158b0a723aee042ba34e7b8f2e60a15 100755 (executable)
--- a/scripts/dpkg-shlibdeps.pl
+++ b/scripts/dpkg-shlibdeps.pl
@@ -19,20 +19,20 @@ use Dpkg::Arch qw(get_host_arch);
 use Dpkg::Fields qw(capit);
 
 # By increasing importance
-my @depfields= qw(Suggests Recommends Depends Pre-Depends);
-my $i=0; my %depstrength = map { $_ => $i++ } @depfields;
+my @depfields = qw(Suggests Recommends Depends Pre-Depends);
+my $i = 0; my %depstrength = map { $_ => $i++ } @depfields;
 
 textdomain("dpkg-dev");
 
-my $shlibsoverride= '/etc/dpkg/shlibs.override';
-my $shlibsdefault= '/etc/dpkg/shlibs.default';
-my $shlibslocal= 'debian/shlibs.local';
-my $packagetype= 'deb';
-my $dependencyfield= 'Depends';
-my $varlistfile= 'debian/substvars';
-my $varnameprefix= 'shlibs';
-my $ignore_missing_info= 0;
-my $debug= 0;
+my $shlibsoverride = '/etc/dpkg/shlibs.override';
+my $shlibsdefault = '/etc/dpkg/shlibs.default';
+my $shlibslocal = 'debian/shlibs.local';
+my $packagetype = 'deb';
+my $dependencyfield = 'Depends';
+my $varlistfile = 'debian/substvars';
+my $varnameprefix = 'shlibs';
+my $ignore_missing_info = 0;
+my $debug = 0;
 my @exclude = ();
 my $host_arch = get_host_arch();
 
@@ -45,13 +45,13 @@ if (-d "debian") {
 my ($stdout, %exec);
 foreach (@ARGV) {
     if (m/^-T(.*)$/) {
-       $varlistfile= $1;
+       $varlistfile = $1;
     } elsif (m/^-p(\w[-:0-9A-Za-z]*)$/) {
-       $varnameprefix= $1;
+       $varnameprefix = $1;
     } elsif (m/^-L(.*)$/) {
-       $shlibslocal= $1;
+       $shlibslocal = $1;
     } elsif (m/^-O$/) {
-       $stdout= 1;
+       $stdout = 1;
     } elsif (m/^-(h|-help)$/) {
        usage(); exit(0);
     } elsif (m/^--version$/) {
@@ -61,7 +61,7 @@ foreach (@ARGV) {
        -d $admindir ||
            error(_g("administrative directory '%s' does not exist"), $admindir);
     } elsif (m/^-d(.*)$/) {
-       $dependencyfield= capit($1);
+       $dependencyfield = capit($1);
        defined($depstrength{$dependencyfield}) ||
            warning(_g("unrecognised dependency field \`%s'"), $dependencyfield);
     } elsif (m/^-e(.*)$/) {