[SCM] jinput - Java Game Controller API branch, master, updated. upstream/20100404-4-g83b1283

[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 "jinput - Java Game Controller API".

The branch, master has been updated
       via  83b1283e746a033ca983566c032b708785b91e89 (commit)
       via  631e19ee7aa01b9f9a1af900ce3c6a35c474ef66 (commit)
       via  f587c25e079072c983a1803c07ccba0903801cc7 (commit)
      from  59aa0dc6259ff90756ee2d96d77b6bb0e804e6ac (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 83b1283e746a033ca983566c032b708785b91e89
Author: Gabriele Giacone <1o5g4r8o at gmail.com>
Date:   Sat May 1 16:53:12 2010 +0200

    added ant-optional as b-d

commit 631e19ee7aa01b9f9a1af900ce3c6a35c474ef66
Author: Gabriele Giacone <1o5g4r8o at gmail.com>
Date:   Sat May 1 16:29:45 2010 +0200

    added d/README.source,+dfsg

commit f587c25e079072c983a1803c07ccba0903801cc7
Author: Gabriele Giacone <1o5g4r8o at gmail.com>
Date:   Sun Apr 18 16:56:21 2010 +0200

    patches description

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

Summary of changes:
 debian/README.source           |   10 ++++++++++
 debian/changelog               |    4 ++--
 debian/control                 |    2 +-
 debian/copyright               |    2 +-
 debian/patches/00build.xml     |   11 ++++++++++-
 debian/patches/01build.xml.jni |    2 +-
 debian/rules                   |    4 ++--
 7 files changed, 27 insertions(+), 8 deletions(-)

diff --git a/debian/README.source b/debian/README.source
new file mode 100644
index 0000000..06b3860
--- /dev/null
+++ b/debian/README.source
@@ -0,0 +1,10 @@
+Information about jinput
+------------------------
+
+ REPACKAGING
+
+ To comply with DFSG, the following binary files have been removed from
+ upstream tarball:
+
+    lib/jutils.jar
+
diff --git a/debian/changelog b/debian/changelog
index b444c0c..23d7fc2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,5 @@
-jinput (2.0.1~cvs20100404-1) unstable; urgency=low
+jinput (2.0.1~cvs20100404+dfsg-1) unstable; urgency=low
 
   * Initial release. (Closes: #509689)
 
- -- Gabriele Giacone <1o5g4r8o at gmail.com>  Sun, 18 Apr 2010 15:10:17 +0200
+ -- Gabriele Giacone <1o5g4r8o at gmail.com>  Sat, 01 May 2010 16:19:47 +0200
diff --git a/debian/control b/debian/control
index 52e39cc..8c1f039 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Gabriele Giacone <1o5g4r8o at gmail.com>
-Build-Depends: debhelper (>= 7.0.50~), javahelper (>= 0.29), ant
+Build-Depends: debhelper (>= 7.0.50~), javahelper (>= 0.29), ant, ant-optional
 Build-Depends-Indep: default-jdk, libjutils-java
 Standards-Version: 3.8.4
 Vcs-Git: git://git.debian.org/pkg-java/jinput.git
diff --git a/debian/copyright b/debian/copyright
index 3f59868..224e7f4 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -6,7 +6,7 @@ Maintainer: David Biesack <djp at dev.java.net>,
   Kenneth Russell <kbr at dev.java.net>,
   Kevin Rushforth <kcr at dev.java.net>,
   Sven Goethel <sgoethel at dev.java.net>
-Source: http://jinput.dev.java.net/source/browse/jutils/
+Source: http://jinput.dev.java.net/source/browse/jinput/
 
 Copyright: 2003-2010, Sun Microsystems, Inc.
 License: BSD
diff --git a/debian/patches/00build.xml b/debian/patches/00build.xml
index 329983c..414f094 100644
--- a/debian/patches/00build.xml
+++ b/debian/patches/00build.xml
@@ -1,8 +1,17 @@
-Description: Upstream changes introduced in version 20100404-1
+Description: Doesn't include removed jar and fixes clean target
 Author: Gabriele Giacone <1o5g4r8o at gmail.com>
 
 --- a/build.xml
 +++ b/build.xml
+@@ -130,7 +130,7 @@
+ 			<fileset dir="plugins/wintab/classes">
+ 				<include name="**/*.class"/>
+ 			</fileset>
+-			<zipfileset src="lib/jutils.jar" includes="**/*.class"/>
++<!--			<zipfileset src="lib/jutils.jar" includes="**/*.class"/>	-->
+ 			<manifest>
+ 				<attribute name="Sealed" value="true"/>
+ 			</manifest>
 @@ -154,7 +154,7 @@
  			<fileset dir="plugins/linux/classes">
  				<include name="**/*.class"/>
diff --git a/debian/patches/01build.xml.jni b/debian/patches/01build.xml.jni
index e0282d7..70adffd 100644
--- a/debian/patches/01build.xml.jni
+++ b/debian/patches/01build.xml.jni
@@ -1,4 +1,4 @@
-Description: Upstream changes introduced in version 2.0.1~cvs20100404-1
+Description: Same binary file name for all archs.
 Author: Gabriele Giacone <1o5g4r8o at gmail.com>
 
 --- jinput-2.0.1~cvs20100404.orig/plugins/linux/build.xml
diff --git a/debian/rules b/debian/rules
index b6b7bee..76630c5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,7 +6,7 @@ export JAVA_HOME=/usr/lib/jvm/default-java
 	dh --with javahelper $@
 
 override_dh_auto_build:
-	cp /usr/share/java/jutils.jar lib
+	mkdir lib && cp /usr/share/java/jutils.jar lib
 	ant simple_linux
 	ant javadoc
 
@@ -17,6 +17,6 @@ override_dh_auto_install:
 		debian/libjinput-jni/usr/lib/jni/libjinput.so
 
 override_dh_auto_clean:
-	rm -f lib/* coreAPI/build.number
+	rm -rf lib coreAPI/build.number
 	find plugins -name 'net_java_games_input_*.h' -delete
 	ant clean


hooks/post-receive
-- 
jinput - Java Game Controller API