[pkg-java] r16272 - in trunk/libiscwt-java/debian: . patches

[Miguel Landaeta]

Author: nomadium-guest
Date: 2012-08-15 02:11:31 +0000 (Wed, 15 Aug 2012)
New Revision: 16272

Added:
   trunk/libiscwt-java/debian/patches/
   trunk/libiscwt-java/debian/patches/java7-compat.patch
   trunk/libiscwt-java/debian/patches/series
Modified:
   trunk/libiscwt-java/debian/changelog
Log:
* Team upload.

[ James Page ]
* Fix FTBFS with openjdk-7 as default-jdk (LP: #888963) (Closes: 678032):
  - d/patches/java7-compat.patch: Update usage of FontManager for Java 7.


Modified: trunk/libiscwt-java/debian/changelog
===================================================================
--- trunk/libiscwt-java/debian/changelog	2012-08-09 13:27:31 UTC (rev 16271)
+++ trunk/libiscwt-java/debian/changelog	2012-08-15 02:11:31 UTC (rev 16272)
@@ -1,3 +1,14 @@
+libiscwt-java (5.3.20100629-3) UNRELEASED; urgency=low
+
+  * Team upload.
+
+  [ James Page ]
+  * Fix FTBFS with openjdk-7 as default-jdk (LP: #888963) (Closes: 678032):
+    - d/patches/java7-compat.patch: Update usage of FontManager for
+      Java 7.
+
+ -- Miguel Landaeta <miguel at miguel.cc>  Tue, 14 Aug 2012 21:05:16 -0430
+
 libiscwt-java (5.3.20100629-2) unstable; urgency=low
 
   [ Miguel Landaeta ]

Added: trunk/libiscwt-java/debian/patches/java7-compat.patch
===================================================================
--- trunk/libiscwt-java/debian/patches/java7-compat.patch	                        (rev 0)
+++ trunk/libiscwt-java/debian/patches/java7-compat.patch	2012-08-15 02:11:31 UTC (rev 16272)
@@ -0,0 +1,16 @@
+Description: Compatibility patch for Java 7
+Origin: http://sourceforge.net/projects/jpodrenderer/forums/forum/841333/topic/5320298
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/libiscwt-java/+bug/888963
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=678032
+
+--- a/src/de/intarsys/cwt/font/FontEnvironment.java	2010-06-25 02:47:34.000000000 -0430
++++ b/src/de/intarsys/cwt/font/FontEnvironment.java	2012-08-14 21:21:18.000000000 -0430
+@@ -102,7 +102,7 @@
+ 		String definition = null;
+ 		// force FontManager initialization
+ 		Font.decode("dummy").getFamily(); //$NON-NLS-1$
+-		definition = FontManager.getFontPath(true);
++		definition = sun.font.SunFontManager.getInstance().getPlatformFontPath(true);
+ 		if (definition == null) {
+ 			return new File[0];
+ 		}

Added: trunk/libiscwt-java/debian/patches/series
===================================================================
--- trunk/libiscwt-java/debian/patches/series	                        (rev 0)
+++ trunk/libiscwt-java/debian/patches/series	2012-08-15 02:11:31 UTC (rev 16272)
@@ -0,0 +1 @@
+java7-compat.patch