Author: frankie Date: 2010-04-20 09:36:35 +0000 (Tue, 20 Apr 2010) New Revision: 2836
Added: packages/openjump/trunk/debian/patches/01_unused_sunapi.diff packages/openjump/trunk/debian/patches/02_imageio.patch packages/openjump/trunk/debian/patches/03_icon_scaling.patch packages/openjump/trunk/debian/patches/04_fix_buoy_apichange.patch packages/openjump/trunk/debian/patches/05_jdom1.patch packages/openjump/trunk/debian/watch Modified: packages/openjump/trunk/debian/changelog Log: Added missing patches. Modified: packages/openjump/trunk/debian/changelog =================================================================== --- packages/openjump/trunk/debian/changelog 2010-04-20 09:31:03 UTC (rev 2835) +++ packages/openjump/trunk/debian/changelog 2010-04-20 09:36:35 UTC (rev 2836) @@ -7,6 +7,7 @@ * Added -Djava.net.preferIPv4Stack=true to circumvent the net.ipv6.bindv6only=1 setting currently used in Squeeze. * Revised debian/copyright file to reflect current status of openjump. + * Updated README.source and removed old README.Debian-source. -- Francesco Paolo Lovergine <fran...@debian.org> Tue, 20 Apr 2010 11:25:09 +0200 Added: packages/openjump/trunk/debian/patches/01_unused_sunapi.diff =================================================================== --- packages/openjump/trunk/debian/patches/01_unused_sunapi.diff (rev 0) +++ packages/openjump/trunk/debian/patches/01_unused_sunapi.diff 2010-04-20 09:36:35 UTC (rev 2836) @@ -0,0 +1,27 @@ +Avoid importing SUNs private API. These imports are unused, so there +is no rewrites needed. + +Patch was sent uptream by p...@hungry.com 2006-03-11. + +--- openjump-1.0.orig/src/com/vividsolutions/jump/workbench/datasource/SaveDatasetAsPlugIn.java ++++ openjump-1.0/src/com/vividsolutions/jump/workbench/datasource/SaveDatasetAsPlugIn.java +@@ -35,8 +35,6 @@ + import java.awt.event.WindowEvent; + import java.util.Collection; + +-import sun.security.action.GetLongAction; +- + import com.vividsolutions.jts.util.Assert; + + import com.vividsolutions.jump.I18N; +--- openjump-1.0.orig/src/com/vividsolutions/jump/workbench/JUMPWorkbenchContext.java ++++ openjump-1.0/src/com/vividsolutions/jump/workbench/JUMPWorkbenchContext.java +@@ -35,8 +35,6 @@ + + import javax.swing.JInternalFrame; + +-import sun.security.action.GetBooleanAction; +- + import com.vividsolutions.jump.util.Blackboard; + import com.vividsolutions.jump.workbench.driver.DriverManager; + import com.vividsolutions.jump.workbench.model.LayerManager; Added: packages/openjump/trunk/debian/patches/02_imageio.patch =================================================================== --- packages/openjump/trunk/debian/patches/02_imageio.patch (rev 0) +++ packages/openjump/trunk/debian/patches/02_imageio.patch 2010-04-20 09:36:35 UTC (rev 2836) @@ -0,0 +1,39 @@ +Avoid using SUNs private API. Rewritten to use the public API +available since Java 1.4 instead. Rewrite was done by Wolfgang Baer. + +Patch was sent uptream by p...@hungry.com 2006-03-11. + +--- openjump-1.0.orig/src/org/openjump/io/SIDLayer.java ++++ openjump-1.0/src/org/openjump/io/SIDLayer.java +@@ -52,11 +52,12 @@ + import java.util.Iterator; + import java.util.List; + ++import javax.imageio.ImageIO; ++import javax.imageio.ImageReader; ++import javax.imageio.stream.FileImageInputStream; ++ + import org.openjump.core.ui.plugin.layer.AddSIDLayerPlugIn; + +-import com.sun.image.codec.jpeg.JPEGCodec; +-import com.sun.image.codec.jpeg.JPEGDecodeParam; +-import com.sun.image.codec.jpeg.JPEGImageDecoder; + import com.vividsolutions.jts.geom.Envelope; + import com.vividsolutions.jts.util.Assert; + import com.vividsolutions.jump.I18N; +@@ -291,10 +292,11 @@ + + if (((jpgFile.exists()) && (jpgFile.isFile()) && (jpgFile.canRead()))) + { +- FileInputStream in = new FileInputStream(jpgFilename); +- JPEGImageDecoder decoder = JPEGCodec.createJPEGDecoder(in); +- JPEGDecodeParam dp = decoder.getJPEGDecodeParam(); +- BufferedImage image = decoder.decodeAsBufferedImage(); ++ FileImageInputStream in = new FileImageInputStream(new File(jpgFilename)); ++ ImageReader decoder = (ImageReader) ImageIO.getImageReadersByFormatName("JPEG").next(); ++ decoder.setInput(in); ++ BufferedImage image = decoder.read(0); ++ decoder.dispose(); + in.close(); + + if (!sid_colorspace.equals("GREYSCALE")) Added: packages/openjump/trunk/debian/patches/03_icon_scaling.patch =================================================================== --- packages/openjump/trunk/debian/patches/03_icon_scaling.patch (rev 0) +++ packages/openjump/trunk/debian/patches/03_icon_scaling.patch 2010-04-20 09:36:35 UTC (rev 2836) @@ -0,0 +1,17 @@ +Image.SCALE_SMOOTH is not implemented in GNU Classpath. Use +Image.SCALE_FAST instead when resizing the icon images. + +Patch was sent uptream 2006-04-28 to jump-pilot-devel at +lists.sourceforge.net by Petter Reinholdtsen. + +--- openjump-1.0.orig/src/com/vividsolutions/jump/workbench/ui/GUIUtil.java ++++ openjump-1.0/src/com/vividsolutions/jump/workbench/ui/GUIUtil.java +@@ -676,7 +676,7 @@ + + public static ImageIcon resize(ImageIcon icon, int extent) { + return new ImageIcon(icon.getImage().getScaledInstance(extent, extent, +- Image.SCALE_SMOOTH)); ++ Image.SCALE_FAST)); + } + + /** Added: packages/openjump/trunk/debian/patches/04_fix_buoy_apichange.patch =================================================================== --- packages/openjump/trunk/debian/patches/04_fix_buoy_apichange.patch (rev 0) +++ packages/openjump/trunk/debian/patches/04_fix_buoy_apichange.patch 2010-04-20 09:36:35 UTC (rev 2836) @@ -0,0 +1,20 @@ +diff -Nur openjump-1.0/src/org/openjump/core/ui/plugin/queries/QueryDialog.java openjump-1.0.new/src/org/openjump/core/ui/plugin/queries/QueryDialog.java +--- openjump-1.0/src/org/openjump/core/ui/plugin/queries/QueryDialog.java 2005-10-22 17:00:12.000000000 +0530 ++++ openjump-1.0.new/src/org/openjump/core/ui/plugin/queries/QueryDialog.java 2007-09-24 14:09:43.000000000 +0530 +@@ -140,13 +140,13 @@ + private void initInternal() { + component.addComponentListener(new ComponentAdapter() { + public void componentResized(ComponentEvent ev) { +- if (lastSetSize == null || !lastSetSize.equals(component.getSize())) { +- lastSetSize = null; ++ if (lastSize == null || !lastSize.equals(component.getSize())) { ++ lastSize = null; + layoutChildren(); + QueryDialog.this.dispatchEvent(new WindowResizedEvent(QueryDialog.this)); + } + else +- lastSetSize = null; ++ lastSize = null; + } + }); + ((JDialog) component).setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE); Added: packages/openjump/trunk/debian/patches/05_jdom1.patch =================================================================== --- packages/openjump/trunk/debian/patches/05_jdom1.patch (rev 0) +++ packages/openjump/trunk/debian/patches/05_jdom1.patch 2010-04-20 09:36:35 UTC (rev 2836) @@ -0,0 +1,29 @@ +diff -Nur -x '*.orig' -x '*~' openjump-1.0/src/com/vividsolutions/jump/util/java2xml/Java2XML.java openjump-1.0.new/src/com/vividsolutions/jump/util/java2xml/Java2XML.java +--- openjump-1.0/src/com/vividsolutions/jump/util/java2xml/Java2XML.java 2005-05-03 13:42:56.000000000 -0400 ++++ openjump-1.0.new/src/com/vividsolutions/jump/util/java2xml/Java2XML.java 2009-11-11 14:18:08.000000000 -0500 +@@ -30,6 +30,7 @@ + import org.jdom.Document; + import org.jdom.Element; + import org.jdom.output.XMLOutputter; ++import org.jdom.output.Format; + + import java.io.*; + import java.io.File; +@@ -77,8 +78,7 @@ + write(object, document.getRootElement(), + specElements(object.getClass())); + XMLOutputter xmlOutputter = new XMLOutputter(); +- xmlOutputter.setNewlines(true); +- xmlOutputter.setIndent(true); ++ xmlOutputter.setFormat(Format.getPrettyFormat()); + xmlOutputter.output(document, writer); + } + private void write(final Object object, final Element tag, List specElements) +@@ -202,4 +202,5 @@ + throw new XMLBinderException("Could not find getter named like '" + + field + "' " + fieldClass); + } +-} +\ No newline at end of file ++} ++ Added: packages/openjump/trunk/debian/watch =================================================================== --- packages/openjump/trunk/debian/watch (rev 0) +++ packages/openjump/trunk/debian/watch 2010-04-20 09:36:35 UTC (rev 2836) @@ -0,0 +1,2 @@ +version=3 +http://sf.net/jump-pilot/openjump-src-([\d\.]+)\.zip _______________________________________________ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel