[SCM] jme - high performance scenegraph based graphics java API branch, master, updated. upstream/2.0.1+dfsg-2-g2ef8f6d

Sun Jul 4 18:10:22 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 "jme - high performance scenegraph based graphics java API".

The branch, master has been updated
       via  2ef8f6d5207eeda7fca2fe1c879e41be98907754 (commit)
      from  6a1ccf0b40891d422d33ff9ce63773f335680182 (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 2ef8f6d5207eeda7fca2fe1c879e41be98907754
Author: Gabriele Giacone <1o5g4r8o at gmail.com>
Date:   Sun Jul 4 19:58:54 2010 +0200

    improved javadoc, full text of BSD license

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

Summary of changes:
 debian/changelog                                   |    2 +-
 debian/control                                     |    5 +-
 debian/copyright                                   |   50 ++++++++++++++++++--
 ...bs_and_heapsize => 01_syslibs_heapsize_javadoc} |    6 ++-
 debian/patches/series                              |    2 +-
 debian/rules                                       |    4 ++
 6 files changed, 58 insertions(+), 11 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b3e41e8..f1dcc0e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,4 +2,4 @@ jme (2.0.1+dfsg-1) unstable; urgency=low
 
   * Initial release. (Closes: #587947)
 
- -- Gabriele Giacone <1o5g4r8o at gmail.com>  Sat, 03 Jul 2010 20:45:16 +0200
+ -- Gabriele Giacone <1o5g4r8o at gmail.com>  Sun, 04 Jul 2010 19:53:54 +0200
diff --git a/debian/control b/debian/control
index de59ef4..0067c01 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ 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.30), ant, liblwjgl-java,
  libjogl-java, libswt-gtk-3.5-java
-Build-Depends-Indep: default-jdk, libjorbis-java
+Build-Depends-Indep: default-jdk, libjorbis-java, default-jdk-doc
 Standards-Version: 3.9.0
 Vcs-Git: git://git.debian.org/pkg-java/jme.git
 Vcs-Browser: http://git.debian.org/?p=pkg-java/jme.git
@@ -25,7 +25,8 @@ Package: libjme-java-doc
 Architecture: all
 Section: doc
 Suggests: libjme-java
-Depends: ${misc:Depends}
+Depends: ${misc:Depends}, liblwjgl-java-doc, libjogl-java-doc
+Recommends: default-jdk-doc
 Description: high performance scenegraph based graphics java API (javadoc)
  The jMonkey Engine framework (jME) is a high-performance, 3D scenegraph based
  graphics API, written in Java.
diff --git a/debian/copyright b/debian/copyright
index ed901ae..3ac76b1 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -18,11 +18,51 @@ Copyright: 2003-2010, jME Team <contact at jmonkeyengine.com>
   List at http://www.jmonkeyengine.com/wiki/doku.php/team and
   http://www.jmonkeyengine.com/wiki/doku.php/credits 
 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.
+ Neither the name of 'jMonkeyEngine' nor the names of its contributors 
+ may be used to endorse or promote products derived from this software 
+ without specific prior written permission.
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ "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 COPYRIGHT OWNER OR
+ CONTRIBUTORS 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.
+ Neither the name of 'Debian' nor the names of its contributors 
+ may be used to endorse or promote products derived from this software 
+ without specific prior written permission.
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ "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 COPYRIGHT OWNER OR
+ CONTRIBUTORS 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/patches/01_syslibs_and_heapsize b/debian/patches/01_syslibs_heapsize_javadoc
similarity index 88%
rename from debian/patches/01_syslibs_and_heapsize
rename to debian/patches/01_syslibs_heapsize_javadoc
index b0ac779..6e381bc 100644
--- a/debian/patches/01_syslibs_and_heapsize
+++ b/debian/patches/01_syslibs_heapsize_javadoc
@@ -1,4 +1,5 @@
-Description: Builds against system libraries and increases max heap size.
+Description: Builds against system libraries, increases max heap size
+ and javadoc links with javadoc system.
 Author: Gabriele Giacone <1o5g4r8o at gmail.com>
 
 --- jme-2.0.1+dfsg.orig/shared-build.properties
@@ -23,12 +24,13 @@ Author: Gabriele Giacone <1o5g4r8o at gmail.com>
    <property name="javac.source" value="1.5" />
    <property name="javac.target" value="1.5" />
      <!-- N.b. the .source and .target setting are NOT for source and target
-@@ -215,7 +215,7 @@
+@@ -215,7 +215,8 @@
    <!-- Generates javadoc unless param is set -->
    <target name="-doc" unless="_docs.uptodate">
      <delete dir="${doc}"/>  <!-- The dependset leaves empty directories -->
 -    <javadoc destdir="${doc}" useExternalFile="yes" author="true" version="true" use="true" package="yes" windowtitle="jME API" bottom="Copyright 2003-2009 jMonkeyEngine" maxmemory="256m">
 +    <javadoc destdir="${doc}" useExternalFile="yes" author="true" version="true" use="true" package="yes" windowtitle="jME API" bottom="Copyright 2003-2009 jMonkeyEngine" maxmemory="512m">
++      <link href="/usr/share/doc/default-jdk-doc/api/" />
        <fileset dir="${src}/com" excludes="**/.*/**" includes="**/*.java" />
      </javadoc>
    </target>
diff --git a/debian/patches/series b/debian/patches/series
index 2b36373..226a0d2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1 @@
-01_syslibs_and_heapsize
+01_syslibs_heapsize_javadoc
diff --git a/debian/rules b/debian/rules
index 3a0f399..aa37a17 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,8 +4,12 @@ NAME    := $(shell dpkg-parsechangelog| sed -n '/^Source/{s/Source: \(.*\)/\1/p}
 VERSION := $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f2 -d' ' | cut -f1 -d+)
 TMPDIR  := get-orig-source-tmp
 TARBALL := $(NAME)_$(VERSION)+dfsg.orig.tar.gz
+JARS    := jinput jogl lwjgl lwjgl_util swt jogg jorbis 
+CLASSPATH := $(shell for j in $(JARS); do echo -n "/usr/share/java/$${j}.jar:";done)
+CLASSPATH := $(CLASSPATH):target/jme-swt.jar:target/jme-audio.jar:target/jme.jar
 
 export JAVA_HOME=/usr/lib/jvm/default-java
+export CLASSPATH
 
 %:
 	dh --with javahelper $@


hooks/post-receive
-- 
jme - high performance scenegraph based graphics java API

