Merge branch 'master' of git://git.debian.org/git/dpkg/dpkg into sourcev3

ChangeLog

@@ -1,3 +1,13 @@
+2007-10-15  Raphael Hertzog  <hertzog@debian.org>
+
+	* scripts/Dpkg/Version.pm: fix compare_versions to handle properly
+	  the >= cases (it was improperly handled like >> due to a bad regexp).
+	* debian/rules: include cputable ostable triplettable in
+	build-tree so that they are available during make check (Dpkg.pm
+	exports ".." as $pkgdatadir during tests).
+	* scripts/dpkg-shlibdeps.pl: bugfix, avoid unwanted modification
+	of @pkg_shlibs by my_find_library.
+
 2007-10-14  Raphael Hertzog  <hertzog@debian.org>
 
 	* scripts/Dpkg/Version.pm: mark compare_versions as exportable.

debian/rules

@@ -53,6 +53,7 @@ build-tree/config.status: configure
 		--localstatedir=/var/lib \
 		--with-zlib=static \
 		--with-bz2=static
+	cp cputable ostable triplettable build-tree/
 
 # Build the package in build-tree
 build: build-tree/config.status

scripts/Dpkg/Version.pm

@@ -177,7 +177,7 @@ sub compare_versions ($$$)
     my $rel = $_[1];
     my $res = vercmp($_[0], $_[2]);
 
-    if ($rel eq 'gt' or $rel =~ />?>/) {
+    if ($rel eq 'gt' or $rel eq ">" or $rel eq ">>") {
 	return $res > 0;
     } elsif ($rel eq 'ge' or $rel eq '>=') {
 	return $res >= 0;
@@ -185,7 +185,7 @@ sub compare_versions ($$$)
 	return $res == 0;
     } elsif ($rel eq 'le' or $rel eq '<=') {
 	return $res <= 0;
-    } elsif ($rel eq 'lt' or $rel =~ /<?</) {
+    } elsif ($rel eq 'lt' or $rel eq "<" or $rel eq "<<") {
 	return $res < 0;
     } else {
 	die "bad relation '$rel'";

scripts/dpkg-shlibdeps.pl

@@ -434,7 +434,8 @@ sub my_find_library {
     # that provides shlibs file...)
     # TODO: we should probably replace that by a cleaner way to look into
     # the various temporary build directories...
-    foreach my $builddir (map { s{/DEBIAN/shlibs$}{}; $_ } @pkg_shlibs) {
+    my @copy = (@pkg_shlibs);
+    foreach my $builddir (map { s{/DEBIAN/shlibs$}{}; $_ } @copy) {
 	$file = find_library($lib, \@RPATH, $format, $builddir);
 	return $file if defined($file);
     }