[SCM] libclucy-clojure packaging branch, master, updated. upstream/0.2.2-23-geed5e65

[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 "libclucy-clojure packaging".

The branch, master has been updated
       via  eed5e653a0b18d57c186ab80f8880c8fff9836c1 (commit)
       via  50f0df01dfdd8ad4f9e9ba8050a1f3a19d6dc183 (commit)
       via  93bfeccc9c18da26652a88dc0691d165cb97f74f (commit)
      from  c0c654d76e5e05ed62c1feb12defc2a59cd3c7a8 (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 eed5e653a0b18d57c186ab80f8880c8fff9836c1
Author: Daigo Moriwaki <daigo at debian.org>
Date:   Sun Jul 17 00:26:59 2011 +0900

    * debian/patches/0001-add-upstream-changelog.patch:
      Use the upstream's file name.
    * Removed debian/{clean,docs,libclucy-clojure.classpath
      libclucy-clojure.jlibs}. Instead, wrote them in debian/rules.

commit 50f0df01dfdd8ad4f9e9ba8050a1f3a19d6dc183
Merge: 93bfecc c0c654d
Author: Daigo Moriwaki <daigo at debian.org>
Date:   Sat Jul 16 23:27:09 2011 +0900

    Merge branch 'master' of git+ssh://git.debian.org/git/pkg-java/libclucy-clojure
    
    Conflicts:
    	debian/rules

commit 93bfeccc9c18da26652a88dc0691d165cb97f74f
Author: Daigo Moriwaki <daigo at debian.org>
Date:   Sun Jul 10 20:25:45 2011 +0900

    Replaced the produced jar name with a macro.

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

Summary of changes:
 debian/changelog                                 |    8 ++++++-
 debian/clean                                     |    2 -
 debian/docs                                      |    2 -
 debian/libclucy-clojure.classpath                |    1 -
 debian/libclucy-clojure.jlibs                    |    1 -
 debian/patches/0001-add-upstream-changelog.patch |   10 ++++----
 debian/rules                                     |   23 +++++++++++++++++++++-
 7 files changed, 34 insertions(+), 13 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7027c0b..fd77366 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -26,4 +26,10 @@ clucy (0.2.2-1) unstable; urgency=low
   * Add upstream changelog
   * Register documentation with doc-base
 
- -- Wolodja Wentland <babilen at gmail.com>  Wed, 13 Jul 2011 14:56:22 +0000
+  [ Daigo Moriwaki ]
+  * debian/patches/0001-add-upstream-changelog.patch:
+    Use the upstream's file name.
+  * Removed debian/{clean,docs,libclucy-clojure.classpath
+    libclucy-clojure.jlibs}. Instead, wrote them in debian/rules.
+
+ -- Daigo Moriwaki <daigo at debian.org>  Sun, 17 Jul 2011 00:19:43 +0900
diff --git a/debian/clean b/debian/clean
deleted file mode 100644
index 240e65b..0000000
--- a/debian/clean
+++ /dev/null
@@ -1,2 +0,0 @@
-clucy.jar
-README.html
diff --git a/debian/docs b/debian/docs
deleted file mode 100644
index 93ebb92..0000000
--- a/debian/docs
+++ /dev/null
@@ -1,2 +0,0 @@
-README.html
-README.md
diff --git a/debian/libclucy-clojure.classpath b/debian/libclucy-clojure.classpath
deleted file mode 100644
index 05a4b1f..0000000
--- a/debian/libclucy-clojure.classpath
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/java/clucy.jar /usr/share/java/clojure.jar /usr/share/java/lucene-core.jar /usr/share/java/lucene-memory.jar /usr/share/java/lucene-highlighter.jar
diff --git a/debian/libclucy-clojure.jlibs b/debian/libclucy-clojure.jlibs
deleted file mode 100644
index abcf49c..0000000
--- a/debian/libclucy-clojure.jlibs
+++ /dev/null
@@ -1 +0,0 @@
-clucy.jar
diff --git a/debian/patches/0001-add-upstream-changelog.patch b/debian/patches/0001-add-upstream-changelog.patch
index 7c9ba30..3d67fbe 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: Tue, 12 Jul 2011 18:30:39 +0100
-Subject: add upstream changelog
+Subject: add upstream ChangeLog
 
 ---
- changelog |   19 +++++++++++++++++++
+ ChangeLog |   19 +++++++++++++++++++
  1 files changed, 19 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..15ef822
 --- /dev/null
-+++ b/changelog
++++ b/ChangeLog
 @@ -0,0 +1,19 @@
 +0.2.2 / 2011-07-03
 +
diff --git a/debian/rules b/debian/rules
index fbc38e9..c1adb77 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,12 +6,33 @@ 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/-[^-]*$$//')
 
+export CLASSPATH=/usr/share/java/clojure.jar:/usr/share/java/lucene-core.jar:/usr/share/java/lucene-memory.jar:/usr/share/java/lucene-highlighter.jar
+
+PRODUCED_JAR=clucy.jar
+
 %:
 	dh $@ --with javahelper
 
 override_jh_build:
-	jar cf clucy.jar -C src .
+	jar cf $(PRODUCED_JAR) -C src .
 	markdown README.md > README.html
 
+override_jh_classpath:
+	jh_classpath $(PRODUCED_JAR)
+
+override_jh_installlibs:
+	jh_installlibs $(PRODUCED_JAR)
+
+override_dh_installdocs:
+	dh_installdocs README.html README.md
+
+override_dh_installchangelogs:
+	dh_installchangelogs ChangeLog
+
+override_jh_clean:
+	jh_clean
+	-rm -f $(PRODUCED_JAR)
+	-rm -f README.html
+
 get-orig-source:
 	uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename


hooks/post-receive
-- 
libclucy-clojure packaging