diff --git a/debian/changelog b/debian/changelog index 054963d..eda8a3d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,11 @@ -lwjgl (2.4.2+dfsg-4) unstable; urgency=low +lwjgl (2.4.2+dfsg2-1) unstable; urgency=low + * +dfsg2: Removed trailing CRs from sources. * Standards version to 3.9.0. + * Linked javadoc to system javadoc. + * d/copyright: Included full text of BSD license. - -- Gabriele Giacone <1o5g4r8o@gmail.com> Sat, 03 Jul 2010 21:02:15 +0200 + -- Gabriele Giacone <1o5g4r8o@gmail.com> Sun, 04 Jul 2010 17:52:02 +0200 lwjgl (2.4.2+dfsg-3) unstable; urgency=low diff --git a/debian/control b/debian/control index 6578e2c..47adc17 100644 --- a/debian/control +++ b/debian/control @@ -6,6 +6,7 @@ Build-Depends: debhelper (>= 7.0.50~), javahelper, ant, ant-optional, default-jdk, libjinput-java, libxrandr-dev, libxxf86vm-dev, libxcursor-dev, libxt-dev +Build-Depends-Indep: default-jdk-doc Standards-Version: 3.9.0 Vcs-Git: git://git.debian.org/pkg-java/lwjgl.git Vcs-Browser: http://git.debian.org/?p=pkg-java/lwjgl.git @@ -44,6 +45,7 @@ Section: doc Depends: ${misc:Depends} Suggests: liblwjgl-java +Recommends: default-jdk-doc Description: Lightweight Java Game Library (javadoc) The Lightweight Java Game Library (LWJGL) is a solution aimed directly at professional and amateur Java programmers alike to enable commercial quality diff --git a/debian/copyright b/debian/copyright index 293e7c3..d98e1f7 100644 --- a/debian/copyright +++ b/debian/copyright @@ -5,17 +5,77 @@ Copyright: 2002-2010, Lightweight Java Game Library Project 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 'Light Weight Java Game Library' 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: ./src/native/common/extgl.c, ./src/native/windows/extgl_wgl.c Copyright: 2001-2002, Lev Povalahev 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 'Light Weight Java Game Library' 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@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/00nomacosx b/debian/patches/00nomacosx index b855740..a565322 100644 --- a/debian/patches/00nomacosx +++ b/debian/patches/00nomacosx @@ -1,99 +1,99 @@ -Description: Removes references to macosx-related classes. -Author: Gabriele Giacone <1o5g4r8o@gmail.com> - +Description: Removes references to macosx-related classes. +Author: Gabriele Giacone <1o5g4r8o@gmail.com> + --- a/build.xml +++ b/build.xml @@ -234,7 +234,7 @@ - - - -- -+ - - - + + + +- ++ --> + + + @@ -298,13 +298,13 @@ - - - -- -+ - - lwjgl.java.windows.version = ${lwjgl.java.windows.version} - lwjgl.native.windows.version = ${lwjgl.native.windows.version} + + + +- ++ + + 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 @@ - - - -- -+ - - - + + + +- ++ + + + --- a/src/java/org/lwjgl/MacOSXSysImplementation.java +++ b/src/java/org/lwjgl/MacOSXSysImplementation.java @@ -33,7 +33,7 @@ - - import java.awt.Toolkit; - --import com.apple.eio.FileManager; -+//import com.apple.eio.FileManager; - - /** - * + + 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); + + 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.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; - - final class MacOSXDisplay implements DisplayImplementation { - private static final int PBUFFER_HANDLE_SIZE = 24; + 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; + + final class MacOSXDisplay implements DisplayImplementation { + private static final int PBUFFER_HANDLE_SIZE = 24; @@ -77,11 +77,11 @@ - try { - AccessController.doPrivileged(new PrivilegedExceptionAction() { - public Object run() throws Exception { -- Application.getApplication().addApplicationListener(new ApplicationAdapter() { -+/* Application.getApplication().addApplicationListener(new ApplicationAdapter() { - public final void handleQuit(ApplicationEvent event) { - doHandleQuit(); - } -- }); -+ }); */ - return null; - } - }); + try { + AccessController.doPrivileged(new PrivilegedExceptionAction() { + public Object run() throws Exception { +- Application.getApplication().addApplicationListener(new ApplicationAdapter() { ++/* Application.getApplication().addApplicationListener(new ApplicationAdapter() { + public final void handleQuit(ApplicationEvent event) { + doHandleQuit(); + } +- }); ++ }); */ + return null; + } + }); diff --git a/debian/patches/02systemjinput b/debian/patches/02systemjinput index bd80ced..6b6a6dc 100644 --- a/debian/patches/02systemjinput +++ b/debian/patches/02systemjinput @@ -1,23 +1,23 @@ -Description: To find system jinput libraries -Author: Gabriele Giacone <1o5g4r8o@gmail.com> - +Description: To find system jinput libraries +Author: Gabriele Giacone <1o5g4r8o@gmail.com> + --- a/build.xml +++ b/build.xml @@ -340,7 +340,7 @@ - - - -- -+ - - - + + + +- ++ + + + @@ -481,7 +481,7 @@ - - - -- -+ - - - + + + +- ++ + + + diff --git a/debian/patches/03javadoc b/debian/patches/03javadoc new file mode 100644 index 0000000..1091f6f --- /dev/null +++ b/debian/patches/03javadoc @@ -0,0 +1,13 @@ +Description: Upstream changes introduced in version 2.4.2+dfsg-4 +Author: Gabriele Giacone <1o5g4r8o@gmail.com> + +--- lwjgl-2.4.2+dfsg.orig/build.xml ++++ lwjgl-2.4.2+dfsg/build.xml +@@ -491,6 +491,7 @@ + + + ++ + + Lightweight Java Game Toolkit]]> + Copyright © 2002-2009 lwjgl.org. All Rights Reserved.]]> diff --git a/debian/patches/series b/debian/patches/series index 7260f1a..23dbd68 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,4 @@ 00nomacosx 01allarchs 02systemjinput +03javadoc diff --git a/debian/rules b/debian/rules index 27eb2c3..8baf163 100755 --- a/debian/rules +++ b/debian/rules @@ -30,6 +30,7 @@ uscan --verbose --download-version $(VERSION) \ --force-download --repack --no-symlink --rename mkdir $(TMPDIR) && tar -C $(TMPDIR) -zxf $(TAR) && rm $(TAR) + cd $(TMPDIR) && find . -type f -exec fromdos {} \; echo "The following files will not be included in Debian tarball:" cd $(TMPDIR) && find . \( -name '*.class' -o -name '*.jar' \ -o -path './src/generated/*' -o -path './src/native/generated/*' \) \ @@ -37,4 +38,3 @@ ZIP=--best tar --exclude-vcs --exclude src/generated \ --exclude src/native/generated -zcf $(TARDFSG) $(TMPDIR) rm -rf $(TMPDIR) -