[SCM] lwjgl - Lightweight Java Game Library branch, master, updated. upstream/2.5+dfsg-33-g8e15984

[Michael Gilbert]

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  8e15984941d592bbfe790520801a18f19f542094 (commit)
       via  a783cd473d6b368291976bc97653f560c1a3f3ab (commit)
       via  b94afb25310589f105e577af5ab9ba278cd734a5 (commit)
       via  c0830f9108a60ef204aabbb555ef98f4b7ac9af1 (commit)
      from  e6d766cd130c572d07a1359a4a0fb956b0e43fad (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 8e15984941d592bbfe790520801a18f19f542094
Author: Michael Gilbert <michael.s.gilbert at gmail.com>
Date:   Sat May 7 14:04:19 2011 -0400

    automatically unapply patches after build

commit a783cd473d6b368291976bc97653f560c1a3f3ab
Author: Michael Gilbert <michael.s.gilbert at gmail.com>
Date:   Sat May 7 13:59:06 2011 -0400

    drop depends on jutils

commit b94afb25310589f105e577af5ab9ba278cd734a5
Author: Michael Gilbert <michael.s.gilbert at gmail.com>
Date:   Sat May 7 13:45:18 2011 -0400

    use jh_clean

commit c0830f9108a60ef204aabbb555ef98f4b7ac9af1
Author: Michael Gilbert <michael.s.gilbert at gmail.com>
Date:   Sat May 7 13:41:06 2011 -0400

    restore javahelper build-dep

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

Summary of changes:
 debian/changelog            |    4 ++--
 debian/control              |    2 +-
 debian/rules                |    5 ++++-
 debian/source/local-options |    1 +
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index fca7eb9..0e4e939 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,8 @@ lwjgl (2.7.1+dfsg-1) UNRELEASED; urgency=low
   * new upstream release:
     - refresh debian patches.
   * add myself as an uploader.
-  * build-depend on jutils
-  * don't build-depend on javahelper or sun-java-6
+  * don't build-depend on sun-java-6
+  * use jh_clean
 
  -- Michael Gilbert <michael.s.gilbert at gmail.com>  Sun, 03 Apr 2011 16:50:25 -0400
 
diff --git a/debian/control b/debian/control
index 1d83ca8..9c924c8 100644
--- a/debian/control
+++ b/debian/control
@@ -5,11 +5,11 @@ Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.or
 Uploaders: Gabriele Giacone <1o5g4r8o at gmail.com>, Michael Gilbert <michael.s.gilbert at gmail.com>
 Build-Depends:
  debhelper (>= 8),
+ javahelper,
  ant,
  ant-optional,
  openjdk-6-jdk,
  libjinput-java,
- libjutils-java,
  libxrandr-dev,
  libxxf86vm-dev,
  libxcursor-dev,
diff --git a/debian/rules b/debian/rules
index 0d539d4..0ab0f14 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,6 +7,9 @@ TAR     := ../$(NAME)_$(VERSION).orig.tar.gz
 TARDFSG := ../$(NAME)_$(VERSION)+dfsg.orig.tar.gz
 
 export JAVA_HOME=/usr/lib/jvm/java-6-openjdk
+
+# 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)
 export CLASSPATH=/usr/share/java/jinput.jar:/usr/share/java/jutils.jar
 
 %:
@@ -25,7 +28,7 @@ override_dh_auto_clean:
 	rm -rf src/native/generated/* src/generated/*
 	rm -rf doc/javadoc bin temp
 	rm -f libs/*.jar libs/linux/*
-	rm -f debian/liblwjgl-java-doc.doc-base.javadoc
+	jh_clean
 
 get-orig-source:
 	rm -f $(TAR)
diff --git a/debian/source/local-options b/debian/source/local-options
new file mode 100644
index 0000000..4aceb10
--- /dev/null
+++ b/debian/source/local-options
@@ -0,0 +1 @@
+unapply-patches


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