This patch contains all the Debian-specific changes mixed together. To review
them separately, please inspect the VCS history at
http://anonscm.debian.org/gitweb/?p=pkg-ruby-extras/ruby-pkg-config.git;a=summary
--- ruby-pkg-config-1.1.2~git20110615.orig/lib/pkg-config.rb
+++ ruby-pkg-config-1.1.2~git20110615/lib/pkg-config.rb
@@ -270,12 +270,14 @@ class PackageConfig
   end
 
   def guess_default_path
+    arch_pkgconfig_dir = Dir.glob('/usr/lib/*/pkgconfig').join(SEPARATOR)
     default_path = ["/usr/local/lib64/pkgconfig",
                     "/usr/local/lib/pkgconfig",
                     "/usr/local/libdata/pkgconfig",
                     "/opt/local/lib/pkgconfig",
                     "/usr/lib/pkgconfig",
                     "/usr/lib64/pkgconfig",
+                    arch_pkgconfig_dir,
                     "/usr/lib/x86_64-linux-gnu/pkgconfig",
                     "/usr/lib/i386-linux-gnu/pkgconfig",
                     "/usr/X11/lib/pkgconfig/",
--- ruby-pkg-config-1.1.2~git20110615.orig/test/test_pkg_config.rb
+++ ruby-pkg-config-1.1.2~git20110615/test/test_pkg_config.rb
@@ -107,9 +107,10 @@ class PkgConfigTest < Test::Unit::TestCa
   end
 
   def assert_pkg_config(package, pkg_config_args, actual)
-    result = pkg_config(package, *pkg_config_args)
+    result = pkg_config(package, *pkg_config_args).split.sort
+    sorted_actual = actual.split.sort
     result = nil if result.empty?
-    assert_equal(result, actual)
+    assert_equal(result, sorted_actual)
   end
 
   def assert_override_variables(expected, override_variables)
