[lwjgl] 05/05: release 2.7.1+dfsg-4
Michael Gilbert
mgilbert at moszumanska.debian.org
Mon Oct 27 01:23:27 GMT 2014
This is an automated email from the git hooks/post-receive script.
mgilbert pushed a commit to branch master
in repository lwjgl.
commit 63f2eff8a1ce5ebb1b736987563077b3e02e5548
Author: Michael Gilbert <mgilbert at debian.org>
Date: Sun Oct 26 21:23:12 2014 -0400
release 2.7.1+dfsg-4
---
debian/changelog | 4 +-
debian/compat | 2 +-
debian/control | 12 +++---
debian/copyright | 13 +++---
debian/patches/{p/allarchs.diff => allarchs.patch} | 20 +++------
debian/patches/{p/javadoc.diff => javadoc.patch} | 20 +++------
debian/patches/{p/nomacosx.diff => nomacosx.patch} | 47 +++++++---------------
debian/patches/series | 8 ++--
.../{p/systemjinput.diff => systemjinput.patch} | 18 ++-------
debian/rules | 4 +-
debian/source/local-options | 1 -
11 files changed, 51 insertions(+), 98 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 4572ef5..e2daed6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
-lwjgl (2.7.1+dfsg-4) UNRELEASED; urgency=medium
+lwjgl (2.7.1+dfsg-4) unstable; urgency=low
+ * Update packaging standards.
* Remove binutils-gold build conflict (closes: #749957).
+ * Build-depend openjdk-7 >= 7u71-2.5.3-1 (closes: #761269).
-- Michael Gilbert <mgilbert at debian.org> Mon, 13 Oct 2014 06:05:00 +0000
diff --git a/debian/compat b/debian/compat
index 7f8f011..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+9
diff --git a/debian/control b/debian/control
index 5efad0f..5e72494 100644
--- a/debian/control
+++ b/debian/control
@@ -6,11 +6,11 @@ Uploaders:
Gabriele Giacone <1o5g4r8o at gmail.com>,
Michael Gilbert <mgilbert at debian.org>,
Build-Depends:
- debhelper (>= 8),
+ debhelper (>= 9),
javahelper,
ant,
ant-optional,
- default-jdk,
+ openjdk-7-jdk (>= 7u71-2.5.3),
libjinput-java,
libxrandr-dev,
libxxf86vm-dev,
@@ -18,10 +18,10 @@ Build-Depends:
libxt-dev,
Build-Depends-Indep:
default-jdk-doc,
-Standards-Version: 3.9.3
-Vcs-Git: git://git.debian.org/git/pkg-java/lwjgl.git
-Vcs-Browser: http://git.debian.org/?p=pkg-java/lwjgl.git
-Homepage: http://lwjgl.org/
+Standards-Version: 3.9.6
+Vcs-Git: git://anonscm.debian.org/pkg-java/lwjgl.git
+Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/lwjgl.git
+Homepage: http://lwjgl.org
Package: liblwjgl-java
Architecture: all
diff --git a/debian/copyright b/debian/copyright
index afed6b1..fad49a6 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,11 +1,10 @@
-Format: http://anonscm.debian.org/viewvc/dep/web/deps/dep5.mdwn?revision=202
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0
Upstream-Name: lwjgl - Lightweight Java Game Library
Upstream-Contact: LWJGL developers <info at lwjgl.org>
-Source: http://java-game-lib.svn.sourceforge.net/viewvc/java-game-lib/
Files: *
Copyright: 2002-2010, Lightweight Java Game Library Project
-License: BSD
+License: BSD-3-clause
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are
met:
@@ -31,7 +30,7 @@ License: BSD
Files: ./src/native/common/extgl.c ./src/native/windows/extgl_wgl.c
Copyright: 2001-2002, Lev Povalahev <levp at gmx.net>
-License: BSD
+License: BSD-3-clause
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are
met:
@@ -56,8 +55,10 @@ License: BSD
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
Files: debian/*
-Copyright: 2010, Gabriele Giacone <1o5g4r8o at gmail.com>
-License: BSD
+Copyright:
+ 2010 Gabriele Giacone <1o5g4r8o at gmail.com>
+ 2011-2014 Michael Gilbert <mgilbert at debian.org>
+License: BSD-3-clause
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are
met:
diff --git a/debian/patches/p/allarchs.diff b/debian/patches/allarchs.patch
similarity index 78%
rename from debian/patches/p/allarchs.diff
rename to debian/patches/allarchs.patch
index f7af820..c5ba780 100644
--- a/debian/patches/p/allarchs.diff
+++ b/debian/patches/allarchs.patch
@@ -1,23 +1,13 @@
-From: Gabriele Giacone <1o5g4r8o at gmail.com>
-Subject: [PATCH] p/allarchs
+Author: Gabriele Giacone <1o5g4r8o at gmail.com>
+Description: support for building on all architectures
-This patch to build on all archs.
-
-Signed-off-by: Gabriele Giacone <1o5g4r8o at gmail.com>
-
----
- platform_build/linux_ant/build.xml | 36 ++++++++++++++++++++++++++++++++++--
- 1 files changed, 34 insertions(+), 2 deletions(-)
-
-Index: lwjgl-2.7.1+dfsg/platform_build/linux_ant/build.xml
-===================================================================
---- lwjgl-2.7.1+dfsg.orig/platform_build/linux_ant/build.xml 2011-03-26 14:15:36.000000000 -0400
-+++ lwjgl-2.7.1+dfsg/platform_build/linux_ant/build.xml 2011-03-26 14:20:54.000000000 -0400
+--- a/platform_build/linux_ant/build.xml
++++ b/platform_build/linux_ant/build.xml
@@ -6,12 +6,14 @@
<property name="libname64" value="liblwjgl64.so"/>
<property name="libs32" value="-L/usr/X11R6/lib -L/usr/X11/lib -lm -lX11 -lXext -lXcursor -lXrandr -lpthread -L${java.home}/lib/i386 -ljawt" />
<property name="libs64" value="-L/usr/X11R6/lib64 -L/usr/X11/lib64 -lm -lX11 -lXext -lXcursor -lXrandr -lXxf86vm -lpthread -L${java.home}/lib/amd64 -ljawt" />
-+ <property name="libs" value="-L/usr/X11R6/lib -L/usr/X11/lib -lm -lX11 -lXext -lXcursor -lXrandr -lXxf86vm -lpthread -L${java.home}/lib/${os.arch} -ljawt" />
++ <property name="libs" value="-L/usr/X11R6/lib -L/usr/X11/lib -lm -lX11 -lXcursor -lXrandr -lXxf86vm -L${java.home}/lib/${os.arch}" />
<property name="cflags32" value="-O2 -Wall -c -fPIC -std=c99 -Wunused"/>
<target name="clean">
diff --git a/debian/patches/p/javadoc.diff b/debian/patches/javadoc.patch
similarity index 52%
rename from debian/patches/p/javadoc.diff
rename to debian/patches/javadoc.patch
index 98424ca..f225adf 100644
--- a/debian/patches/p/javadoc.diff
+++ b/debian/patches/javadoc.patch
@@ -1,19 +1,9 @@
-From: Gabriele Giacone <1o5g4r8o at gmail.com>
-Subject: [PATCH] p/javadoc
+Author: Gabriele Giacone <1o5g4r8o at gmail.com>
+Description: link against system javadoc
-This patch links javadoc to system javadoc.
-
-Signed-off-by: Gabriele Giacone <1o5g4r8o at gmail.com>
-
----
- build.xml | 1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-Index: lwjgl-2.7.1+dfsg/build.xml
-===================================================================
---- lwjgl-2.7.1+dfsg.orig/build.xml 2011-03-26 14:21:11.000000000 -0400
-+++ lwjgl-2.7.1+dfsg/build.xml 2011-03-26 14:23:33.000000000 -0400
-@@ -511,6 +511,7 @@
+--- a/build.xml
++++ b/build.xml
+@@ -513,6 +513,7 @@
<!-- Creates the Javadoc -->
<target name="javadoc" description="Creates javadoc from java source code">
<javadoc destdir="${lwjgl.docs}/javadoc" classpath="${lwjgl.lib}/jinput.jar" author="true" version="true" use="true" source="1.5" windowtitle="LWJGL API" useexternalfile="true">
diff --git a/debian/patches/p/nomacosx.diff b/debian/patches/nomacosx.patch
similarity index 66%
rename from debian/patches/p/nomacosx.diff
rename to debian/patches/nomacosx.patch
index 632bc95..c9cbf3f 100644
--- a/debian/patches/p/nomacosx.diff
+++ b/debian/patches/nomacosx.patch
@@ -1,21 +1,8 @@
-From: Gabriele Giacone <1o5g4r8o at gmail.com>
-Subject: [PATCH] p/nomacosx
+Author: Gabriele Giacone <1o5g4r8o at gmail.com>
+Description: remove references to macosx-related classes
-This patch removes references to macosx-related classes.
-
-Signed-off-by: Gabriele Giacone <1o5g4r8o at gmail.com>
-
----
- build.xml | 8 ++++----
- platform_build/build-applet.xml | 2 +-
- src/java/org/lwjgl/MacOSXSysImplementation.java | 4 ++--
- src/java/org/lwjgl/opengl/MacOSXDisplay.java | 10 +++++-----
- 4 files changed, 12 insertions(+), 12 deletions(-)
-
-Index: lwjgl-2.7.1+dfsg/build.xml
-===================================================================
---- lwjgl-2.7.1+dfsg.orig/build.xml 2011-03-26 14:25:06.000000000 -0400
-+++ lwjgl-2.7.1+dfsg/build.xml 2011-03-26 14:25:37.000000000 -0400
+--- a/build.xml
++++ b/build.xml
@@ -246,7 +246,7 @@
<class name="org.lwjgl.opengl.WindowsContextImplementation" />
</javah>
@@ -66,10 +53,8 @@ Index: lwjgl-2.7.1+dfsg/build.xml
<echo>
lwjgl.java.windows.version = ${lwjgl.java.windows.version}
lwjgl.native.windows.version = ${lwjgl.native.windows.version}
-Index: lwjgl-2.7.1+dfsg/platform_build/build-applet.xml
-===================================================================
---- lwjgl-2.7.1+dfsg.orig/platform_build/build-applet.xml 2011-03-26 14:25:06.000000000 -0400
-+++ lwjgl-2.7.1+dfsg/platform_build/build-applet.xml 2011-03-26 14:25:09.000000000 -0400
+--- a/platform_build/build-applet.xml
++++ b/platform_build/build-applet.xml
@@ -1,7 +1,7 @@
<project name="applet">
@@ -79,11 +64,9 @@ Index: lwjgl-2.7.1+dfsg/platform_build/build-applet.xml
<target name="applet">
<antcall target="-applet">
-Index: lwjgl-2.7.1+dfsg/src/java/org/lwjgl/MacOSXSysImplementation.java
-===================================================================
---- lwjgl-2.7.1+dfsg.orig/src/java/org/lwjgl/MacOSXSysImplementation.java 2011-03-26 14:25:06.000000000 -0400
-+++ lwjgl-2.7.1+dfsg/src/java/org/lwjgl/MacOSXSysImplementation.java 2011-03-26 14:25:09.000000000 -0400
-@@ -33,7 +33,7 @@
+--- a/src/java/org/lwjgl/MacOSXSysImplementation.java
++++ b/src/java/org/lwjgl/MacOSXSysImplementation.java
+@@ -33,7 +33,7 @@ package org.lwjgl;
import java.awt.Toolkit;
@@ -92,7 +75,7 @@ Index: lwjgl-2.7.1+dfsg/src/java/org/lwjgl/MacOSXSysImplementation.java
/**
*
-@@ -55,7 +55,7 @@
+@@ -55,7 +55,7 @@ final class MacOSXSysImplementation exte
public boolean openURL(String url) {
try {
@@ -101,11 +84,9 @@ Index: lwjgl-2.7.1+dfsg/src/java/org/lwjgl/MacOSXSysImplementation.java
return true;
} catch (Exception e) {
LWJGLUtil.log("Exception occurred while trying to invoke browser: " + e);
-Index: lwjgl-2.7.1+dfsg/src/java/org/lwjgl/opengl/MacOSXDisplay.java
-===================================================================
---- lwjgl-2.7.1+dfsg.orig/src/java/org/lwjgl/opengl/MacOSXDisplay.java 2011-03-26 14:25:06.000000000 -0400
-+++ lwjgl-2.7.1+dfsg/src/java/org/lwjgl/opengl/MacOSXDisplay.java 2011-03-26 14:25:09.000000000 -0400
-@@ -54,9 +54,9 @@
+--- a/src/java/org/lwjgl/opengl/MacOSXDisplay.java
++++ b/src/java/org/lwjgl/opengl/MacOSXDisplay.java
+@@ -54,9 +54,9 @@ import org.lwjgl.BufferUtils;
import org.lwjgl.LWJGLException;
import org.lwjgl.LWJGLUtil;
@@ -118,7 +99,7 @@ Index: lwjgl-2.7.1+dfsg/src/java/org/lwjgl/opengl/MacOSXDisplay.java
import static org.lwjgl.opengl.GL11.*;
-@@ -79,11 +79,11 @@
+@@ -79,11 +79,11 @@ final class MacOSXDisplay implements Dis
try {
AccessController.doPrivileged(new PrivilegedExceptionAction<Object>() {
public Object run() throws Exception {
diff --git a/debian/patches/series b/debian/patches/series
index dfde19f..a8e2150 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,4 @@
-p/nomacosx.diff
-p/allarchs.diff
-p/systemjinput.diff
-p/javadoc.diff
+nomacosx.patch
+allarchs.patch
+systemjinput.patch
+javadoc.patch
diff --git a/debian/patches/p/systemjinput.diff b/debian/patches/systemjinput.patch
similarity index 69%
rename from debian/patches/p/systemjinput.diff
rename to debian/patches/systemjinput.patch
index cda3943..8bfd80b 100644
--- a/debian/patches/p/systemjinput.diff
+++ b/debian/patches/systemjinput.patch
@@ -1,18 +1,8 @@
-From: Gabriele Giacone <1o5g4r8o at gmail.com>
-Subject: [PATCH] p/systemjinput
+Author: Gabriele Giacone <1o5g4r8o at gmail.com>
+Description: build against system jinput libraries
-This patch to build against system jinput libraries
-
-Signed-off-by: Gabriele Giacone <1o5g4r8o at gmail.com>
-
----
- build.xml | 4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-Index: lwjgl/build.xml
-===================================================================
---- lwjgl.orig/build.xml 2011-05-06 17:45:23.000000000 -0400
-+++ lwjgl/build.xml 2011-05-06 17:48:12.000000000 -0400
+--- a/build.xml
++++ b/build.xml
@@ -137,6 +137,7 @@
<fileset refid="lwjgl.fileset" />
<manifest>
diff --git a/debian/rules b/debian/rules
index 735dc20..036c840 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,8 +6,8 @@ TMPDIR := $(NAME)-$(VERSION)
TAR := ../$(NAME)_$(VERSION).orig.tar.gz
TARDFSG := ../$(NAME)_$(VERSION)+dfsg.orig.tar.gz
-export JAVA_HOME=/usr/lib/jvm/default-java
-export PATH:=${PATH}:${JAVA_HOME}/bin
+export JAVA_HOME=/usr/lib/jvm/java-7-openjdk-$(DEB_BUILD_ARCH)
+export PATH:=$(JAVA_HOME)/bin:$(PATH)
# NOTE: jutils is explicitly included here (without a depends in our control
# file) because jinput.jar lacks jutils in its own "Class-Path" (bug #626002)
diff --git a/debian/source/local-options b/debian/source/local-options
deleted file mode 100644
index 4aceb10..0000000
--- a/debian/source/local-options
+++ /dev/null
@@ -1 +0,0 @@
-unapply-patches
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/lwjgl.git
More information about the pkg-java-commits
mailing list