[SCM] lwjgl - Lightweight Java Game Library branch, master, updated. upstream/2.5+dfsg-29-ge6d766c
Michael Gilbert
gilbert-guest at alioth.debian.org
Fri May 6 21:53:08 UTC 2011
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 "lwjgl - Lightweight Java Game Library".
The branch, master has been updated
via e6d766cd130c572d07a1359a4a0fb956b0e43fad (commit)
via 4bb77ba7e0361e92a701da82d2e1e6578226308d (commit)
via 24b9a3bf6b4ffda8d09dee2ef289499be9b40b7a (commit)
via f84affb646a67ff41bd633a49049d447fc868136 (commit)
via 9203f4f425cafc78afc7e49fada5b1cf7e94e84b (commit)
from 535be6523e82cf8f350ddaf47517101d53465c2f (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 e6d766cd130c572d07a1359a4a0fb956b0e43fad
Author: Michael Gilbert <michael.s.gilbert at gmail.com>
Date: Fri May 6 17:50:32 2011 -0400
fix lintian missing-classpath warning
commit 4bb77ba7e0361e92a701da82d2e1e6578226308d
Author: Michael Gilbert <michael.s.gilbert at gmail.com>
Date: Fri May 6 17:43:52 2011 -0400
remove automatically generated file
commit 24b9a3bf6b4ffda8d09dee2ef289499be9b40b7a
Author: Michael Gilbert <michael.s.gilbert at gmail.com>
Date: Fri May 6 16:47:41 2011 -0400
update changelog
commit f84affb646a67ff41bd633a49049d447fc868136
Author: Michael Gilbert <michael.s.gilbert at gmail.com>
Date: Fri May 6 16:46:39 2011 -0400
build-depend on jutils and not on javahelper
commit 9203f4f425cafc78afc7e49fada5b1cf7e94e84b
Author: Michael Gilbert <michael.s.gilbert at gmail.com>
Date: Fri May 6 16:22:48 2011 -0400
streamline dependencies and remove sun-java-6 as a build-depends
-----------------------------------------------------------------------
Summary of changes:
debian/changelog | 2 ++
debian/control | 27 ++++++++++++++++++++-------
debian/liblwjgl-java-doc.doc-base.javadoc | 9 ---------
debian/patches/p/systemjinput.diff | 24 ++++++++++++++++++++----
debian/patches/series | 8 ++++----
debian/rules | 1 +
6 files changed, 47 insertions(+), 24 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index e91b3a9..fca7eb9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ lwjgl (2.7.1+dfsg-1) UNRELEASED; urgency=low
* new upstream release:
- refresh debian patches.
* add myself as an uploader.
+ * build-depend on jutils
+ * don't build-depend on javahelper or sun-java-6
-- Michael Gilbert <michael.s.gilbert at gmail.com> Sun, 03 Apr 2011 16:50:25 -0400
diff --git a/debian/control b/debian/control
index d424144..1d83ca8 100644
--- a/debian/control
+++ b/debian/control
@@ -3,9 +3,17 @@ Section: java
Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
Uploaders: Gabriele Giacone <1o5g4r8o at gmail.com>, Michael Gilbert <michael.s.gilbert at gmail.com>
-Build-Depends: debhelper (>= 7.0.50~), javahelper, ant, ant-optional,
- openjdk-6-jdk | sun-java6-jdk, libjinput-java, libxrandr-dev, libxxf86vm-dev,
- libxcursor-dev, libxt-dev
+Build-Depends:
+ debhelper (>= 8),
+ ant,
+ ant-optional,
+ openjdk-6-jdk,
+ libjinput-java,
+ libjutils-java,
+ libxrandr-dev,
+ libxxf86vm-dev,
+ libxcursor-dev,
+ libxt-dev
Build-Depends-Indep: default-jdk-doc
Standards-Version: 3.9.1
Vcs-Git: git://git.debian.org/pkg-java/lwjgl.git
@@ -15,8 +23,10 @@ DM-Upload-Allowed: yes
Package: liblwjgl-java
Architecture: all
-Depends: ${misc:Depends}, libjinput-java, liblwjgl-java-jni
- (>= ${source:Version})
+Depends:
+ ${misc:Depends},
+ libjinput-java,
+ liblwjgl-java-jni (>= ${source:Version})
Description: Lightweight Java Game Library
The Lightweight Java Game Library (LWJGL) is a solution aimed directly at
professional and amateur Java programmers alike to enable commercial quality
@@ -28,7 +38,9 @@ Description: Lightweight Java Game Library
Package: liblwjgl-java-jni
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends:
+ ${shlibs:Depends},
+ ${misc:Depends}
Description: Lightweight Java Game Library (jni)
The Lightweight Java Game Library (LWJGL) is a solution aimed directly at
professional and amateur Java programmers alike to enable commercial quality
@@ -43,7 +55,8 @@ Description: Lightweight Java Game Library (jni)
Package: liblwjgl-java-doc
Architecture: all
Section: doc
-Depends: ${misc:Depends}
+Depends:
+ ${misc:Depends}
Suggests: liblwjgl-java
Recommends: default-jdk-doc
Description: Lightweight Java Game Library (javadoc)
diff --git a/debian/liblwjgl-java-doc.doc-base.javadoc b/debian/liblwjgl-java-doc.doc-base.javadoc
deleted file mode 100644
index b23c144..0000000
--- a/debian/liblwjgl-java-doc.doc-base.javadoc
+++ /dev/null
@@ -1,9 +0,0 @@
-Document: liblwjgl-java-doc
-Title: API JavaDoc for liblwjgl-java-doc
-Author:
-Abstract: This the API JavaDoc for liblwjgl-java-doc
-Section: Programming
-
-Format: HTML
-Index: /usr/share/doc/liblwjgl-java-doc/api
-Files: /usr/share/doc/liblwjgl-java-doc/api/*.html
diff --git a/debian/patches/p/systemjinput.diff b/debian/patches/p/systemjinput.diff
index e730dbd..db7eccf 100644
--- a/debian/patches/p/systemjinput.diff
+++ b/debian/patches/p/systemjinput.diff
@@ -9,11 +9,27 @@ Signed-off-by: Gabriele Giacone <1o5g4r8o at gmail.com>
build.xml | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
-Index: lwjgl-2.7.1+dfsg/build.xml
+Index: lwjgl/build.xml
===================================================================
---- lwjgl-2.7.1+dfsg.orig/build.xml 2011-03-26 14:19:35.000000000 -0400
-+++ lwjgl-2.7.1+dfsg/build.xml 2011-03-26 14:21:11.000000000 -0400
-@@ -501,7 +501,7 @@
+--- lwjgl.orig/build.xml 2011-05-06 17:45:23.000000000 -0400
++++ lwjgl/build.xml 2011-05-06 17:48:12.000000000 -0400
+@@ -137,6 +137,7 @@
+ <fileset refid="lwjgl.fileset" />
+ <manifest>
+ <attribute name="Sealed" value="true"/>
++ <attribute name="Class-Path" value="/usr/share/java/jinput.jar /usr/share/java/jutils.jar"/>
+ </manifest>
+ </jar>
+
+@@ -146,6 +147,7 @@
+ <fileset refid="lwjgl_util_applet.fileset" />
+ <manifest>
+ <attribute name="Sealed" value="true"/>
++ <attribute name="Class-Path" value="/usr/share/java/jinput.jar /usr/share/java/jutils.jar"/>
+ </manifest>
+ </jar>
+
+@@ -501,7 +503,7 @@
<os name="Mac OS X" />
</condition>
<property name="native_path_expanded" location="${native_path}"/>
diff --git a/debian/patches/series b/debian/patches/series
index a0dc26b..dfde19f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,4 @@
-p/nomacosx.diff -p1
-p/allarchs.diff -p1
-p/systemjinput.diff -p1
-p/javadoc.diff -p1
+p/nomacosx.diff
+p/allarchs.diff
+p/systemjinput.diff
+p/javadoc.diff
diff --git a/debian/rules b/debian/rules
index a558659..0d539d4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -25,6 +25,7 @@ override_dh_auto_clean:
rm -rf src/native/generated/* src/generated/*
rm -rf doc/javadoc bin temp
rm -f libs/*.jar libs/linux/*
+ rm -f debian/liblwjgl-java-doc.doc-base.javadoc
get-orig-source:
rm -f $(TAR)
hooks/post-receive
--
lwjgl - Lightweight Java Game Library
More information about the pkg-java-commits
mailing list