[DebianGIS-dev] r2828 - in packages/openjump/trunk/debian: . patches
frankie at alioth.debian.org
frankie at alioth.debian.org
Wed Apr 14 16:19:41 UTC 2010
Author: frankie
Date: 2010-04-14 16:19:37 +0000 (Wed, 14 Apr 2010)
New Revision: 2828
Added:
packages/openjump/trunk/debian/README.source
Removed:
packages/openjump/trunk/debian/README.Debian-source
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
Modified:
packages/openjump/trunk/debian/changelog
packages/openjump/trunk/debian/compat
packages/openjump/trunk/debian/control
packages/openjump/trunk/debian/rules
Log:
First changes.
Deleted: packages/openjump/trunk/debian/README.Debian-source
===================================================================
--- packages/openjump/trunk/debian/README.Debian-source 2010-04-14 15:33:02 UTC (rev 2827)
+++ packages/openjump/trunk/debian/README.Debian-source 2010-04-14 16:19:37 UTC (rev 2828)
@@ -1,12 +0,0 @@
-Openjump for Debian
--------------------
-
-As upstream distributes as zip file I had to repackage jump, by
-unzipping it into a openjump-<version> directory and built the
-openjump_<version>.orig.tar.gz:
-
- mkdir openjump-1.0
- cd openjump-1.0
- unzip -a ../OpenJump-1.0-src.zip
- tar zcvf openjump_1.0.orig.tar.gz openjump-1.0
- -- Petter Reinholdtsen <pere at debian.org>, Sat, 11 Feb 2006 22:11:29 +0100
Copied: packages/openjump/trunk/debian/README.source (from rev 2827, packages/openjump/trunk/debian/README.Debian-source)
===================================================================
--- packages/openjump/trunk/debian/README.source (rev 0)
+++ packages/openjump/trunk/debian/README.source 2010-04-14 16:19:37 UTC (rev 2828)
@@ -0,0 +1,17 @@
+Openjump for Debian
+-------------------
+
+As upstream distributes as zip file I had to repackage jump, by
+unzipping it into a openjump-<version> directory and built the
+openjump_<version>.orig.tar.gz:
+
+ mkdir openjump-1.0
+ cd openjump-1.0
+ unzip -a ../OpenJump-1.0-src.zip
+ tar zcvf openjump_1.0.orig.tar.gz openjump-1.0
+
+Note that included jar files needs to be stripped to avoid including
+binary blobs in the orig tarball.
+
+ -- Petter Reinholdtsen <pere at debian.org>, Sat, 11 Feb 2006 22:11:29 +0100
+ -- Francesco Paolo Lovergine <frankie at debian.org>, Wed Apr 14 18:18:45 CEST 2010
Modified: packages/openjump/trunk/debian/changelog
===================================================================
--- packages/openjump/trunk/debian/changelog 2010-04-14 15:33:02 UTC (rev 2827)
+++ packages/openjump/trunk/debian/changelog 2010-04-14 16:19:37 UTC (rev 2828)
@@ -1,3 +1,13 @@
+openjump (1.3.1-1) unstable; urgency=low
+
+ * New upstream long due release. All patches merged.
+ * Policy bumped to 3.8.4, without changes.
+ * Now depending strictly on default-jre.
+ * Added me as uploader.
+ * Added Vcs-* fields to debian/control.
+
+ -- Francesco Paolo Lovergine <frankie at debian.org> Wed, 14 Apr 2010 18:07:10 +0200
+
openjump (1.0-3) unstable; urgency=low
[ Petter Reinholdtsen ]
Modified: packages/openjump/trunk/debian/compat
===================================================================
--- packages/openjump/trunk/debian/compat 2010-04-14 15:33:02 UTC (rev 2827)
+++ packages/openjump/trunk/debian/compat 2010-04-14 16:19:37 UTC (rev 2828)
@@ -1 +1 @@
-5
+7
Modified: packages/openjump/trunk/debian/control
===================================================================
--- packages/openjump/trunk/debian/control 2010-04-14 15:33:02 UTC (rev 2827)
+++ packages/openjump/trunk/debian/control 2010-04-14 16:19:37 UTC (rev 2828)
@@ -2,15 +2,18 @@
Section: contrib/science
Priority: optional
Maintainer: Debian GIS Project <pkg-grass-devel at lists.alioth.debian.org>
-Uploaders: Petter Reinholdtsen <pere at debian.org>, Debian Java maintainers <pkg-java-maintainers at lists.alioth.debian.org>, Kumar Appaiah <akumar at ee.iitm.ac.in>, Varun Hiremath <varunhiremath at gmail.com>
-Build-Depends: debhelper (>= 5), cdbs
+Uploaders: Petter Reinholdtsen <pere at debian.org>, Debian Java maintainers <pkg-java-maintainers at lists.alioth.debian.org>, Kumar Appaiah <akumar at ee.iitm.ac.in>, Varun Hiremath <varunhiremath at gmail.com>, Francesco Paolo Lovergine <frankie at debian.org>
+Build-Depends: debhelper (>= 7), cdbs
Build-Depends-Indep: java-gcj-compat-dev, ant, libjts-java, liblog4j1.2-java, libxerces2-java, libjdom0-java, libjama-java, junit, bsh, libbatik-java, libbuoy-java (>= 1.8)
-Standards-Version: 3.7.2
+Standards-Version: 3.8.4
Homepage: http://jump-pilot.sourceforge.net/
+Vcs-Browser: http://svn.debian.org/viewsvn/pkg-grass/packages/openjump/trunk
+Vcs-Svn: svn://svn.debian.org/svn/pkg-grass/packages/openjump/trunk
Package: openjump
Architecture: all
-Depends: java-gcj-compat | java2-runtime, libjts-java, libjama-java, libjdom0-java, libxerces2-java, bsh, liblog4j1.2-java, junit, libbatik-java, libbuoy-java (>= 1.8)
+Depends: default-jre, libjts-java, libjama-java, libjdom0-java, libxerces2-java, bsh, liblog4j1.2-java, junit,
+ libbatik-java, libbuoy-java (>= 1.8)
Description: Open Java Unified Mapping Platform JUMP
The Open Java Unified Mapping Platform (JUMP) is a GUI-based application
for viewing and processing spatial data. It includes many common spatial
Deleted: packages/openjump/trunk/debian/patches/01_unused_sunapi.diff
===================================================================
--- packages/openjump/trunk/debian/patches/01_unused_sunapi.diff 2010-04-14 15:33:02 UTC (rev 2827)
+++ packages/openjump/trunk/debian/patches/01_unused_sunapi.diff 2010-04-14 16:19:37 UTC (rev 2828)
@@ -1,27 +0,0 @@
-Avoid importing SUNs private API. These imports are unused, so there
-is no rewrites needed.
-
-Patch was sent uptream by pere at 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;
Deleted: packages/openjump/trunk/debian/patches/02_imageio.patch
===================================================================
--- packages/openjump/trunk/debian/patches/02_imageio.patch 2010-04-14 15:33:02 UTC (rev 2827)
+++ packages/openjump/trunk/debian/patches/02_imageio.patch 2010-04-14 16:19:37 UTC (rev 2828)
@@ -1,39 +0,0 @@
-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 pere at 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"))
Deleted: packages/openjump/trunk/debian/patches/03_icon_scaling.patch
===================================================================
--- packages/openjump/trunk/debian/patches/03_icon_scaling.patch 2010-04-14 15:33:02 UTC (rev 2827)
+++ packages/openjump/trunk/debian/patches/03_icon_scaling.patch 2010-04-14 16:19:37 UTC (rev 2828)
@@ -1,17 +0,0 @@
-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));
- }
-
- /**
Modified: packages/openjump/trunk/debian/rules
===================================================================
--- packages/openjump/trunk/debian/rules 2010-04-14 15:33:02 UTC (rev 2827)
+++ packages/openjump/trunk/debian/rules 2010-04-14 16:19:37 UTC (rev 2828)
@@ -8,7 +8,8 @@
JAVA_HOME := /usr/lib/jvm/java-gcj
ANT_HOME := /usr/share/ant
-DEB_ANT_BUILDFILE := debian/openjump-build.xml
+#DEB_ANT_BUILDFILE := debian/openjump-build.xml
+DEB_ANT_BUILDFILE := debian/build.xml
DEB_ANT_BUILD_TARGET := jar
DEB_JARS = $(ANT_HOME)/lib/ant-launcher.jar jts log4j-1.2 \
xercesImpl jdom0 jama junit bsh batik buoy
More information about the Pkg-grass-devel
mailing list