[SCM] librobert-hooke-clojure packaging branch, master, updated. debian/1.1.2-1-22-gd387139

[Daigo Moriwaki]

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 "librobert-hooke-clojure packaging".

The branch, master has been updated
       via  d387139cc8f8a11bee8a0e456d2b4fad1a290bab (commit)
       via  2ccd9804918e38edb4fbd17c4de5a77c905ee6fa (commit)
       via  66797c947fe9de1da2a1c866e231cf923987113a (commit)
      from  f821885350b3e666d3e0e7a526afea1c635f23fa (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 d387139cc8f8a11bee8a0e456d2b4fad1a290bab
Author: Daigo Moriwaki <daigo at debian.org>
Date:   Sun Jul 17 21:06:53 2011 +0900

    Merged debian/librobert-hooke-clojure.{classpath,jlibs} to debian/rules. 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.

commit 2ccd9804918e38edb4fbd17c4de5a77c905ee6fa
Author: Daigo Moriwaki <daigo at debian.org>
Date:   Sun Jul 17 20:47:46 2011 +0900

    Matched the upstream's Changelog file name.

commit 66797c947fe9de1da2a1c866e231cf923987113a
Author: Daigo Moriwaki <daigo at debian.org>
Date:   Sun Jul 17 20:41:28 2011 +0900

    Merged debian/docs to debian/rules. Clean up the temporary directory ./doc correctly.

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

Summary of changes:
 debian/changelog                                 |   12 +++++++++++-
 debian/control                                   |    2 +-
 debian/docs                                      |    2 --
 debian/librobert-hooke-clojure.classpath         |    1 -
 debian/librobert-hooke-clojure.jlibs             |    1 -
 debian/patches/0001-Add-upstream-changelog.patch |   10 +++++-----
 debian/rules                                     |   12 +++++++++++-
 7 files changed, 28 insertions(+), 12 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6695ee5..419ec31 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -26,4 +26,14 @@ robert-hooke (1.1.2-1) unstable; urgency=low
   * Add upstream changelog
   * Register documentation with doc-base
 
- -- Wolodja Wentland <babilen at gmail.com>  Wed, 13 Jul 2011 17:13:04 +0000
+  [ Daigo Moriwaki ]
+  * Merged debian/docs to debian/rules.
+    Clean up the temporary directory ./doc correctly.
+  * Matched the upstream's Changelog file name.
+  * Merged debian/librobert-hooke-clojure.{classpath,jlibs}
+    to debian/rules.
+    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.
+
+ -- Daigo Moriwaki <daigo at debian.org>  Sun, 17 Jul 2011 20:51:18 +0900
diff --git a/debian/control b/debian/control
index 03a3cba..90cfb97 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,7 @@ Build-Depends:
  debhelper (>> 8),
  javahelper (>= 0.32),
 Build-Depends-Indep:
- clojure1.2 | clojure,
+ clojure1.2,
  libtext-markdown-perl | markdown,
  openjdk-6-jdk
 Standards-Version: 3.9.2
diff --git a/debian/docs b/debian/docs
deleted file mode 100644
index 551fde5..0000000
--- a/debian/docs
+++ /dev/null
@@ -1,2 +0,0 @@
-README.md
-doc/html
diff --git a/debian/librobert-hooke-clojure.classpath b/debian/librobert-hooke-clojure.classpath
deleted file mode 100644
index 722eae8..0000000
--- a/debian/librobert-hooke-clojure.classpath
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/java/robert-hooke.jar /usr/share/java/clojure.jar
diff --git a/debian/librobert-hooke-clojure.jlibs b/debian/librobert-hooke-clojure.jlibs
deleted file mode 100644
index 9a78198..0000000
--- a/debian/librobert-hooke-clojure.jlibs
+++ /dev/null
@@ -1 +0,0 @@
-robert-hooke.jar
diff --git a/debian/patches/0001-Add-upstream-changelog.patch b/debian/patches/0001-Add-upstream-changelog.patch
index b097beb..dd38ccc 100644
--- a/debian/patches/0001-Add-upstream-changelog.patch
+++ b/debian/patches/0001-Add-upstream-changelog.patch
@@ -1,17 +1,17 @@
 From: Wolodja Wentland <babilen at gmail.com>
 Date: Wed, 13 Jul 2011 17:57:01 +0100
-Subject: Add upstream changelog.
+Subject: Add upstream Changelog.
 
 ---
- changelog |   25 +++++++++++++++++++++++++
+ Changelog |   25 +++++++++++++++++++++++++
  1 files changed, 25 insertions(+), 0 deletions(-)
- create mode 100644 changelog
+ create mode 100644 Changelog
 
-diff --git a/changelog b/changelog
+diff --git a/Changelog b/Changelog
 new file mode 100644
 index 0000000..8ff7b51
 --- /dev/null
-+++ b/changelog
++++ b/Changelog
 @@ -0,0 +1,25 @@
 +1.1.2 / 2011-06-30
 +
diff --git a/debian/rules b/debian/rules
index b4477f2..dda6dfc 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,6 +7,7 @@ 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
 PRODUCED_JAR=robert-hooke.jar
 
 %:
@@ -16,10 +17,19 @@ override_jh_build: $(MDWN_DOCS)
 	jar cf $(PRODUCED_JAR) -C src .
 	mkdir -p $(CURDIR)/doc/html && mv $(CURDIR)/*.html $(CURDIR)/doc/html
 
+override_jh_classpath:
+	jh_classpath $(PRODUCED_JAR)
+
+override_jh_installlibs:
+	jh_installlibs $(PRODUCED_JAR)
+
 override_jh_clean:
 	jh_clean
 	rm -f $(CURDIR)/$(PRODUCED_JAR)
-	rm -rf $(CURDIR)/doc/html
+	rm -rf $(CURDIR)/doc
+
+override_dh_installdocs:
+	dh_installdocs *.md doc/*
 
 get-orig-source:
 	uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename


hooks/post-receive
-- 
librobert-hooke-clojure packaging