[DRE-commits] [ruby-hikidoc] 02/05: Install TextFormattingRules.html.ja (Japanese documents)

[Youhei SASAKI]

This is an automated email from the git hooks/post-receive script.

uwabami-guest pushed a commit to branch master
in repository ruby-hikidoc.

commit 55795b0b47ba5ff1c18e631e0200763868b38f44
Author: Youhei SASAKI <uwabami at gfd-dennou.org>
Date:   Fri Aug 29 03:57:36 2014 +0900

    Install TextFormattingRules.html.ja (Japanese documents)
    
    Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
---
 debian/control                        |  2 +-
 debian/patches/02_textformattingrules | 26 +++++++++++++++++++++-----
 debian/ruby-hikidoc.doc-base          |  1 +
 debian/ruby-hikidoc.docs              |  2 +-
 debian/rules                          | 20 ++++++++++----------
 5 files changed, 34 insertions(+), 17 deletions(-)

diff --git a/debian/control b/debian/control
index e7e5e9f..3cf3948 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: ruby
 Priority: optional
 Maintainer: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
 Uploaders: Youhei SASAKI <uwabami at gfd-dennou.org>, Caitlin Matos <caitlin.matos at zoho.com>
-Build-Depends: debhelper (>= 9), gem2deb (>= 0.2.5~), help2man
+Build-Depends: debhelper (>= 9), gem2deb (>= 0.2.5~), help2man, nkf
 Standards-Version: 3.9.5
 Vcs-Git: git://anonscm.debian.org/pkg-ruby-extras/ruby-hikidoc.git
 Vcs-Browser: http://anonscm.debian.org/gitweb?p=pkg-ruby-extras/ruby-hikidoc.git;a=summary
diff --git a/debian/patches/02_textformattingrules b/debian/patches/02_textformattingrules
index 857baa4..d987f9d 100644
--- a/debian/patches/02_textformattingrules
+++ b/debian/patches/02_textformattingrules
@@ -1,12 +1,12 @@
 Description: replace external image with DFSG-compliant logo
  The syntax reference for HikiDoc requires an image from an external site. The licence of this image is uncertain. The actual image used does not matter, as the document is demonstrating how to insert an image in HikiDoc syntax. To avoid licensing concerns and a potential privacy breach, I have replaced this external image with an included copy of the Debian logo.
-Author: Caitlin Matos <caitlin.matos at zoho.com> 
-Last-Update: 2014-08-07 
+Author: Caitlin Matos <caitlin.matos at zoho.com>, Youhei SASAKI <uwabami at gfd-dennou.org>
+Last-Update: 2014-08-29 
 ---
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/TextFormattingRules
-+++ b/TextFormattingRules
-@@ -90,11 +90,11 @@ In this case, if the URL ends with jpg.,
+--- ruby-hikidoc.orig/TextFormattingRules
++++ ruby-hikidoc/TextFormattingRules
+@@ -90,11 +90,11 @@
  
  *Example statement
  
@@ -20,3 +20,19 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  
  !Preformatted text
  
+--- ruby-hikidoc.orig/TextFormattingRules.ja
++++ ruby-hikidoc/TextFormattingRules.ja
+@@ -90,11 +90,11 @@
+ 
+ *������
+ 
+- http://jp.rubyist.net/theme/clover/clover_h1.png
++ file:///usr/share/doc/ruby-hikidoc/html/debian-openlogo.png
+ 
+ *������
+ 
+-http://jp.rubyist.net/theme/clover/clover_h1.png
++file:///usr/share/doc/ruby-hikidoc/html/debian-openlogo.png
+ 
+ !�����Ѥߥƥ�����
+ 
diff --git a/debian/ruby-hikidoc.doc-base b/debian/ruby-hikidoc.doc-base
index 3369d19..0540d92 100644
--- a/debian/ruby-hikidoc.doc-base
+++ b/debian/ruby-hikidoc.doc-base
@@ -5,3 +5,4 @@ Section: Programming/Ruby
 Format: HTML
 Index: /usr/share/doc/ruby-hikidoc/html/TextFormattingRules.html
 Files: /usr/share/doc/ruby-hikidoc/html/TextFormattingRules.html
+       /usr/share/doc/ruby-hikidoc/html/TextFormattingRules.html.ja
diff --git a/debian/ruby-hikidoc.docs b/debian/ruby-hikidoc.docs
index 655c842..d7e34d7 100644
--- a/debian/ruby-hikidoc.docs
+++ b/debian/ruby-hikidoc.docs
@@ -2,4 +2,4 @@ README
 README.ja
 NEWS
 NEWS.ja
-TextFormattingRules.ja
+html
diff --git a/debian/rules b/debian/rules
index b5d222d..3f7b00a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,22 +10,22 @@ override_dh_installman:
 		   --include=debian/hikidoc.h2m \
 		   --help-option="-I lib/ bin/hikidoc --help" \
 		   --version-string=$(UPSTREAM_VERSION) \
-		   /usr/bin/ruby >hikidoc.1
+		   /usr/bin/ruby > $(CURDIR)/hikidoc.1
 	dh_installman
 
 override_dh_installdocs:
-	# Need to use hikidoc to correctly format the TextFormattingRules page!
-	ruby -I lib/ bin/hikidoc ./TextFormattingRules >| TextFormattingRules.html
-
-	install -o root -g root -m 644 \
-	    ./TextFormattingRules.html \
-	    ./debian/ruby-hikidoc/usr/share/doc/ruby-hikidoc/html/TextFormattingRules.html
+	mkdir -p $(CURDIR)/html
+	ruby -I $(CURDIR)/lib/ $(CURDIR)/bin/hikidoc TextFormattingRules \
+	  > $(CURDIR)/html/TextFormattingRules.html
+	nkf -w $(CURDIR)/TeXTFormattingRules.ja \
+	  | ruby -I $(CURDIR)/lib/ $(CURDIR)/bin/hikidoc \
+	  > $(CURDIR)/html/TextFormattingRules.html.ja
 	install -o root -g root -m 644 \
-	    ./debian/local/debian-openlogo.png \
-	    ./debian/ruby-hikidoc/usr/share/doc/ruby-hikidoc/html/debian-openlogo.png
+	  $(CURDIR)/debian/local/debian-openlogo.png \
+	  $(CURDIR)/html/debian-openlogo.png
 	dh_installdocs
 
 override_dh_auto_clean:
 	dh_auto_clean
-	[ ! -f $(CURDIR)/TextFormattingRules.html ] || rm -f $(CURDIR)/TextFormattingRules.html
+	[ ! -d $(CURDIR)/html ] || rm -fr $(CURDIR)/html
 	[ ! -f $(CURDIR)/hikidoc.1 ] || rm -f $(CURDIR)/hikidoc.1

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-hikidoc.git