[SCM] UNNAMED PROJECT branch, master, updated. debian/1.4.0+dfsg-1

Sat Apr 21 03:55:25 UTC 2012

The following commit has been merged in the master branch:
commit 997bee207e883a315f0f16905154865a6db353d1
Author: Daigo Moriwaki <daigo at debian.org>
Date:   Sat Apr 21 11:57:48 2012 +0900

    Process markdown documents: debian/{rules,control,header.html,footer.html}.

diff --git a/debian/changelog b/debian/changelog
index 99835a6..f29a6a8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,10 @@
 clojure1.4 (1.4.0+dfsg-1) unstable; urgency=low
 
   * New upstream release.
+  * Process markdown documents:
+    debian/{rules,control,header.html,footer.html}.
 
- -- Daigo Moriwaki <daigo at debian.org>  Sat, 21 Apr 2012 11:16:00 +0900
+ -- Daigo Moriwaki <daigo at debian.org>  Sat, 21 Apr 2012 11:56:27 +0900
 
 clojure1.3 (1.3.0+dfsg-3) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 8b6c34e..087217c 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Peter Collingbourne <peter at pcc.me.uk>, Daigo Moriwaki <daigo at debian.org>
 Build-Depends: debhelper (>= 5), cdbs, quilt
-Build-Depends-Indep: ant, openjdk-6-jdk, libasm3-java, maven-repo-helper, javahelper
+Build-Depends-Indep: ant, openjdk-6-jdk, libasm3-java, maven-repo-helper, javahelper, libtext-markdown-perl | markdown
 Standards-Version: 3.9.2
 Homepage: http://clojure.org
 Vcs-Git: git://git.debian.org/pkg-java/clojure.git
diff --git a/debian/footer.html b/debian/footer.html
new file mode 100644
index 0000000..308b1d0
--- /dev/null
+++ b/debian/footer.html
@@ -0,0 +1,2 @@
+</body>
+</html>
diff --git a/debian/header.html b/debian/header.html
new file mode 100644
index 0000000..394f8de
--- /dev/null
+++ b/debian/header.html
@@ -0,0 +1,6 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"' ttp://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html>
+<head>
+<title>@TITLE@</title>
+</head>
+<body>
diff --git a/debian/rules b/debian/rules
index 89daf6a..7d3df6c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,6 +8,7 @@ ORIG_VERSION = $(shell echo $(VERSION) | sed s/-.*//)
 PRISTINE_VERSION = $(shell echo $(ORIG_VERSION) | sed s/\+dfsg//)
 UPSTREAM_VERSION = $(shell echo $(PRISTINE_VERSION) | sed s/^0\.0\.//)
 SRCDIR_NAME = $(SOURCE)-$(ORIG_VERSION).orig
+MDWN_DOCS = $(patsubst %.md,%.html,$(wildcard *.md))
 
 include /usr/share/javahelper/java-vars.mk
 include /usr/share/cdbs/1/class/ant.mk
@@ -16,7 +17,9 @@ include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
 DEB_JARS  := asm3 asm3-commons
 
-DEB_INSTALL_CHANGELOGS_ALL := changes.txt
+DEB_INSTALL_CHANGELOGS_ALL := changes.md changes.html
+
+build/clojure1.4:: $(MDWN_DOCS)
 
 binary-install/$(SOURCE)::
 	$(JAVA_HOME)/bin/java -cp /usr/share/java/asm3.jar:/usr/share/java/asm3-commons.jar:clojure.jar clojure.main debian/gencompletions.clj > debian/$(SOURCE)/etc/rlwrap/clojure$(VER)
@@ -28,7 +31,14 @@ binary-post-install/$(SOURCE)::
 	mh_installpom -p$(SOURCE) --no-parent pom.xml
 	mh_installjar -p$(SOURCE) -l -s pom.xml clojure.jar /usr/share/java/clojure-$(VER).jar
 
+%.html:%.md
+	cat debian/header.html > $@
+	sed -i'' -e 's/@TITLE@/$(shell head -n 1 $< | sed 's/^#*\s*//')/g' $@
+	markdown $< >> $@
+	cat debian/footer.html >> $@
+
 clean::
+	rm -f $(MDWN_DOCS)
 	-mh_clean
 
 get-orig-source:

-- 
UNNAMED PROJECT

