[DRE-commits] [ruby-saml] 03/05: install as gem

[Praveen Arimbrathodiyil]

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

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

commit 91ab6d89da8a3797e4ed9e03d257a61d95cafddf
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Sun Oct 30 13:22:10 2016 +0530

    install as gem
---
 debian/changelog                    |  2 +-
 debian/patches/series               |  1 -
 debian/patches/use-system-lib.patch | 21 ---------------------
 debian/rules                        | 15 ++-------------
 4 files changed, 3 insertions(+), 36 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index eed6759..d7c0e0f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,7 +2,7 @@ ruby-saml (1.4.1-1) unstable; urgency=medium
 
   * New upstream release
   * Refresh patches (remove disable-failing-test.patch, merged upstream)
-  * Fix autopkgtest (Closes: #830929)
+  * Install as gem, fix autopkgtest (Closes: #830929)
 
  -- Pirate Praveen <praveen at debian.org>  Sun, 30 Oct 2016 13:01:32 +0530
 
diff --git a/debian/patches/series b/debian/patches/series
index 838c966..2c2f2bc 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
 remove-simplecov.patch
 remove-bundler.patch
 use-unshift-in-gemspec.patch
-use-system-lib.patch
diff --git a/debian/patches/use-system-lib.patch b/debian/patches/use-system-lib.patch
deleted file mode 100644
index a00343e..0000000
--- a/debian/patches/use-system-lib.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Index: ruby-saml/test/test_helper.rb
-===================================================================
---- ruby-saml.orig/test/test_helper.rb
-+++ ruby-saml/test/test_helper.rb
-@@ -1,5 +1,7 @@
- #require 'simplecov'
- 
-+require 'pathname'
-+
- #SimpleCov.start do
- #  add_filter "test/"
- #  add_filter "vendor/"
-@@ -240,7 +242,7 @@ class Minitest::Test
-     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/lib/ruby/vendor_ruby/saml/schemas')
- 
-   #
-   # validate an xml document against the given schema
diff --git a/debian/rules b/debian/rules
index 98ebf73..d1166aa 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,17 +1,6 @@
 #!/usr/bin/make -f
-#export DH_VERBOSE=1
-#
-# Uncomment to ignore all test failures (but the tests will run anyway)
-#export DH_RUBY_IGNORE_TESTS=all
-#
-# Uncomment to ignore some test failures (but the tests will run anyway).
-# Valid values:
-#export DH_RUBY_IGNORE_TESTS=ruby2.1
-#
-# If you need to specify the .gemspec (eg there is more than one)
-#export DH_RUBY_GEMSPEC=gem.gemspec
-#
-# Uncomment to check dependencies during build:
+
+export DH_RUBY = --gem-install
 export GEM2DEB_TEST_RUNNER = --check-dependencies
 
 %:

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