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

[Mirco Bauer]

The following commit has been merged in the master branch:
commit 80047f40858d05dc40e22f4f925748c294201bf8
Merge: 005c5e0142ac2e85e3c4ed9958f7c13e5d589b82 5130405a275c6c103846f65d4c5f0b96aa5ceae9
Author: Mirco Bauer <meebey at meebey.net>
Date:   Mon Aug 3 20:23:10 2009 +0200

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

diff --combined debian/rules
index 71d5225,65fe64a..11264d3
--- a/debian/rules
+++ b/debian/rules
@@@ -19,12 -19,11 +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/
- 	rm -f Merlin/Main/Languages/Ruby/Ruby.sln.proj \
- 	      Merlin/Main/Runtime/Microsoft.Scripting/Microsoft.Scripting.csproj.bak
+ 	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:
@@@ -51,7 -50,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' | xargs rm
+ 	find  $(TARBALL_DIR) -iname '*.exe' -o -iname '*.dll' -o -iname '*.pdb' -exec rm \{\} \;
  	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