[DRE-commits] [ruby-rack-oauth2] 03/03: Use DH_RUBY = --gem-install

[Sruthi Chandran]

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

srud-guest pushed a commit to branch master
in repository ruby-rack-oauth2.

commit 034ff449d16178e535fbfd358833f9f3482b2888
Author: Sruthi <srud at openmailbox.org>
Date:   Tue Aug 23 16:38:19 2016 +0530

    Use DH_RUBY = --gem-install
---
 debian/changelog                 |  2 ++
 debian/patches/fix-gemspec.patch | 25 -------------------------
 debian/patches/fix-version.patch | 13 -------------
 debian/patches/series            |  2 --
 debian/rules                     |  9 +--------
 5 files changed, 3 insertions(+), 48 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8e650fd..a0cd9b2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ ruby-rack-oauth2 (1.4.0-1) unstable; urgency=medium
 
   * Team upload.
   * New upstream releases
+  * Use DH_RUBY = --gem-install (removed patches fix-gemspec.patch,
+    fix-version.patch)
 
  -- Sruthi Chandran <srud at openmailbox.org>  Mon, 22 Aug 2016 21:49:22 +0530
 
diff --git a/debian/patches/fix-gemspec.patch b/debian/patches/fix-gemspec.patch
deleted file mode 100644
index 5ead7e3..0000000
--- a/debian/patches/fix-gemspec.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Index: ruby-rack-oauth2/rack-oauth2.gemspec
-===================================================================
---- ruby-rack-oauth2.orig/rack-oauth2.gemspec
-+++ ruby-rack-oauth2/rack-oauth2.gemspec
-@@ -1,6 +1,6 @@
- Gem::Specification.new do |s|
-   s.name = "rack-oauth2"
--  s.version = File.read("VERSION")
-+  s.version = File.read("lib/rack/oauth2/VERSION")
-   s.required_rubygems_version = Gem::Requirement.new(">= 1.3.6") if s.respond_to? :required_rubygems_version=
-   s.authors = ["nov matake"]
-   s.description = %q{OAuth 2.0 Server & Client Library. Both Bearer and MAC token type are supported.}
-@@ -11,9 +11,9 @@ Gem::Specification.new do |s|
-   s.homepage = "http://github.com/nov/rack-oauth2"
-   s.license = 'MIT'
-   s.require_paths = ["lib"]
--  s.executables = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
--  s.files = `git ls-files`.split("\n")
--  s.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
-+  s.executables = ''
-+  s.files = ''
-+  s.test_files = ''
-   s.add_runtime_dependency "rack", ">= 1.1"
-   s.add_runtime_dependency "multi_json", ">= 1.3.6"
-   s.add_runtime_dependency "httpclient", ">= 2.4"
diff --git a/debian/patches/fix-version.patch b/debian/patches/fix-version.patch
deleted file mode 100644
index 10e6519..0000000
--- a/debian/patches/fix-version.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: ruby-rack-oauth2/lib/rack/oauth2.rb
-===================================================================
---- ruby-rack-oauth2.orig/lib/rack/oauth2.rb
-+++ ruby-rack-oauth2/lib/rack/oauth2.rb
-@@ -10,7 +10,7 @@ require 'attr_optional'
- module Rack
-   module OAuth2
-     VERSION = ::File.read(
--      ::File.join(::File.dirname(__FILE__), '../../VERSION')
-+      ::File.join(::File.dirname(__FILE__), 'oauth2/VERSION')
-     ).strip
- 
-     def self.logger
diff --git a/debian/patches/series b/debian/patches/series
index e38e534..f958273 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1 @@
 simplecov
-fix-version.patch
-fix-gemspec.patch
diff --git a/debian/rules b/debian/rules
index 56e8e22..df50426 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,15 +1,8 @@
 #!/usr/bin/make -f
 
 export GEM2DEB_TEST_RUNNER = --check-dependencies
+export DH_RUBY = --gem-install
 
 %:
 	dh $@ --buildsystem=ruby --with ruby
 
-override_dh_auto_build:
-	if [ -f VERSION ]; then \
-	mv VERSION lib/rack/oauth2; fi
-
-override_dh_auto_clean:
-	if [ -f lib/rack/oauth2/VERSION ]; then \
-	mv lib/rack/oauth2/VERSION VERSION; fi 
-

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