[DRE-commits] [SCM] rdtool.git branch, master, updated. debian/0.6.31-1-25-gea4581b

[Taku YASUI]

The following commit has been merged in the master branch:
commit cf98905f9e120718dcfd40a5fccf419804acf781
Author: Taku YASUI <tach at debian.org>
Date:   Sun May 6 02:55:54 2012 +0900

    Remove to build HTML document

diff --git a/debian/changelog b/debian/changelog
index a9d1adb..25b3fc2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,10 @@
 rdtool (0.6.33-1) unstable; urgency=low
 
   * New upstream release.
+  * Build using gem2deb.
+  * Remove to build HTML document because original package has them.
 
- -- Taku YASUI <tach at debian.org>  Sun, 06 May 2012 02:45:00 +0900
+ -- Taku YASUI <tach at debian.org>  Sun, 06 May 2012 02:46:03 +0900
 
 rdtool (0.6.31-1) unstable; urgency=low
 
diff --git a/debian/rdtool.docs b/debian/rdtool.docs
index e4515ae..5135e76 100644
--- a/debian/rdtool.docs
+++ b/debian/rdtool.docs
@@ -1,8 +1,8 @@
 README.rd
 README.rd.ja
 README.html
-README.html.ja
+README.ja.html
 doc/rd-draft.rd
 doc/rd-draft.html
 doc/rd-draft.rd.ja
-doc/rd-draft.html.ja
+doc/rd-draft.ja.html
diff --git a/debian/ruby-rd.docs b/debian/ruby-rd.docs
index e4515ae..5135e76 100644
--- a/debian/ruby-rd.docs
+++ b/debian/ruby-rd.docs
@@ -1,8 +1,8 @@
 README.rd
 README.rd.ja
 README.html
-README.html.ja
+README.ja.html
 doc/rd-draft.rd
 doc/rd-draft.html
 doc/rd-draft.rd.ja
-doc/rd-draft.html.ja
+doc/rd-draft.ja.html
diff --git a/debian/rules b/debian/rules
index 90a3082..5b56fe1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,13 +4,6 @@ include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
 libdir := $(shell ruby -r rbconfig -e 'print RbConfig::CONFIG["vendordir"]')
-docs := doc/rd-draft.html doc/rd-draft.html.ja README.html README.html.ja
-
-%.html: %.rd
-	ruby -Ilib bin/rd2 $< > $@
-
-%.html.ja: %.rd.ja
-	ruby -Ilib bin/rd2 $< > $@
 
 clean::
 	-ruby setup.rb clean

-- 
rdtool.git