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

[daigo at alioth.debian.org]

Author: daigo
Date: 2007-12-25 15:13:10 +0000 (Tue, 25 Dec 2007)
New Revision: 2378

Modified:
   packages/libgems-ruby/trunk/debian/changelog
   packages/libgems-ruby/trunk/debian/control
   packages/libgems-ruby/trunk/debian/rules
Log:
* debian/control: depends rdoc1.8 instead of rake. Explicitly use 
  rdoc1.8 to generate documentations because rake depends on RubyGems.

Modified: packages/libgems-ruby/trunk/debian/changelog
===================================================================
--- packages/libgems-ruby/trunk/debian/changelog	2007-12-25 12:25:14 UTC (rev 2377)
+++ packages/libgems-ruby/trunk/debian/changelog	2007-12-25 15:13:10 UTC (rev 2378)
@@ -3,6 +3,8 @@
   * New upstream release.
   * Added debian/patches/02_rakefile.dpatch: rubygems is not required for
     Rakefile. 
+  * debian/control: depends rdoc1.8 instead of rake. Explicitly use 
+    rdoc1.8 to generate documentations because rake depends on RubyGems.
 
  -- Daigo Moriwaki <daigo at debian.org>  Tue, 25 Dec 2007 21:04:14 +0900
 

Modified: packages/libgems-ruby/trunk/debian/control
===================================================================
--- packages/libgems-ruby/trunk/debian/control	2007-12-25 12:25:14 UTC (rev 2377)
+++ packages/libgems-ruby/trunk/debian/control	2007-12-25 15:13:10 UTC (rev 2378)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Daigo Moriwaki <daigo at debian.org>
 Uploaders: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
-Build-Depends-Indep: dpatch (>= 2.0.10), debhelper (>= 4.0.0), ruby1.8, ruby-pkg-tools, rake
+Build-Depends-Indep: dpatch (>= 2.0.10), debhelper (>= 4.0.0), ruby1.8, rdoc1.8, ruby-pkg-tools
 Standards-Version: 3.7.3
 Homepage: http://rubygems.org/
 

Modified: packages/libgems-ruby/trunk/debian/rules
===================================================================
--- packages/libgems-ruby/trunk/debian/rules	2007-12-25 12:25:14 UTC (rev 2377)
+++ packages/libgems-ruby/trunk/debian/rules	2007-12-25 15:13:10 UTC (rev 2378)
@@ -21,14 +21,14 @@
 RUBY18LIBDIR = $(shell $(RUBY18) -rrbconfig -e "puts Config::CONFIG['rubylibdir']")
 
 config: config-stamp
-config-stamp: patch
+config-stamp:
 	dh_testdir
 
 	mkdir -p debian/tmp/var/lib/gems/1.8
 	touch config-stamp
 
 build: build-stamp
-build-stamp: config
+build-stamp: patch config
 	dh_testdir
 
 	touch build-stamp
@@ -48,7 +48,8 @@
 install:
 	$(RUBY18) setup.rb --no-rdoc --no-ri --prefix=debian/tmp
 	mkdir -p debian/tmp$(RUBY18LIBDIR)
-	$(RAKE) rdoc
+	find lib -name "*.rb" | xargs rdoc --fmt html --title RubyGems \
+	  --line-numbers --inline-source --main README -o html README TODO
 	mv debian/tmp/lib/* debian/tmp$(RUBY18LIBDIR)/
 	mv debian/tmp/bin debian/tmp/usr/
 	rm -f debian/tmp/usr/bin/update_rubygems*
@@ -109,7 +110,8 @@
 patch: patch-stamp
 patch-stamp:
 	dpatch apply-all
-	# dpatch call-all -a=pkg-info >patch-stamp
+	dpatch cat-all >patch-stamp
+	touch patch-stamp
 
 unpatch:
 	dpatch deapply-all