[SCM] mac-widgets packaging branch, master, updated. debian/0.9.5+svn369-dfsg1-1-3-ga7cdd54

[Niels Thykier]

The following commit has been merged in the master branch:
commit e119b9cee6718872ea37becb33c4ffcad7039aeb
Author: Niels Thykier <niels at thykier.net>
Date:   Thu Jun 21 15:34:20 2012 +0200

    Fix FTBFS with Java7
    
    Signed-off-by: Niels Thykier <niels at thykier.net>

diff --git a/debian/changelog b/debian/changelog
index 30fb823..b598fcb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+mac-widgets (0.9.5+svn369-dfsg1-2) UNRELEASED; urgency=low
+
+  * Team upload.
+  * Patch source to fix FTBFS with Java7.
+
+ -- Niels Thykier <niels at thykier.net>  Thu, 21 Jun 2012 15:33:18 +0200
+
 mac-widgets (0.9.5+svn369-dfsg1-1) unstable; urgency=low
 
   * Initial release. (Closes: #619327)
diff --git a/debian/patches/java7-compat.diff b/debian/patches/java7-compat.diff
new file mode 100644
index 0000000..5d3d9b2
--- /dev/null
+++ b/debian/patches/java7-compat.diff
@@ -0,0 +1,16 @@
+Description: Explicitly import com.explodingpixels.painter.Painter
+ With Java7 there is also a javax.swing.Painter, which makes "Painter"
+ ambigious without an explicit import.
+
+diff --git a/source/com/explodingpixels/macwidgets/MacButtonFactory.java b/source/com/explodingpixels/macwidgets/MacButtonFactory.java
+index ac05152..1279084 100644
+--- a/source/com/explodingpixels/macwidgets/MacButtonFactory.java
++++ b/source/com/explodingpixels/macwidgets/MacButtonFactory.java
+@@ -2,6 +2,7 @@ package com.explodingpixels.macwidgets;
+ 
+ import com.explodingpixels.macwidgets.plaf.PreferencesTabBarButtonUI;
+ import com.explodingpixels.macwidgets.plaf.UnifiedToolbarButtonUI;
++import com.explodingpixels.painter.Painter;
+ import com.explodingpixels.painter.*;
+ import com.explodingpixels.swingx.EPButton;
+ import com.explodingpixels.widgets.PopdownButton;
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..70a6c86
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+java7-compat.diff

-- 
mac-widgets packaging