Merge branch 'sid' (through tag '1.15.8.2')

Conflicts:
	debian/changelog

debian/changelog

@@ -11,6 +11,18 @@ dpkg (1.15.9) UNRELEASED; urgency=low
 
  -- Guillem Jover <guillem@debian.org>  Thu, 29 Jul 2010 11:00:22 +0200
 
+dpkg (1.15.8.2) unstable; urgency=low
+
+  * Bump libdpkg-perl Depends on dpkg to 1.15.8, as it will break dpkg
+    versions before that when installing and removing libdpkg-perl,
+    because older update-alternatives and dpkg-divert require Dpkg.pm and
+    Dpkg/Gettext.pm which will disappear due to the Replaces. Closes: #590867
+    Thanks to Sven Joachim <svenjoac@gmx.de> for the analysis.
+  * Allow specifying again absolute and relative paths for dpkg-buildpackage
+    -r option. Closes: #591010
+
+ -- Guillem Jover <guillem@debian.org>  Sat, 31 Jul 2010 04:20:01 +0200
+
 dpkg (1.15.8.1) unstable; urgency=low
 
   * Fix off-by-one error in update-alternatives that lead to an infinite loop

debian/control

@@ -68,7 +68,7 @@ Package: libdpkg-perl
 Section: perl
 Priority: optional
 Architecture: all
-Depends: dpkg (>= 1.15.4), perl, libtimedate-perl, ${misc:Depends}
+Depends: dpkg (>= 1.15.8), perl, libtimedate-perl, ${misc:Depends}
 Recommends: bzip2, xz-utils
 Suggests: debian-keyring, gnupg, gpgv, binutils, patch
 Breaks: dpkg-dev (<< 1.15.6)

scripts/Dpkg/Path.pm

@@ -193,14 +193,20 @@ sub resolve_symlink($) {
 
 =item my $cmdpath = find_command($command)
 
-Return the path of the command if available on the $PATH, undef otherwise.
+Return the path of the command if available on an absolute or relative
+path or on the $PATH, undef otherwise.
 
 =cut
 
 sub find_command($) {
     my $cmd = shift;
-    foreach my $dir (split(/:/, $ENV{'PATH'})) {
-	return "$dir/$cmd" if -x "$dir/$cmd";
+
+    if ($cmd =~ m{/}) {
+	return "$cmd" if -x "$cmd";
+    } else {
+	foreach my $dir (split(/:/, $ENV{'PATH'})) {
+	    return "$dir/$cmd" if -x "$dir/$cmd";
+	}
     }
     return undef;
 }