[DRE-commits] [ruby-pkg-config] 05/11: Imported Upstream version 1.1.5

[Daisuke Higuchi]

This is an automated email from the git hooks/post-receive script.

dai pushed a commit to branch master
in repository ruby-pkg-config.

commit 2218ea1a82e91afacc3f3aed0f2286e701829c96
Author: HIGUCHI Daisuke (VDR dai) <dai at debian.org>
Date:   Thu Mar 13 22:18:52 2014 +0900

    Imported Upstream version 1.1.5
---
 lib/pkg-config.rb         | 3 ++-
 lib/pkg-config/version.rb | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/pkg-config.rb b/lib/pkg-config.rb
index 804dcdd..cb73541 100644
--- a/lib/pkg-config.rb
+++ b/lib/pkg-config.rb
@@ -285,6 +285,7 @@ class PackageConfig
                     "/usr/lib64/pkgconfig",
                     "/usr/lib/pkgconfig",
                     "/usr/X11/lib/pkgconfig/",
+                    "/opt/X11/lib/pkgconfig/",
                     "/usr/share/pkgconfig"].join(SEPARATOR)
     libdir = ENV["PKG_CONFIG_LIBDIR"]
     default_path = [libdir, default_path].join(SEPARATOR) if libdir
@@ -407,7 +408,7 @@ module PKGConfig
                   Shellwords.shellwords(libraries))
       dldflags = dldflags.map {|s| /\s/ =~ s ? "\"#{s}\"" : s }.join(' ')
       $libs   += ' ' + libraries
-      if /mswin32/ =~ RUBY_PLATFORM
+      if /mswin/ =~ RUBY_PLATFORM
         $DLDFLAGS += ' ' + dldflags
       else
         $LDFLAGS += ' ' + dldflags
diff --git a/lib/pkg-config/version.rb b/lib/pkg-config/version.rb
index c0d8a0f..5ac890c 100644
--- a/lib/pkg-config/version.rb
+++ b/lib/pkg-config/version.rb
@@ -15,5 +15,5 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 module PKGConfig
-  VERSION = "1.1.4"
+  VERSION = "1.1.5"
 end

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-pkg-config.git