[Pkg-cli-libs-commits] [SCM] ironruby branch, master, updated. debian/0.9.0+dfsg-1-30-g3147b58

[C.J. Adams-Collier (none)]

The following commit has been merged in the master branch:
commit 2456005f143972f990ee14ca7b1dc5aaaf3ec0b7
Author: C.J. Adams-Collier <cjac at dev0.(none)>
Date:   Mon Aug 3 12:49:52 2009 -0700

    fixed order of precedence

diff --git a/debian/rules b/debian/rules
index edc80b6..ee4ef44 100755
--- a/debian/rules
+++ b/debian/rules
@@ -23,7 +23,8 @@ override_dh_clean: unpatch
 	rm -rf Merlin/Main/Bin/
 	cd Merlin/Main/Languages/Ruby/ && \
 	  xbuild /t:Clean Ruby.sln
-	find Merlin/ ndp/ -iname '*.exe' -delete -o -iname '*.dll' -delete
+	find Merlin/ ndp/ \
+		\( -iname '*.exe' -o -iname '*.dll' \) -delete
 	dh_clean
 
 get-orig-source: TARBALL_DIR = $(DEB_SOURCE_NAME)-$(UPVERSION)
@@ -51,7 +52,9 @@ get-orig-source:
 	# Remove gems
 	rm -rf $(TARBALL_DIR)/Merlin/External.LCA_RESTRICTED/Languages/Ruby/ruby-1.8.6p287/lib/ruby/gems/1.8/gems/*
 	# remove binaries
-	find  $(TARBALL_DIR) -iname '*.exe' -delete -o -iname '*.dll' -delete -o -iname '*.pdb' -delete
+	find  $(TARBALL_DIR) \
+		\( -iname '*.exe' -o -iname '*.dll' -o -iname '*.pdb' \) \
+		-delete
 	mv $(TARBALL_DIR) $(TARBALL_DIR)+dfsg
 	tar -czf $(DEB_SOURCE_NAME)_$(UPVERSION)+dfsg.orig.tar.gz $(TARBALL_DIR)+dfsg
 	rm -r $(TARBALL_DIR)+dfsg

-- 
ironruby