[SCM] json-simple packaging branch, master, updated. upstream/1.1-dfsg1-8-gfc75d26

[Gilles Filippini]

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 "json-simple packaging".

The branch, master has been updated
       via  fc75d26d771b3b1b6ac8bc0317dca4472621a69e (commit)
       via  b7f0cff9a663a986f5abd9f950c94a3676b2c431 (commit)
       via  f335f2c33588c445b09af536227659717623e85b (commit)
      from  c960bea8cc9547608b05d7d6af359312e5e51e60 (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 fc75d26d771b3b1b6ac8bc0317dca4472621a69e
Author: Gilles Filippini <pini at debian.org>
Date:   Mon Mar 14 22:19:42 2011 +0100

    Version 1.1-dfsg1-1

commit b7f0cff9a663a986f5abd9f950c94a3676b2c431
Author: Gilles Filippini <pini at debian.org>
Date:   Mon Mar 14 22:02:11 2011 +0100

    Use $(CURDIR) instead of $(PWD) in debian/rules
    
    Thanks lintian.

commit f335f2c33588c445b09af536227659717623e85b
Author: Gilles Filippini <pini at debian.org>
Date:   Mon Mar 14 22:01:32 2011 +0100

    Add javadoc

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

Summary of changes:
 debian/changelog                   |    4 ++--
 debian/libjson-simple-doc.doc-base |   12 ++++++++++++
 debian/libjson-simple-doc.install  |    1 +
 debian/rules                       |    9 ++++++++-
 4 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1c47129..8e7470c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,5 @@
-json-simple (1.1-dfsg1-1) UNRELEASED; urgency=low
+json-simple (1.1-dfsg1-1) unstable; urgency=low
 
   * Initial release. (Closes: #614688)
 
- -- Gilles Filippini <pini at debian.org>  Mon, 28 Feb 2011 23:14:23 +0100
+ -- Gilles Filippini <pini at debian.org>  Mon, 14 Mar 2011 22:19:25 +0100
diff --git a/debian/libjson-simple-doc.doc-base b/debian/libjson-simple-doc.doc-base
new file mode 100644
index 0000000..9cdc044
--- /dev/null
+++ b/debian/libjson-simple-doc.doc-base
@@ -0,0 +1,12 @@
+Document: libjson-simple-java
+Title: Programmer API for json-simple
+Author:
+ Yidong Fang <fangyidong at yahoo.com.cn>
+ Chris Nokleberg <chris.nokleberg at gmail.com>
+Abstract: Javadocs for json-simple, a simple, lightweight and efficient
+ JSON toolkit for Java
+Section: Programming/Java
+
+Format: HTML
+Index: /usr/share/doc/libjson-simple-java/api/index.html
+Files: /usr/share/doc/libjson-simple-java/api/*.html
diff --git a/debian/libjson-simple-doc.install b/debian/libjson-simple-doc.install
new file mode 100644
index 0000000..4e7771f
--- /dev/null
+++ b/debian/libjson-simple-doc.install
@@ -0,0 +1 @@
+docs/* usr/share/doc/libjson-simple-java/api
diff --git a/debian/rules b/debian/rules
index ca37df5..98647f7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,10 +12,17 @@ export JAVA_HOME=/usr/lib/jvm/default-java
 %:
 	dh $@ --with javahelper
 
+override_dh_auto_build:
+	dh_auto_build
+	javadoc -windowtitle "Javadoc of json-simple" -sourcepath src -d docs \
+                -link /usr/share/doc/default-jdk-doc/api \
+                org.json.simple
+
 override_dh_auto_clean:
 	[ ! -d build/main ] || dh_auto_clean
+	rm -fr docs
 
 get-orig-source:
-	destdir=$(PWD) && \
+	destdir=$(CURDIR) && \
 	cd $(shell dirname $(word $(words $(MAKEFILE_LIST)),$(MAKEFILE_LIST)))/.. && \
 	USCAN_DESTDIR=$$destdir uscan --noconf --force-download --rename


hooks/post-receive
-- 
json-simple packaging