diff --git a/debian/patches/p/allarchs.diff b/debian/patches/p/allarchs.diff index 400ca86..f7af820 100644 --- a/debian/patches/p/allarchs.diff +++ b/debian/patches/p/allarchs.diff @@ -9,10 +9,10 @@ platform_build/linux_ant/build.xml | 36 ++++++++++++++++++++++++++++++++++-- 1 files changed, 34 insertions(+), 2 deletions(-) -diff --git a/platform_build/linux_ant/build.xml b/platform_build/linux_ant/build.xml -index 7e45c52..2098297 100644 ---- a/platform_build/linux_ant/build.xml -+++ b/platform_build/linux_ant/build.xml +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 @@ @@ -36,20 +36,19 @@ -@@ -58,9 +61,12 @@ - +@@ -59,8 +62,11 @@ -+ -+ -+ -+ - + - - -+ ++ ++ ++ ++ ++ - + @@ -114,4 +120,30 @@ @@ -82,5 +81,3 @@ + + --- -tg: (fcfc69f..) p/allarchs (depends on: master) diff --git a/debian/patches/p/javadoc.diff b/debian/patches/p/javadoc.diff index f83e61c..98424ca 100644 --- a/debian/patches/p/javadoc.diff +++ b/debian/patches/p/javadoc.diff @@ -9,17 +9,15 @@ build.xml | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) -diff --git a/build.xml b/build.xml -index 1c46378..b161b18 100644 ---- a/build.xml -+++ b/build.xml -@@ -490,6 +490,7 @@ +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 @@ - + + Lightweight Java Game Toolkit]]> Copyright © 2002-2009 lwjgl.org. All Rights Reserved.]]> --- -tg: (7c6d807..) p/javadoc (depends on: p/systemjinput) diff --git a/debian/patches/p/nomacosx.diff b/debian/patches/p/nomacosx.diff index 00bb122..632bc95 100644 --- a/debian/patches/p/nomacosx.diff +++ b/debian/patches/p/nomacosx.diff @@ -12,48 +12,64 @@ src/java/org/lwjgl/opengl/MacOSXDisplay.java | 10 +++++----- 4 files changed, 12 insertions(+), 12 deletions(-) -diff --git a/build.xml b/build.xml -index 857af24..842047f 100644 ---- a/build.xml -+++ b/build.xml -@@ -232,7 +232,7 @@ +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 @@ - + - -+ - ++ --> + -@@ -297,13 +297,13 @@ +@@ -293,13 +293,13 @@ - + +- ++ + + + +@@ -314,13 +314,13 @@ + + + - -+ ++ --> lwjgl.java.windows.version = ${lwjgl.java.windows.version} - lwjgl.native.windows.version = ${lwjgl.native.windows.version} -diff --git a/platform_build/build-applet.xml b/platform_build/build-applet.xml -index abf00c9..65fbad8 100644 ---- a/platform_build/build-applet.xml -+++ b/platform_build/build-applet.xml + 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 @@ @@ -61,13 +77,13 @@ - + - + -diff --git a/src/java/org/lwjgl/MacOSXSysImplementation.java b/src/java/org/lwjgl/MacOSXSysImplementation.java -index 8da1e92..8e01d9c 100644 ---- a/src/java/org/lwjgl/MacOSXSysImplementation.java -+++ b/src/java/org/lwjgl/MacOSXSysImplementation.java -@@ -33,7 +33,7 @@ package org.lwjgl; +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; @@ -76,7 +92,7 @@ /** * -@@ -55,7 +55,7 @@ final class MacOSXSysImplementation extends J2SESysImplementation { +@@ -55,7 +55,7 @@ public boolean openURL(String url) { try { @@ -85,11 +101,11 @@ return true; } catch (Exception e) { LWJGLUtil.log("Exception occurred while trying to invoke browser: " + e); -diff --git a/src/java/org/lwjgl/opengl/MacOSXDisplay.java b/src/java/org/lwjgl/opengl/MacOSXDisplay.java -index ea58d0e..5266531 100644 ---- a/src/java/org/lwjgl/opengl/MacOSXDisplay.java -+++ b/src/java/org/lwjgl/opengl/MacOSXDisplay.java -@@ -54,9 +54,9 @@ import org.lwjgl.BufferUtils; +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; @@ -100,11 +116,11 @@ +//import com.apple.eawt.ApplicationAdapter; +//import com.apple.eawt.ApplicationEvent; - final class MacOSXDisplay implements DisplayImplementation { - private static final int PBUFFER_HANDLE_SIZE = 24; -@@ -77,11 +77,11 @@ final class MacOSXDisplay implements DisplayImplementation { + import static org.lwjgl.opengl.GL11.*; + +@@ -79,11 +79,11 @@ try { - AccessController.doPrivileged(new PrivilegedExceptionAction() { + AccessController.doPrivileged(new PrivilegedExceptionAction() { public Object run() throws Exception { - Application.getApplication().addApplicationListener(new ApplicationAdapter() { +/* Application.getApplication().addApplicationListener(new ApplicationAdapter() { @@ -116,5 +132,3 @@ return null; } }); --- -tg: (9d5ff98..) p/nomacosx (depends on: master) diff --git a/debian/patches/p/systemjinput.diff b/debian/patches/p/systemjinput.diff index 52fb56b..e730dbd 100644 --- a/debian/patches/p/systemjinput.diff +++ b/debian/patches/p/systemjinput.diff @@ -9,20 +9,11 @@ build.xml | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) -diff --git a/build.xml b/build.xml -index 842047f..1c46378 100644 ---- a/build.xml -+++ b/build.xml -@@ -339,7 +339,7 @@ - - - -- -+ - - - -@@ -480,7 +480,7 @@ +Index: lwjgl-2.7.1+dfsg/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 @@ @@ -31,5 +22,3 @@ --- -tg: (dbd4cc4..) p/systemjinput (depends on: p/nomacosx)