[DRE-commits] [ruby-devise] 13/13: copy rules from ruby-responders

[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 f5d94262134917de123232e589981bcf05707713
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Sun Jan 3 18:21:47 2016 +0530

    copy rules from ruby-responders
---
 debian/install |  1 -
 debian/rules   | 22 ++++++----------------
 2 files changed, 6 insertions(+), 17 deletions(-)

diff --git a/debian/install b/debian/install
index cc77fdb..75a39e0 100644
--- a/debian/install
+++ b/debian/install
@@ -1,3 +1,2 @@
 app usr/share/ruby-devise
 config/locales usr/share/ruby-devise
-debian/lib /usr/share/rubygems-integration/all/gems/devise-VERSION
diff --git a/debian/rules b/debian/rules
index 8203acd..3e01bd5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -18,21 +18,11 @@ export GEM2DEB_TEST_RUNNER = --check-dependencies
 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
-	if test -d lib; then mv lib debian; fi
-	sed -i s/VERSION/$$(ruby -r ./debian/lib/devise/version -e \
-	"puts Devise::VERSION")/ debian/install
-
-clean:
-	if test -f lib/devise.rb; then echo "not touching lib"; \
-	else rm -rf lib; fi
-	if test -d debian/lib; then mv debian/lib .;\
-	patch --reverse lib/generators/devise/install_generator.rb \
-	< debian/patches/locales.patch; \
-	patch --reverse lib/devise/rails.rb < debian/patches/engine-root.rb; \
-	fi
-	sed -i s/$$(ruby -r ./lib/devise/version -e \
-	"puts Devise::VERSION")/VERSION/ debian/install
-	dh clean --buildsystem=ruby --with ruby
-
+	mkdir -p $(generators_libdir)
+	mv debian/ruby-devise/usr/lib/ruby/vendor_ruby/* $(generators_libdir)
+	rm -rf debian/ruby-devise/usr/lib

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