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

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

The following commit has been merged in the master branch:
commit 35b88e2080845eede6493912ef417c5b68550647
Merge: 3c1c00dc6b070e33aef438ef89b52f04251d2003 d5e81b113eb31ccc338a6b9ab55e5391c26b63a2
Author: C.J. Adams-Collier <cjac at dev0.(none)>
Date:   Mon Aug 3 11:25:06 2009 -0700

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

diff --combined debian/rules
index 85040e9,5ba8b15..6384f2a
--- a/debian/rules
+++ b/debian/rules
@@@ -15,26 -15,9 +15,9 @@@ DEB_SOURCE_NAME = $(shell dpkg-parsecha
  include /usr/share/cli-common/cli.make
  include /usr/share/quilt/quilt.make
  
- build: $(QUILT_STAMPFN)
- 	dh $@ --before build
+ override_dh_auto_build: $(QUILT_STAMPFN)
  	cd Merlin/Main/Languages/Ruby/ && \
- 	xbuild /p:TreatWarningsAsErrors=false Ruby.sln
- 
- binary: binary-indep
- binary-indep: install
- 	
- 
- install: build
- 	dh $@ --before dh_install
- 	# <$(MAKE) install>
- 	mkdir -p $(CURDIR)/debian/tmp/usr/lib/ironruby \
- 		$(CURDIR)/debian/tmp/usr/bin
- 
- 	dh_installman -i
- 
- 	# </$(MAKE) install>
- 	
- 	dh $@ --remaining
+ 	  xbuild /p:TreatWarningsAsErrors=false Ruby.sln
  
  clean: unpatch
  	rm -rf Merlin/Main/Bin/
@@@ -67,7 -50,7 +50,7 @@@ 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' -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