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

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

The following commit has been merged in the master branch:
commit 7cb150a5a0701b78f0711aa32ebeaf2113e02c3e
Merge: d84ea5b250726331aef595cc2ce8a4559a2a4d80 a5d566590af625333237c69de97425b74512fd18
Author: C.J. Adams-Collier <cjac at dev0.(none)>
Date:   Mon Aug 3 11:48:53 2009 -0700

    Merge branch 'master' of git+ssh://git.debian.org/git/pkg-cli-libs/packages/ironruby

diff --combined debian/rules
index 2bde967,11264d3..a86166c
--- a/debian/rules
+++ b/debian/rules
@@@ -19,11 -19,12 +19,12 @@@ override_dh_auto_build: $(QUILT_STAMPFN
  	cd Merlin/Main/Languages/Ruby/ && \
  	  xbuild /p:TreatWarningsAsErrors=false Ruby.sln
  
- clean: unpatch
+ override_dh_clean: unpatch
  	rm -rf Merlin/Main/Bin/
  	cd Merlin/Main/Languages/Ruby/ && \
- 	  xbuild /t:Clean /p:TreatWarningsAsErrors=false Ruby.sln
- 	dh $@
+ 	  xbuild /t:Clean Ruby.sln
+ 	find Merlin/ ndp/ -iname '*.exe' -o -iname '*.dll' -delete
+ 	dh_clean
  
  get-orig-source: TARBALL_DIR = $(DEB_SOURCE_NAME)-$(UPVERSION)
  get-orig-source:
@@@ -50,7 -51,7 +51,7 @@@
  	# 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' -o -iname '*.dll' -o -iname '*.pdb' -exec rm \{\} \;
 +	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