[DRE-commits] [ruby-devise] 01/02: use gem-install

[Praveen Arimbrathodiyil]

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

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

commit a45f6aad51262cfbf8c1d9a577c2c8391e182f51
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Fri Aug 26 21:51:18 2016 +0530

    use gem-install
---
 debian/changelog              |  6 ++++++
 debian/patches/engine-root.rb | 16 ----------------
 debian/patches/series         |  1 -
 debian/rules                  | 23 ++---------------------
 4 files changed, 8 insertions(+), 38 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1044e30..2310be1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ruby-devise (4.1.1-3) UNRELEASED; urgency=medium
+
+  * Use DH_RUBY = --gem-install 
+
+ -- Pirate Praveen <praveen at debian.org>  Fri, 26 Aug 2016 21:50:23 +0530
+
 ruby-devise (4.1.1-2) unstable; urgency=medium
 
   * Reupload to unstable 
diff --git a/debian/patches/engine-root.rb b/debian/patches/engine-root.rb
deleted file mode 100644
index bca3f13..0000000
--- a/debian/patches/engine-root.rb
+++ /dev/null
@@ -1,16 +0,0 @@
-Description: Fix engine root to use debian directory
- Change engine root to use /usr/share/ruby-devise
-Author: Praveen A <praveen at debian.org>
-Last-Update: 2015-07-11
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/lib/devise/rails.rb
-+++ b/lib/devise/rails.rb
-@@ -3,6 +3,7 @@
- 
- module Devise
-   class Engine < ::Rails::Engine
-+    config.root = '/usr/share/ruby-devise'
-     config.devise = Devise
- 
-     # Initialize Warden and copy its configurations.
diff --git a/debian/patches/series b/debian/patches/series
index 117d4c7..4dd7277 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
-engine-root.rb
 locales.patch
 remove-git-in-gemspec.patch
diff --git a/debian/rules b/debian/rules
index bba65ca..2a92136 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,29 +1,10 @@
 #!/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=ruby1.8 ruby1.9.1 require-rubygems
-#
-# If you need to specify the .gemspec (eg there is more than one)
-#export DH_RUBY_GEMSPEC=gem.gemspec
+
 export GEM2DEB_TEST_RUNNER = --check-dependencies
+export DH_RUBY = --gem-install
 
 %:
 	dh $@ --buildsystem=ruby --with ruby
 
 override_dh_installchangelogs:
 	dh_installchangelogs CHANGELOG.md
-
-upstream_version = $(shell dpkg-parsechangelog -SVersion | cut -d - -f 1)
-generators_libdir = debian/ruby-devise/usr/share/rubygems-integration/all/gems/devise-$(upstream_version)/lib
-
-override_dh_auto_install:
-	dh_auto_install
-	mkdir -p $(generators_libdir)
-	mv debian/ruby-devise/usr/lib/ruby/vendor_ruby/* $(generators_libdir)
-	rm -rf debian/ruby-devise/usr/lib
-	rm -rf debian/ruby-devise/usr/bin

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