[DRE-commits] r2919 - packages/libgems-ruby/trunk/debian

[daigo at alioth.debian.org]

Author: daigo
Date: 2008-08-03 14:40:46 +0000 (Sun, 03 Aug 2008)
New Revision: 2919

Modified:
   packages/libgems-ruby/trunk/debian/changelog
   packages/libgems-ruby/trunk/debian/rules
Log:
debian/rules: Fixed a file conflict with libruby1.9 (Closes: #493309)

Modified: packages/libgems-ruby/trunk/debian/changelog
===================================================================
--- packages/libgems-ruby/trunk/debian/changelog	2008-08-01 22:10:47 UTC (rev 2918)
+++ packages/libgems-ruby/trunk/debian/changelog	2008-08-03 14:40:46 UTC (rev 2919)
@@ -1,8 +1,8 @@
-libgems-ruby (1.2.0-2) UNRELEASED; urgency=low
+libgems-ruby (1.2.0-2) unstable; urgency=low
 
-  * NOT RELEASED YET
+  * debian/rules: Fixed a file conflict with libruby1.9 (Closes: #493309)
 
- -- Daigo Moriwaki <daigo at debian.org>  Thu, 26 Jun 2008 23:40:42 +0900
+ -- Daigo Moriwaki <daigo at debian.org>  Sun, 03 Aug 2008 21:32:36 +0900
 
 libgems-ruby (1.2.0-1) unstable; urgency=low
 

Modified: packages/libgems-ruby/trunk/debian/rules
===================================================================
--- packages/libgems-ruby/trunk/debian/rules	2008-08-01 22:10:47 UTC (rev 2918)
+++ packages/libgems-ruby/trunk/debian/rules	2008-08-03 14:40:46 UTC (rev 2919)
@@ -66,6 +66,7 @@
 	mkdir -p $(CURDIR)/debian/$(cdbs_curpkg)/$(RUBY19LIBDIR)/
 	mkdir -p $(CURDIR)/debian/$(cdbs_curpkg)/usr/bin/
 	mv $(CURDIR)/debian/$(cdbs_curpkg)/lib/* $(CURDIR)/debian/$(cdbs_curpkg)/$(RUBY19LIBDIR)/
+	rm $(CURDIR)/debian/$(cdbs_curpkg)/$(RUBY19LIBDIR)/rbconfig/datadir.rb
 	rm -rf $(CURDIR)/debian/$(cdbs_curpkg)/lib
 	mv $(CURDIR)/debian/$(cdbs_curpkg)/bin/gem1.9 $(CURDIR)/debian/$(cdbs_curpkg)/usr/bin/
 	rm -rf $(CURDIR)/debian/$(cdbs_curpkg)/bin/