[SCM] libclucy-clojure packaging branch, master, updated. debian/0.2.2-1-2-g49e9475

Mon Jul 18 07:19:00 UTC 2011

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "libclucy-clojure packaging".

The branch, master has been updated
       via  49e9475f397b0c542d006f439866b226f8daba10 (commit)
      from  d164abf1f75a7ef623a424841d30cf9f275a53a7 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 49e9475f397b0c542d006f439866b226f8daba10
Author: Daigo Moriwaki <daigo at debian.org>
Date:   Mon Jul 18 16:14:47 2011 +0900

    debian/rules: Improved generating markdown documents.

-----------------------------------------------------------------------

Summary of changes:
 debian/changelog |    3 ++-
 debian/doc-base  |    8 ++++++--
 debian/rules     |   23 ++++++++++++++++++-----
 3 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8dbf49e..c5b3b71 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,9 @@ clucy (0.2.2-2) unstable; urgency=low
   * Build-Depends on only clojure-1.2 version, with which the produced jar
     library will be linked. As of now, clojure.jar is out of the alternative
     symlink framework.
+  * debian/rules: Improved generating markdown documents.
 
- -- Daigo Moriwaki <daigo at debian.org>  Sun, 17 Jul 2011 21:00:01 +0900
+ -- Daigo Moriwaki <daigo at debian.org>  Mon, 18 Jul 2011 16:09:04 +0900
 
 clucy (0.2.2-1) unstable; urgency=low
 
diff --git a/debian/doc-base b/debian/doc-base
index a61fe57..92a73e5 100644
--- a/debian/doc-base
+++ b/debian/doc-base
@@ -5,5 +5,9 @@ Abstract: A short tutorial on the Clojure interface to Lucene.
 Section: Programming
 
 Format: HTML
-Index: /usr/share/doc/libclucy-clojure/README.html
-Files: /usr/share/doc/libclucy-clojure/README.html
+Index: /usr/share/doc/libclucy-clojure/html/README.html
+Files: /usr/share/doc/libclucy-clojure/html/README.html
+
+Format: Text
+Index: /usr/share/doc/libclucy-clojure/README.md
+Files: /usr/share/doc/libclucy-clojure/README.md
diff --git a/debian/rules b/debian/rules
index bd7cbb1..d8fbf8f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,6 +5,7 @@ include /usr/share/javahelper/java-vars.mk
 DEB_VERSION := $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f 2 -d ' ')
 DEB_NOEPOCH_VERSION := $(shell echo $(DEB_VERSION) | cut -d: -f2-)
 DEB_UPSTREAM_VERSION := $(shell echo $(DEB_NOEPOCH_VERSION) | sed 's/-[^-]*$$//')
+MDWN_DOCS = $(patsubst %.md,%.html,$(wildcard $(CURDIR)/*.md))
 
 export CLASSPATH=/usr/share/java/clojure-1.2.jar:/usr/share/java/lucene-core.jar:/usr/share/java/lucene-memory.jar:/usr/share/java/lucene-highlighter.jar
 
@@ -13,9 +14,9 @@ PRODUCED_JAR=clucy.jar
 %:
 	dh $@ --with javahelper
 
-override_jh_build:
+override_jh_build: $(MDWN_DOCS)
 	jar cf $(PRODUCED_JAR) -C src .
-	markdown README.md > README.html
+	mkdir -p $(CURDIR)/doc/html && mv $(CURDIR)/*.html $(CURDIR)/doc/html
 
 override_jh_classpath:
 	jh_classpath $(PRODUCED_JAR)
@@ -24,15 +25,27 @@ override_jh_installlibs:
 	jh_installlibs $(PRODUCED_JAR)
 
 override_dh_installdocs:
-	dh_installdocs README.html README.md
+	dh_installdocs $(CURDIR)/*.md $(CURDIR)/doc/*
 
 override_dh_installchangelogs:
 	dh_installchangelogs ChangeLog
 
 override_jh_clean:
 	jh_clean
-	-rm -f $(PRODUCED_JAR)
-	-rm -f README.html
+	rm -f $(CURDIR)/$(PRODUCED_JAR)
+	rm -rf $(CURDIR)/doc
 
 get-orig-source:
 	uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename
+
+%.html:%.md
+	@echo '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"' \
+		'"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">' > $@
+	@echo "<html>" >> $@
+	@echo "<head>" >> $@
+	@echo "<title>$(shell head -n 1 $< | sed 's/^#*\s*//')</title>" >> $@
+	@echo "</head>" >> $@
+	@echo "<body>" >> $@
+	markdown $< >> $@
+	@echo "</body>" >> $@
+	@echo "</html>" >> $@


hooks/post-receive
-- 
libclucy-clojure packaging

