[DRE-commits] [ruby-saml] 05/05: remove hard coded version in patch

Praveen Arimbrathodiyil praveen at moszumanska.debian.org
Sun Oct 30 09:12:40 UTC 2016


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

praveen pushed a commit to branch master
in repository ruby-saml.

commit 4b696d541aebbda77de333f7341963883bbb0aec
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Sun Oct 30 14:17:48 2016 +0530

    remove hard coded version in patch
---
 debian/patches/use-system-lib.patch | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/debian/patches/use-system-lib.patch b/debian/patches/use-system-lib.patch
index 4353069..4cdb5c7 100644
--- a/debian/patches/use-system-lib.patch
+++ b/debian/patches/use-system-lib.patch
@@ -10,12 +10,15 @@ Index: ruby-saml/test/test_helper.rb
  #SimpleCov.start do
  #  add_filter "test/"
  #  add_filter "vendor/"
-@@ -240,7 +242,7 @@ class Minitest::Test
+@@ -239,8 +241,9 @@ class Minitest::Test
+     zstream.close
      inflated
    end
- 
+-
 -  SCHEMA_DIR = File.expand_path(File.join(__FILE__, '../../lib/schemas'))
-+  SCHEMA_DIR = Pathname.new(File.expand_path(File.join(__FILE__, '../../lib/schemas'))).directory? ? File.expand_path(File.join(__FILE__, '../../lib/schemas')) : File.new('/usr/share/rubygems-integration/all/gems/ruby-saml-1.4.1/lib/schemas')
++  RELATIVE_SCHEMA_DIR = File.expand_path(File.join(__FILE__, '../../lib/schemas'))
++  SYSTEM_SCHEMA_DIR = File.expand_path(File.join(File.dirname(`gem which ruby-saml`),'schemas'))
++  SCHEMA_DIR = Pathname.new(RELATIVE_SCHEMA_DIR).directory? ? RELATIVE_SCHEMA_DIR : SYSTEM_SCHEMA_DIR
  
    #
    # validate an xml document against the given schema

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



More information about the Pkg-ruby-extras-commits mailing list