[DRE-commits] [ruby-devise] 06/13: remove committed patches

[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 5b2a11f85620429b2285254394ad0290e00e1862
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Sun Jan 3 16:53:36 2016 +0530

    remove committed patches
---
 debian/rules | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/debian/rules b/debian/rules
index 3c87f2c..b0ed3c8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -24,11 +24,15 @@ override_dh_auto_build:
 	"puts Devise::VERSION")/ debian/install
 
 clean:
-	rm -rf lib/devise/rails.rb lib/generators/devise/install_generator.rb
-	if test -d lib/devise; then rmdir --ignore-fail-on-non-empty -p \
+	# Sometimes lib/devise/rails.rb and
+	# lib/generators/devise/install_generator.rb gets created
+	if test -d lib/devise && ! test -f lib/devise.rb; then rm -rf \
+	lib/devise/rails.rb; rmdir --ignore-fail-on-non-empty -p \
 	lib/devise; fi
-	if test -d lib/generators/devise; then rmdir --ignore-fail-on-non-empty -p \
-	lib/generators/devise; fi
+	if test -d lib/generators/devise && ! test -f lib/devise.rb; then \
+	rm -rf lib/generators/devise/install_generator.rb;\
+	rmdir --ignore-fail-on-non-empty -p lib/generators/devise; fi
+
 	if test -d debian/lib; then mv debian/lib .; fi
 	dh clean --buildsystem=ruby --with ruby
 	sed -i s/$$(ruby -r ./lib/devise/version -e \

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