This is an automated email from the git hooks/post-receive script. apo-guest pushed a commit to branch master in repository h2database.
commit 8913a8b0f8ae5104b5ed3e2f162cf937e0d94bbe Author: Markus Koschany <[email protected]> Date: Wed Nov 11 18:13:24 2015 +0100 Drop 04-jts-compatibility.patch. No longer needed with jts 1.13. --- debian/patches/04-jts-compatibility.patch | 30 ------------------------------ debian/patches/series | 1 - 2 files changed, 31 deletions(-) diff --git a/debian/patches/04-jts-compatibility.patch b/debian/patches/04-jts-compatibility.patch deleted file mode 100644 index 85fd79c..0000000 --- a/debian/patches/04-jts-compatibility.patch +++ /dev/null @@ -1,30 +0,0 @@ -Description: Fix the compatibility with the version of JTS in Debian. To be removed after upgrading to JTS 0.13. -Author: Emmanuel Bourg <[email protected]> -Forwarded: not-needed ---- a/src/main/org/h2/value/ValueGeometry.java -+++ b/src/main/org/h2/value/ValueGeometry.java -@@ -81,7 +81,7 @@ - private static byte[] convertToWKB(Geometry g) { - boolean includeSRID = g.getSRID() != 0; - int dimensionCount = getDimensionCount(g); -- WKBWriter writer = new WKBWriter(dimensionCount, includeSRID); -+ WKBWriter writer = new WKBWriter(dimensionCount/*, includeSRID*/); - return writer.write(g); - } - ---- a/src/test/org/h2/test/db/TestSpatial.java -+++ b/src/test/org/h2/test/db/TestSpatial.java -@@ -116,11 +116,11 @@ - assertEquals(1, rs.getInt(1)); - assertEquals("POLYGON ((1 1, 1 2, 2 2, 1 1))", rs.getString(2)); - GeometryFactory f = new GeometryFactory(); -- Polygon polygon = f.createPolygon(new Coordinate[] { -+ Polygon polygon = f.createPolygon(new com.vividsolutions.jts.geom.LinearRing(new com.vividsolutions.jts.geom.impl.CoordinateArraySequence(new Coordinate[] { - new Coordinate(1, 1), - new Coordinate(1, 2), - new Coordinate(2, 2), -- new Coordinate(1, 1) }); -+ new Coordinate(1, 1) }), f), null); - assertTrue(polygon.equals(rs.getObject(2))); - - rs = stat.executeQuery("select * from test where polygon = " + diff --git a/debian/patches/series b/debian/patches/series index 8a7dcc2..b2567b8 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,3 @@ 01-use-jar-files-from-debian.patch 02-servlet-api-compatibility.patch 03-osgi-compatibility.patch -04-jts-compatibility.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/h2database.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
