[java-gnome] 16/19: Imported Debian patch 4.1.1-4

[Tony Mancill]

This is an automated email from the git hooks/post-receive script.

tmancill pushed a commit to branch master
in repository java-gnome.

commit bf95c7d3fe44618374cfc430d05ef4cd9078f232
Author: Niels Thykier <niels at thykier.net>
Date:   Mon Jun 18 22:41:02 2012 +0200

    Imported Debian patch 4.1.1-4
---
 debian/changelog                    |  7 +++++++
 debian/patches/02_java7_compat.diff | 32 ++++++++++++++++++++++++++++++++
 debian/patches/series               |  1 +
 3 files changed, 40 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index dde2e66..f154f9f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+java-gnome (4.1.1-4) unstable; urgency=low
+
+  * Team upload.
+  * Pull Java7 compatability patch from Fedora.
+
+ -- Niels Thykier <niels at thykier.net>  Mon, 18 Jun 2012 22:41:02 +0200
+
 java-gnome (4.1.1-3) unstable; urgency=low
 
   * Team upload.
diff --git a/debian/patches/02_java7_compat.diff b/debian/patches/02_java7_compat.diff
new file mode 100644
index 0000000..65fa014
--- /dev/null
+++ b/debian/patches/02_java7_compat.diff
@@ -0,0 +1,32 @@
+Description: Compatability with Java7.
+Origin: http://pkgs.fedoraproject.org/gitweb/?p=java-gnome.git;a=commitdiff;h=4abfc555d053923e270cdff9ff23ce97c00a2ff3#patch1
+
+--- java-gnome-4.1.1/src/bindings/org/gnome/glib/Plumbing.java.orig	2011-07-11 06:34:06.000000000 +0200
++++ java-gnome-4.1.1/src/bindings/org/gnome/glib/Plumbing.java	2011-12-15 21:18:02.130046113 +0100
+@@ -153,7 +153,7 @@
+      * Retrieve an array of appropriate Java Boxeds for the given array of
+      * pointers.
+      */
+-    protected static Boxed[] boxedArrayFor(final Class<?> type, final long[] pointers, Boxed[] boxeds) {
++    protected static Boxed[] boxedArrayFor(final Class<? extends Boxed> type, final long[] pointers, Boxed[] boxeds) {
+         if (pointers == null) {
+             return null;
+         }
+@@ -170,7 +170,7 @@
+      * @throw ClassCastException if the GType pointed by given pointer is not
+      *        a GBoxed.
+      */
+-    protected static Boxed boxedFor(Class<?> type, final long pointer) {
++    protected static Boxed boxedFor(Class<? extends Boxed> type, final long pointer) {
+         Boxed proxy;
+ 
+         if (pointer == 0L) {
+@@ -202,7 +202,7 @@
+      * 
+      * @see #boxedFor(Class, long)
+      */
+-    protected static void fillBoxedArray(Class<?> type, Boxed[] boxeds, long[] pointers) {
++    protected static void fillBoxedArray(Class<? extends Boxed> type, Boxed[] boxeds, long[] pointers) {
+         if (pointers == null) {
+             return;
+         }
diff --git a/debian/patches/series b/debian/patches/series
index 5d7457e..7db5569 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 01_take_screenshots.diff
+02_java7_compat.diff

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/java-gnome.git