[SCM] jinput - Java Game Controller API branch, master, updated. debian/20100502+dfsg-3-1-g21a6037

Mon Jul 5 18:15:45 UTC 2010

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 "jinput - Java Game Controller API".

The branch, master has been updated
       via  21a6037d3c1da11ad59295541270cf4e42ac6346 (commit)
      from  14890b04dab079c827af1fba86cccb95b9c3960a (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 21a6037d3c1da11ad59295541270cf4e42ac6346
Author: Gabriele Giacone <1o5g4r8o at gmail.com>
Date:   Mon Jul 5 20:12:02 2010 +0200

    3.9.0, system javadoc, BSD full text

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

Summary of changes:
 debian/changelog                  |    8 +++++
 debian/control                    |    4 ++-
 debian/copyright                  |   63 +++++++++++++++++++++++++++++++++---
 debian/libjinput-java-doc.javadoc |    2 +-
 debian/patches/03javadoc          |   26 +++++++++++++++
 debian/patches/series             |    1 +
 debian/rules                      |    4 ++-
 7 files changed, 99 insertions(+), 9 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index af80e2b..ae05301 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+jinput (20100502+dfsg-4) unstable; urgency=low
+
+  * Standard version to 3.9.0.
+  * Linked javadoc to system javadoc.
+  * d/copyright: Included full text of BSD license.
+
+ -- Gabriele Giacone <1o5g4r8o at gmail.com>  Mon, 05 Jul 2010 19:59:36 +0200
+
 jinput (20100502+dfsg-3) unstable; urgency=low
 
   * Team upload.
diff --git a/debian/control b/debian/control
index 2b572b6..1cbd9e6 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,8 @@ Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.or
 Uploaders: Gabriele Giacone <1o5g4r8o at gmail.com>
 Build-Depends: debhelper (>= 7.0.50~), javahelper (>= 0.29), ant, ant-optional,
  default-jdk, libjutils-java
-Standards-Version: 3.8.4
+Build-Depends-Indep: default-jdk-doc
+Standards-Version: 3.9.0
 Vcs-Git: git://git.debian.org/pkg-java/jinput.git
 Vcs-Browser: http://git.debian.org/?p=pkg-java/jinput.git
 Homepage: https://jinput.dev.java.net/
@@ -45,6 +46,7 @@ Architecture: all
 Section: doc
 Depends: ${misc:Depends}
 Suggests: libjinput-java
+Recommends: default-jdk-doc, libjutils-java-doc
 Description: Java Game Controller API (javadoc)
  jinput is an implementation of an API for game controller discovery and
  polled input. It is part of a suite of open-source technologies initiated by
diff --git a/debian/copyright b/debian/copyright
index 224e7f4..304dce9 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -10,8 +10,25 @@ Source: http://jinput.dev.java.net/source/browse/jinput/
 
 Copyright: 2003-2010, Sun Microsystems, Inc.
 License: BSD
-  On Debian GNU/Linux system you can find the complete text of the
-  BSD license in '/usr/share/common-licenses/BSD'
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
+ Redistributions of source code must retain the above copyright notice, this
+ list of conditions and the following disclaimer. Redistributions in binary
+ form must reproduce the above copyright notice, this list of conditions and
+ the following disclaimer in the documentation and/or other materials provided
+ with the distribution.
+ The name of the author may not be used to endorse or promote products derived
+ from this software without specific prior written permission.
+ THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+ EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+ OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ ADVISED OF THE POSSIBILITY OF SUCH DAMAGE
 
 Files: ./plugins/awt/src/net/java/games/input/AWTKeyMap.java,
   ./plugins/awt/src/net/java/games/input/AWTEnvironmentPlugin.java,
@@ -46,11 +63,45 @@ Files: ./plugins/awt/src/net/java/games/input/AWTKeyMap.java,
   ./applet/src/net/java/games/input/applet/JInputAppletResourceLoader.java
 Copyright: 2003-2010, Jeremy Booth <jeremy at newdawnsoftware.com>
 License: BSD
-  On Debian GNU/Linux system you can find the complete text of the
-  BSD license in '/usr/share/common-licenses/BSD'
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
+ Redistributions of source code must retain the above copyright notice, this
+ list of conditions and the following disclaimer. Redistributions in binary
+ form must reproduce the above copyright notice, this list of conditions and
+ the following disclaimer in the documentation and/or other materials provided
+ with the distribution.
+ The name of the author may not be used to endorse or promote products derived
+ from this software without specific prior written permission.
+ THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+ EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+ OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ ADVISED OF THE POSSIBILITY OF SUCH DAMAGE
 
 Files: debian/*
 Copyright: 2010, Gabriele Giacone <1o5g4r8o at gmail.com>
 License: BSD
-  On Debian GNU/Linux system you can find the complete text of the
-  BSD license in '/usr/share/common-licenses/BSD'
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
+ Redistributions of source code must retain the above copyright notice, this
+ list of conditions and the following disclaimer. Redistributions in binary
+ form must reproduce the above copyright notice, this list of conditions and
+ the following disclaimer in the documentation and/or other materials provided
+ with the distribution.
+ The name of the author may not be used to endorse or promote products derived
+ from this software without specific prior written permission.
+ THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+ EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+ OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ ADVISED OF THE POSSIBILITY OF SUCH DAMAGE
diff --git a/debian/libjinput-java-doc.javadoc b/debian/libjinput-java-doc.javadoc
index 9a64dd8..1dd8c4f 100644
--- a/debian/libjinput-java-doc.javadoc
+++ b/debian/libjinput-java-doc.javadoc
@@ -1 +1 @@
-plugins/linux/apidocs
+coreAPI/apidocs
diff --git a/debian/patches/03javadoc b/debian/patches/03javadoc
new file mode 100644
index 0000000..9e511e0
--- /dev/null
+++ b/debian/patches/03javadoc
@@ -0,0 +1,26 @@
+Description: Links javadoc to system javadoc.
+Author: Gabriele Giacone <1o5g4r8o at gmail.com>
+
+--- a/coreAPI/build.xml
++++ b/coreAPI/build.xml
+@@ -2,7 +2,7 @@
+ 
+ <project name="Game Input API" basedir="." default="all">
+     <target name="init">
+-		<property name="utils" location="../lib/jutils.jar"/>    
++		<property name="utils" location="/usr/share/java/jutils.jar"/>    
+         <mkdir dir="apidocs"/> 
+         <mkdir dir="classes"/> 
+         <mkdir dir="bin"/> 
+@@ -44,8 +44,11 @@
+                  destdir="apidocs" 
+                  additionalparam="-source 1.4"
+ 	        	 excludepackagenames="net.java.games.input.example.*,net.java.games.input.test.*">
++            <link href="/usr/share/doc/default-jdk-doc/api/" />
++            <link href="/usr/share/doc/libjutils-java-doc/api/" />
+             <sourcepath>
+                 <pathelement location="src/java"/>
++                <pathelement location="../plugins/linux/src/java"/>
+             </sourcepath>
+              <classpath>
+                 <pathelement location="${utils}"/>
diff --git a/debian/patches/series b/debian/patches/series
index a80bf2b..4874ed0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 00build.xml
 01build.xml.jni
 02build.xml.nonfree
+03javadoc
diff --git a/debian/rules b/debian/rules
index d27e6fb..743c8dc 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,8 +5,10 @@ VERSION := $(shell dpkg-parsechangelog| sed -n '/^Version/{s/Version: \(.*\)-[0-
 CVSDATE := $(shell echo $(VERSION)|sed -n 's/\(....\)\(..\)\(..\)/\1-\2-\3/p')
 TMPDIR  := $(NAME)-$(VERSION)
 TAR     := ../$(NAME)_$(VERSION)+dfsg.orig.tar.gz
+CLASSPATH := /usr/share/java/jutils.jar:$(CURDIR)/dist/jinput-linux.jar
 
 export JAVA_HOME=/usr/lib/jvm/default-java
+export CLASSPATH
 
 %:
 	dh --with javahelper $@
@@ -14,7 +16,7 @@ export JAVA_HOME=/usr/lib/jvm/default-java
 override_dh_auto_build:
 	mkdir lib && cp /usr/share/java/jutils.jar lib
 	ant simple_linux
-	ant javadoc
+	ant -f coreAPI/build.xml javadoc
 
 override_dh_auto_install:
 	mv dist/jinput-linux.jar dist/jinput.jar


hooks/post-receive
-- 
jinput - Java Game Controller API

