[SCM] lwjgl - Lightweight Java Game Library branch, master, updated. debian/2.4.2+dfsg-1-2-g97a61fe

[Gabriele Giacone]

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  97a61fe3fbc34936b0d47da9910fd58ab05d93ad (commit)
       via  7de7e0e81a3c3b81bafe92137ec1c019f169dc0d (commit)
      from  a0c40af9e4b3988a23f01b8cb92d55bb895902d8 (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 97a61fe3fbc34936b0d47da9910fd58ab05d93ad
Merge: 7de7e0e81a3c3b81bafe92137ec1c019f169dc0d a0c40af9e4b3988a23f01b8cb92d55bb895902d8
Author: Gabriele Giacone <1o5g4r8o at gmail.com>
Date:   Tue Jun 1 01:10:47 2010 +0200

    Merge branch 'master' of git+ssh://git.debian.org/git/pkg-java/lwjgl

commit 7de7e0e81a3c3b81bafe92137ec1c019f169dc0d
Author: Gabriele Giacone <1o5g4r8o at gmail.com>
Date:   Tue Jun 1 01:01:31 2010 +0200

    modified clean target to avoid FTBFS on buildd

-----------------------------------------------------------------------

Summary of changes:
 debian/changelog          |    7 +++++++
 debian/control            |    4 ++--
 debian/patches/00nomacosx |   12 ++++++------
 debian/rules              |    3 ++-
 4 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3270060..9a80cf3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+lwjgl (2.4.2+dfsg-2) unstable; urgency=low
+
+  * Fixed clean target. Fixes FTBFS.
+    - Removed quilt from B-D.
+
+ -- Gabriele Giacone <1o5g4r8o at gmail.com>  Tue, 01 Jun 2010 00:25:09 +0200
+
 lwjgl (2.4.2+dfsg-1) unstable; urgency=low
 
   * Initial release. (Closes: #575321)
diff --git a/debian/control b/debian/control
index d3c5bcc..515c665 100644
--- a/debian/control
+++ b/debian/control
@@ -3,8 +3,8 @@ Section: java
 Priority: optional
 Maintainer: Gabriele Giacone <1o5g4r8o at gmail.com>
 Build-Depends: debhelper (>= 7.0.50~), javahelper, ant, ant-optional,
- default-jdk, quilt (>= 0.46-7~), libjinput-java, libxrandr-dev, libxxf86vm-dev,
- libxcursor-dev, libxt-dev
+ default-jdk, libjinput-java, libxrandr-dev, libxxf86vm-dev, libxcursor-dev,
+ libxt-dev
 Standards-Version: 3.8.4
 Vcs-Git: git://git.debian.org/pkg-java/lwjgl.git
 Vcs-Browser: http://git.debian.org/?p=pkg-java/lwjgl.git
diff --git a/debian/patches/00nomacosx b/debian/patches/00nomacosx
index ceaf468..2431eef 100644
--- a/debian/patches/00nomacosx
+++ b/debian/patches/00nomacosx
@@ -37,8 +37,8 @@ Author: Gabriele Giacone <1o5g4r8o at gmail.com>
  		<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

+--- a/platform_build/build-applet.xml
++++ b/platform_build/build-applet.xml
 @@ -1,7 +1,7 @@
  <project name="applet">

  

@@ -48,8 +48,8 @@ Author: Gabriele Giacone <1o5g4r8o at gmail.com>
  

  	<target name="applet" depends="all">

  		<antcall target="-applet">

---- a/src/java/org/lwjgl/MacOSXSysImplementation.java

-+++ b/src/java/org/lwjgl/MacOSXSysImplementation.java

+--- 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;

@@ -68,8 +68,8 @@ Author: Gabriele Giacone <1o5g4r8o at gmail.com>
  			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

+--- 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;

diff --git a/debian/rules b/debian/rules
index ae139eb..27eb2c3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -21,7 +21,8 @@ override_dh_auto_install:
 
 override_dh_auto_clean:
 	find src/native/ -name '*org_lwjgl_*.h' -delete
-	dh_quilt_patch && ant clean && dh_quilt_unpatch
+	rm -rf src/native/generated/* src/generated/*
+	rm -rf doc/javadoc bin temp
 	rm -f libs/*.jar libs/linux/*
 
 get-orig-source:


hooks/post-receive
-- 
lwjgl - Lightweight Java Game Library