Package: release.debian.org User: release.debian....@packages.debian.org Usertags: unblock Severity: normal
Please consider unblocking/aging lwjgl. There is no version currently in testing due to because of autoremoval related to openjdk bug #765037, which was just fixed about a couple days before the new lwjgl upload. The debdiff from the prior lwjgl version in testing/wheezy is attached. I guess its probably undesirably large due to the packaging modernization and cleanup that had been staged previously. If you want another upload without that, I'll do it. unblock lwjgl/2.7.1+dfsg-4
diff -Nru lwjgl-2.7.1+dfsg/debian/changelog lwjgl-2.7.1+dfsg/debian/changelog --- lwjgl-2.7.1+dfsg/debian/changelog 2012-05-07 15:06:44.000000000 -0400 +++ lwjgl-2.7.1+dfsg/debian/changelog 2014-10-26 20:43:24.000000000 -0400 @@ -1,3 +1,11 @@ +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 <mgilb...@debian.org> Mon, 13 Oct 2014 06:05:00 +0000 + lwjgl (2.7.1+dfsg-3) unstable; urgency=low * add java bin dir to the PATH environment (closes: #664180) diff -Nru lwjgl-2.7.1+dfsg/debian/compat lwjgl-2.7.1+dfsg/debian/compat --- lwjgl-2.7.1+dfsg/debian/compat 2012-05-07 14:41:00.000000000 -0400 +++ lwjgl-2.7.1+dfsg/debian/compat 2014-10-26 20:05:02.000000000 -0400 @@ -1 +1 @@ -7 +9 diff -Nru lwjgl-2.7.1+dfsg/debian/control lwjgl-2.7.1+dfsg/debian/control --- lwjgl-2.7.1+dfsg/debian/control 2012-05-07 14:45:05.000000000 -0400 +++ lwjgl-2.7.1+dfsg/debian/control 2014-10-26 20:42:09.000000000 -0400 @@ -6,11 +6,11 @@ Gabriele Giacone <1o5g4...@gmail.com>, Michael Gilbert <mgilb...@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,13 +18,10 @@ libxt-dev, Build-Depends-Indep: default-jdk-doc, -Build-Conflicts: - binutils-gold, -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/ -DM-Upload-Allowed: yes +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 -Nru lwjgl-2.7.1+dfsg/debian/copyright lwjgl-2.7.1+dfsg/debian/copyright --- lwjgl-2.7.1+dfsg/debian/copyright 2012-05-07 13:33:31.000000000 -0400 +++ lwjgl-2.7.1+dfsg/debian/copyright 2014-10-26 20:43:48.000000000 -0400 @@ -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 <i...@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 @@ Files: ./src/native/common/extgl.c ./src/native/windows/extgl_wgl.c Copyright: 2001-2002, Lev Povalahev <l...@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 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. Files: debian/* -Copyright: 2010, Gabriele Giacone <1o5g4...@gmail.com> -License: BSD +Copyright: + 2010 Gabriele Giacone <1o5g4...@gmail.com> + 2011-2014 Michael Gilbert <mgilb...@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 -Nru lwjgl-2.7.1+dfsg/debian/patches/allarchs.patch lwjgl-2.7.1+dfsg/debian/patches/allarchs.patch --- lwjgl-2.7.1+dfsg/debian/patches/allarchs.patch 1969-12-31 19:00:00.000000000 -0500 +++ lwjgl-2.7.1+dfsg/debian/patches/allarchs.patch 2014-10-26 20:37:01.000000000 -0400 @@ -0,0 +1,73 @@ +Author: Gabriele Giacone <1o5g4...@gmail.com> +Description: support for building on all architectures + +--- 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 -lXcursor -lXrandr -lXxf86vm -L${java.home}/lib/${os.arch}" /> + <property name="cflags32" value="-O2 -Wall -c -fPIC -std=c99 -Wunused"/> + + <target name="clean"> + <delete> + <fileset dir="x32"/> + <fileset dir="x64"/> ++ <fileset dir="deb"/> + <fileset dir="." includes="*.o"/> + <fileset dir="." includes="*.so"/> + </delete> +@@ -41,6 +43,7 @@ + + <property name="linker_flags32" value="${version_script_flags32} -shared -O2 -Wall -o ${libname32} ${libs32} ${xf86vm_lib}"/> + <property name="linker_flags64" value="${version_script_flags64} -shared -O2 -Wall -o ${libname64} ${libs64} ${xf86vm_lib}"/> ++ <property name="linker_flagsdeb" value="${version_script_flags32} -shared -O2 -Wall -o ${libname32} ${libs} ${xf86vm_lib}"/> + + <condition property="build.32bit.only"> + <not> +@@ -59,8 +62,11 @@ + </and> + </condition> + +- <antcall target="compile32"/> +- <antcall target="compile64"/> ++ <condition property="build.debian"> ++ <os name="Linux" /> ++ </condition> ++ ++ <antcall target="compiledeb" /> + </target> + + <target name="compile32" unless="build.64bit.only"> +@@ -114,4 +120,30 @@ + <fileset file="${libname64}"/> + </apply> + </target> ++ ++ <target name="compiledeb"> ++ <mkdir dir="deb"/> ++ <apply dir="deb" executable="gcc" skipemptyfilesets="true" failonerror="true"> ++ <arg line="${cflags32} ${cflags_pthread}"/> ++ <arg value="-I${java.home}/include"/> ++ <arg value="-I${java.home}/include/linux"/> ++ <arg value="-I${java.home}/../include"/> ++ <arg value="-I${java.home}/../include/linux"/> ++ <arg value="-I${java.home}/../include/solaris"/> ++ <arg value="-I${native}/common"/> ++ <arg value="-I${native}/linux"/> ++ <mapper type="glob" from="*.c" to="*.o"/> ++ <fileset dir="${native}/linux" includes="*.c"/> ++ <fileset dir="${native}/generated" includes="*.c"/> ++ <fileset dir="${native}/common" includes="*.c"/> ++ </apply> ++ <apply dir="." parallel="true" executable="gcc" failonerror="true"> ++ <srcfile/> ++ <arg line="${linker_flagsdeb}"/> ++ <fileset dir="deb" includes="*.o"/> ++ </apply> ++ <apply dir="." parallel="true" executable="strip" failonerror="true"> ++ <fileset file="${libname32}"/> ++ </apply> ++ </target> + </project> diff -Nru lwjgl-2.7.1+dfsg/debian/patches/javadoc.patch lwjgl-2.7.1+dfsg/debian/patches/javadoc.patch --- lwjgl-2.7.1+dfsg/debian/patches/javadoc.patch 1969-12-31 19:00:00.000000000 -0500 +++ lwjgl-2.7.1+dfsg/debian/patches/javadoc.patch 2014-10-26 20:34:37.000000000 -0400 @@ -0,0 +1,13 @@ +Author: Gabriele Giacone <1o5g4...@gmail.com> +Description: link against system javadoc + +--- 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"> ++ <link href="/usr/share/doc/default-jdk-doc/api/" /> + <fileset refid="lwjgl.javadoc.fileset" /> + <doctitle><![CDATA[<h1>Lightweight Java Game Toolkit</h1>]]></doctitle> + <bottom><![CDATA[<i>Copyright © 2002-2009 lwjgl.org. All Rights Reserved.</i>]]></bottom> diff -Nru lwjgl-2.7.1+dfsg/debian/patches/nomacosx.patch lwjgl-2.7.1+dfsg/debian/patches/nomacosx.patch --- lwjgl-2.7.1+dfsg/debian/patches/nomacosx.patch 1969-12-31 19:00:00.000000000 -0500 +++ lwjgl-2.7.1+dfsg/debian/patches/nomacosx.patch 2014-10-26 20:34:30.000000000 -0400 @@ -0,0 +1,115 @@ +Author: Gabriele Giacone <1o5g4...@gmail.com> +Description: remove references to macosx-related classes + +--- a/build.xml ++++ b/build.xml +@@ -246,7 +246,7 @@ + <class name="org.lwjgl.opengl.WindowsContextImplementation" /> + </javah> + +- <javah classpath="${lwjgl.bin}" destdir="${lwjgl.src.native}/macosx" force="yes"> ++ <!-- <javah classpath="${lwjgl.bin}" destdir="${lwjgl.src.native}/macosx" force="yes"> + <class name="org.lwjgl.MacOSXSysImplementation" /> + <class name="org.lwjgl.opengl.MacOSXMouseEventQueue" /> + <class name="org.lwjgl.opengl.MacOSXCanvasPeerInfo" /> +@@ -254,7 +254,7 @@ + <class name="org.lwjgl.opengl.MacOSXPbufferPeerInfo" /> + <class name="org.lwjgl.opengl.MacOSXDisplay" /> + <class name="org.lwjgl.opengl.MacOSXContextImplementation" /> +- </javah> ++ </javah> --> + + <javah classpath="${lwjgl.bin}" destdir="${lwjgl.src.headers}" force="yes"> + <class name="org.lwjgl.opengl.AWTSurfaceLock" /> +@@ -293,13 +293,13 @@ + </tokenfilter> + </filterchain> + </loadfile> +- <loadfile srcfile="${lwjgl.src}/java/org/lwjgl/MacOSXSysImplementation.java" property="lwjgl.java.macosx.version"> ++ <!-- <loadfile srcfile="${lwjgl.src}/java/org/lwjgl/MacOSXSysImplementation.java" property="lwjgl.java.macosx.version"> + <filterchain> + <tokenfilter> + <containsstring contains="JNI_VERSION ="/> + </tokenfilter> + </filterchain> +- </loadfile> ++ </loadfile> --> + <loadfile srcfile="${lwjgl.src.native}/windows/org_lwjgl_WindowsSysImplementation.h" property="lwjgl.native.windows.version"> + <filterchain> + <tokenfilter> +@@ -314,13 +314,13 @@ + </tokenfilter> + </filterchain> + </loadfile> +- <loadfile srcfile="${lwjgl.src.native}/macosx/org_lwjgl_MacOSXSysImplementation.h" property="lwjgl.native.macosx.version"> ++ <!-- <loadfile srcfile="${lwjgl.src.native}/macosx/org_lwjgl_MacOSXSysImplementation.h" property="lwjgl.native.macosx.version"> + <filterchain> + <tokenfilter> + <containsstring contains="#define org_lwjgl_MacOSXSysImplementation_JNI_VERSION"/> + </tokenfilter> + </filterchain> +- </loadfile> ++ </loadfile> --> + <echo> + lwjgl.java.windows.version = ${lwjgl.java.windows.version} + lwjgl.native.windows.version = ${lwjgl.native.windows.version} +--- a/platform_build/build-applet.xml ++++ b/platform_build/build-applet.xml +@@ -1,7 +1,7 @@ + <project name="applet"> + + <!-- Create our packer task --> +- <taskdef name="pack200" classname="com.sun.tools.apache.ant.pack200.Pack200Task" classpath="platform_build/Pack200Task.jar"/> ++<!-- <taskdef name="pack200" classname="com.sun.tools.apache.ant.pack200.Pack200Task" classpath="platform_build/Pack200Task.jar"/> --> + + <target name="applet"> + <antcall target="-applet"> +--- 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; + +-import com.apple.eio.FileManager; ++//import com.apple.eio.FileManager; + + /** + * +@@ -55,7 +55,7 @@ final class MacOSXSysImplementation exte + + public boolean openURL(String url) { + try { +- FileManager.openURL(url); ++// FileManager.openURL(url); + return true; + } catch (Exception e) { + LWJGLUtil.log("Exception occurred while trying to invoke browser: " + e); +--- 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; + +-import com.apple.eawt.Application; +-import com.apple.eawt.ApplicationAdapter; +-import com.apple.eawt.ApplicationEvent; ++//import com.apple.eawt.Application; ++//import com.apple.eawt.ApplicationAdapter; ++//import com.apple.eawt.ApplicationEvent; + + import static org.lwjgl.opengl.GL11.*; + +@@ -79,11 +79,11 @@ final class MacOSXDisplay implements Dis + try { + AccessController.doPrivileged(new PrivilegedExceptionAction<Object>() { + public Object run() throws Exception { +- Application.getApplication().addApplicationListener(new ApplicationAdapter() { ++/* Application.getApplication().addApplicationListener(new ApplicationAdapter() { + public void handleQuit(ApplicationEvent event) { + doHandleQuit(); + } +- }); ++ }); */ + return null; + } + }); diff -Nru lwjgl-2.7.1+dfsg/debian/patches/p/allarchs.diff lwjgl-2.7.1+dfsg/debian/patches/p/allarchs.diff --- lwjgl-2.7.1+dfsg/debian/patches/p/allarchs.diff 2012-05-07 13:33:31.000000000 -0400 +++ lwjgl-2.7.1+dfsg/debian/patches/p/allarchs.diff 1969-12-31 19:00:00.000000000 -0500 @@ -1,83 +0,0 @@ -From: Gabriele Giacone <1o5g4...@gmail.com> -Subject: [PATCH] p/allarchs - -This patch to build on all archs. - -Signed-off-by: Gabriele Giacone <1o5g4...@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 -@@ -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="cflags32" value="-O2 -Wall -c -fPIC -std=c99 -Wunused"/> - - <target name="clean"> - <delete> - <fileset dir="x32"/> - <fileset dir="x64"/> -+ <fileset dir="deb"/> - <fileset dir="." includes="*.o"/> - <fileset dir="." includes="*.so"/> - </delete> -@@ -41,6 +43,7 @@ - - <property name="linker_flags32" value="${version_script_flags32} -shared -O2 -Wall -o ${libname32} ${libs32} ${xf86vm_lib}"/> - <property name="linker_flags64" value="${version_script_flags64} -shared -O2 -Wall -o ${libname64} ${libs64} ${xf86vm_lib}"/> -+ <property name="linker_flagsdeb" value="${version_script_flags32} -shared -O2 -Wall -o ${libname32} ${libs} ${xf86vm_lib}"/> - - <condition property="build.32bit.only"> - <not> -@@ -59,8 +62,11 @@ - </and> - </condition> - -- <antcall target="compile32"/> -- <antcall target="compile64"/> -+ <condition property="build.debian"> -+ <os name="Linux" /> -+ </condition> -+ -+ <antcall target="compiledeb" /> - </target> - - <target name="compile32" unless="build.64bit.only"> -@@ -114,4 +120,30 @@ - <fileset file="${libname64}"/> - </apply> - </target> -+ -+ <target name="compiledeb"> -+ <mkdir dir="deb"/> -+ <apply dir="deb" executable="gcc" skipemptyfilesets="true" failonerror="true"> -+ <arg line="${cflags32} ${cflags_pthread}"/> -+ <arg value="-I${java.home}/include"/> -+ <arg value="-I${java.home}/include/linux"/> -+ <arg value="-I${java.home}/../include"/> -+ <arg value="-I${java.home}/../include/linux"/> -+ <arg value="-I${java.home}/../include/solaris"/> -+ <arg value="-I${native}/common"/> -+ <arg value="-I${native}/linux"/> -+ <mapper type="glob" from="*.c" to="*.o"/> -+ <fileset dir="${native}/linux" includes="*.c"/> -+ <fileset dir="${native}/generated" includes="*.c"/> -+ <fileset dir="${native}/common" includes="*.c"/> -+ </apply> -+ <apply dir="." parallel="true" executable="gcc" failonerror="true"> -+ <srcfile/> -+ <arg line="${linker_flagsdeb}"/> -+ <fileset dir="deb" includes="*.o"/> -+ </apply> -+ <apply dir="." parallel="true" executable="strip" failonerror="true"> -+ <fileset file="${libname32}"/> -+ </apply> -+ </target> - </project> diff -Nru lwjgl-2.7.1+dfsg/debian/patches/p/javadoc.diff lwjgl-2.7.1+dfsg/debian/patches/p/javadoc.diff --- lwjgl-2.7.1+dfsg/debian/patches/p/javadoc.diff 2012-05-07 13:59:35.000000000 -0400 +++ lwjgl-2.7.1+dfsg/debian/patches/p/javadoc.diff 1969-12-31 19:00:00.000000000 -0500 @@ -1,23 +0,0 @@ -From: Gabriele Giacone <1o5g4...@gmail.com> -Subject: [PATCH] p/javadoc - -This patch links javadoc to system javadoc. - -Signed-off-by: Gabriele Giacone <1o5g4...@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 @@ - <!-- 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"> -+ <link href="/usr/share/doc/default-jdk-doc/api/" /> - <fileset refid="lwjgl.javadoc.fileset" /> - <doctitle><![CDATA[<h1>Lightweight Java Game Toolkit</h1>]]></doctitle> - <bottom><![CDATA[<i>Copyright © 2002-2009 lwjgl.org. All Rights Reserved.</i>]]></bottom> diff -Nru lwjgl-2.7.1+dfsg/debian/patches/p/nomacosx.diff lwjgl-2.7.1+dfsg/debian/patches/p/nomacosx.diff --- lwjgl-2.7.1+dfsg/debian/patches/p/nomacosx.diff 2012-05-07 13:33:31.000000000 -0400 +++ lwjgl-2.7.1+dfsg/debian/patches/p/nomacosx.diff 1969-12-31 19:00:00.000000000 -0500 @@ -1,134 +0,0 @@ -From: Gabriele Giacone <1o5g4...@gmail.com> -Subject: [PATCH] p/nomacosx - -This patch removes references to macosx-related classes. - -Signed-off-by: Gabriele Giacone <1o5g4...@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 -@@ -246,7 +246,7 @@ - <class name="org.lwjgl.opengl.WindowsContextImplementation" /> - </javah> - -- <javah classpath="${lwjgl.bin}" destdir="${lwjgl.src.native}/macosx" force="yes"> -+ <!-- <javah classpath="${lwjgl.bin}" destdir="${lwjgl.src.native}/macosx" force="yes"> - <class name="org.lwjgl.MacOSXSysImplementation" /> - <class name="org.lwjgl.opengl.MacOSXMouseEventQueue" /> - <class name="org.lwjgl.opengl.MacOSXCanvasPeerInfo" /> -@@ -254,7 +254,7 @@ - <class name="org.lwjgl.opengl.MacOSXPbufferPeerInfo" /> - <class name="org.lwjgl.opengl.MacOSXDisplay" /> - <class name="org.lwjgl.opengl.MacOSXContextImplementation" /> -- </javah> -+ </javah> --> - - <javah classpath="${lwjgl.bin}" destdir="${lwjgl.src.headers}" force="yes"> - <class name="org.lwjgl.opengl.AWTSurfaceLock" /> -@@ -293,13 +293,13 @@ - </tokenfilter> - </filterchain> - </loadfile> -- <loadfile srcfile="${lwjgl.src}/java/org/lwjgl/MacOSXSysImplementation.java" property="lwjgl.java.macosx.version"> -+ <!-- <loadfile srcfile="${lwjgl.src}/java/org/lwjgl/MacOSXSysImplementation.java" property="lwjgl.java.macosx.version"> - <filterchain> - <tokenfilter> - <containsstring contains="JNI_VERSION ="/> - </tokenfilter> - </filterchain> -- </loadfile> -+ </loadfile> --> - <loadfile srcfile="${lwjgl.src.native}/windows/org_lwjgl_WindowsSysImplementation.h" property="lwjgl.native.windows.version"> - <filterchain> - <tokenfilter> -@@ -314,13 +314,13 @@ - </tokenfilter> - </filterchain> - </loadfile> -- <loadfile srcfile="${lwjgl.src.native}/macosx/org_lwjgl_MacOSXSysImplementation.h" property="lwjgl.native.macosx.version"> -+ <!-- <loadfile srcfile="${lwjgl.src.native}/macosx/org_lwjgl_MacOSXSysImplementation.h" property="lwjgl.native.macosx.version"> - <filterchain> - <tokenfilter> - <containsstring contains="#define org_lwjgl_MacOSXSysImplementation_JNI_VERSION"/> - </tokenfilter> - </filterchain> -- </loadfile> -+ </loadfile> --> - <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 -@@ -1,7 +1,7 @@ - <project name="applet"> - - <!-- Create our packer task --> -- <taskdef name="pack200" classname="com.sun.tools.apache.ant.pack200.Pack200Task" classpath="platform_build/Pack200Task.jar"/> -+<!-- <taskdef name="pack200" classname="com.sun.tools.apache.ant.pack200.Pack200Task" classpath="platform_build/Pack200Task.jar"/> --> - - <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 @@ - - import java.awt.Toolkit; - --import com.apple.eio.FileManager; -+//import com.apple.eio.FileManager; - - /** - * -@@ -55,7 +55,7 @@ - - public boolean openURL(String url) { - try { -- FileManager.openURL(url); -+// FileManager.openURL(url); - 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 @@ - import org.lwjgl.LWJGLException; - import org.lwjgl.LWJGLUtil; - --import com.apple.eawt.Application; --import com.apple.eawt.ApplicationAdapter; --import com.apple.eawt.ApplicationEvent; -+//import com.apple.eawt.Application; -+//import com.apple.eawt.ApplicationAdapter; -+//import com.apple.eawt.ApplicationEvent; - - import static org.lwjgl.opengl.GL11.*; - -@@ -79,11 +79,11 @@ - try { - AccessController.doPrivileged(new PrivilegedExceptionAction<Object>() { - public Object run() throws Exception { -- Application.getApplication().addApplicationListener(new ApplicationAdapter() { -+/* Application.getApplication().addApplicationListener(new ApplicationAdapter() { - public void handleQuit(ApplicationEvent event) { - doHandleQuit(); - } -- }); -+ }); */ - return null; - } - }); diff -Nru lwjgl-2.7.1+dfsg/debian/patches/p/systemjinput.diff lwjgl-2.7.1+dfsg/debian/patches/p/systemjinput.diff --- lwjgl-2.7.1+dfsg/debian/patches/p/systemjinput.diff 2012-05-07 15:00:55.000000000 -0400 +++ lwjgl-2.7.1+dfsg/debian/patches/p/systemjinput.diff 1969-12-31 19:00:00.000000000 -0500 @@ -1,40 +0,0 @@ -From: Gabriele Giacone <1o5g4...@gmail.com> -Subject: [PATCH] p/systemjinput - -This patch to build against system jinput libraries - -Signed-off-by: Gabriele Giacone <1o5g4...@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 -@@ -137,6 +137,7 @@ - <fileset refid="lwjgl.fileset" /> - <manifest> - <attribute name="Sealed" value="true"/> -+ <attribute name="Class-Path" value="/usr/share/java/jinput.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"/> - </manifest> - </jar> - -@@ -501,7 +503,7 @@ - <os name="Mac OS X" /> - </condition> - <property name="native_path_expanded" location="${native_path}"/> -- <java classname="${test.mainclass}" classpath="res:${lwjgl.lib}/lwjgl.jar:${lwjgl.lib}/lwjgl_util.jar:${lwjgl.lib}/lwjgl_test.jar:${lwjgl.lib}/jinput.jar" fork="true"> -+ <java classname="${test.mainclass}" classpath="res:${lwjgl.lib}/lwjgl.jar:${lwjgl.lib}/lwjgl_util.jar:${lwjgl.lib}/lwjgl_test.jar:/usr/share/java/jinput.jar" fork="true"> - <sysproperty key="org.lwjgl.util.Debug" value="true"/> - <sysproperty key="java.library.path" value="${native_path_expanded}"/> - <arg line="${args}"/> diff -Nru lwjgl-2.7.1+dfsg/debian/patches/series lwjgl-2.7.1+dfsg/debian/patches/series --- lwjgl-2.7.1+dfsg/debian/patches/series 2012-05-07 13:59:35.000000000 -0400 +++ lwjgl-2.7.1+dfsg/debian/patches/series 2014-10-26 20:31:04.000000000 -0400 @@ -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 -Nru lwjgl-2.7.1+dfsg/debian/patches/systemjinput.patch lwjgl-2.7.1+dfsg/debian/patches/systemjinput.patch --- lwjgl-2.7.1+dfsg/debian/patches/systemjinput.patch 1969-12-31 19:00:00.000000000 -0500 +++ lwjgl-2.7.1+dfsg/debian/patches/systemjinput.patch 2014-10-26 20:34:35.000000000 -0400 @@ -0,0 +1,30 @@ +Author: Gabriele Giacone <1o5g4...@gmail.com> +Description: build against system jinput libraries + +--- a/build.xml ++++ b/build.xml +@@ -137,6 +137,7 @@ + <fileset refid="lwjgl.fileset" /> + <manifest> + <attribute name="Sealed" value="true"/> ++ <attribute name="Class-Path" value="/usr/share/java/jinput.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"/> + </manifest> + </jar> + +@@ -501,7 +503,7 @@ + <os name="Mac OS X" /> + </condition> + <property name="native_path_expanded" location="${native_path}"/> +- <java classname="${test.mainclass}" classpath="res:${lwjgl.lib}/lwjgl.jar:${lwjgl.lib}/lwjgl_util.jar:${lwjgl.lib}/lwjgl_test.jar:${lwjgl.lib}/jinput.jar" fork="true"> ++ <java classname="${test.mainclass}" classpath="res:${lwjgl.lib}/lwjgl.jar:${lwjgl.lib}/lwjgl_util.jar:${lwjgl.lib}/lwjgl_test.jar:/usr/share/java/jinput.jar" fork="true"> + <sysproperty key="org.lwjgl.util.Debug" value="true"/> + <sysproperty key="java.library.path" value="${native_path_expanded}"/> + <arg line="${args}"/> diff -Nru lwjgl-2.7.1+dfsg/debian/rules lwjgl-2.7.1+dfsg/debian/rules --- lwjgl-2.7.1+dfsg/debian/rules 2012-05-07 15:00:19.000000000 -0400 +++ lwjgl-2.7.1+dfsg/debian/rules 2014-10-26 20:40:22.000000000 -0400 @@ -6,8 +6,8 @@ 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)
