[SCM] SVGSalamander: SVG Library for Java branch, master, updated. 3493c6d6a77d4f902b59c0eb10e68417454422cb
Nicolas Dandrimont
dandrimont-guest at alioth.debian.org
Sat Mar 26 21:21:49 UTC 2011
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "SVGSalamander: SVG Library for Java".
The branch, master has been updated
via 3493c6d6a77d4f902b59c0eb10e68417454422cb (commit)
via f9988ba9718d056d258e5753fe3e40532f2bd90d (commit)
via 2e80aa58d8c5ebded4db1f0fa6cb7a799bbc9c06 (commit)
via 4260aaeea7a34e2db586a94b37f5d1396bceaadb (commit)
via 5fb8f375fa9d048c9ca23de037e56fe6610a08d6 (commit)
from 9b27299bd1c6d09386f49bd77c61dbfde5b67e55 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 3493c6d6a77d4f902b59c0eb10e68417454422cb
Author: Nicolas Dandrimont <Nicolas.Dandrimont at crans.org>
Date: Sat Mar 26 22:20:49 2011 +0100
Add Maven information to libsvgsalamander-java.
commit f9988ba9718d056d258e5753fe3e40532f2bd90d
Merge: 4260aae 2e80aa5
Author: Nicolas Dandrimont <Nicolas.Dandrimont at crans.org>
Date: Sat Mar 19 12:04:11 2011 +0100
Merge commit 'upstream/0095'
commit 4260aaeea7a34e2db586a94b37f5d1396bceaadb
Author: Nicolas Dandrimont <Nicolas.Dandrimont at crans.org>
Date: Sat Mar 19 12:03:15 2011 +0100
Import new upstream SVN snapshot
commit 5fb8f375fa9d048c9ca23de037e56fe6610a08d6
Author: Nicolas Dandrimont <Nicolas.Dandrimont at crans.org>
Date: Mon Mar 7 00:28:20 2011 +0100
Add patch to disable use of the embedded batik code copy
-----------------------------------------------------------------------
Summary of changes:
debian/changelog | 6 +
debian/control | 2 +-
debian/libsvgsalamander-java.poms | 1 +
...awt-gradient-instead-of-the-embedded-bati.patch | 154 ++++++++++++++
debian/patches/series | 1 +
debian/rules | 2 +-
svg-core/pom.xml | 222 ++++++++++++++++++++
.../src/main/java/com/kitfox/svg/SVGLoader.java | 5 +-
8 files changed, 390 insertions(+), 3 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index fb8e3e9..43222c1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+svgsalamander (0095-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Nicolas Dandrimont <nicolas.dandrimont at crans.org> Sat, 19 Mar 2011 12:01:26 +0100
+
svgsalamander (0089-1) unstable; urgency=low
* New upstream release
diff --git a/debian/control b/debian/control
index 21b028b..5bcf269 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: svgsalamander
Priority: extra
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
Uploaders: Nicolas Dandrimont <nicolas.dandrimont at crans.org>
-Build-Depends: debhelper (>= 7.0.50~), javahelper
+Build-Depends: debhelper (>= 7.0.50~), javahelper, maven-repo-helper
Build-Depends-Indep: default-jdk, default-jdk-doc, ant, ant-optional, ant-doc, javacc
Standards-Version: 3.9.1
Section: java
diff --git a/debian/libsvgsalamander-java.poms b/debian/libsvgsalamander-java.poms
new file mode 100644
index 0000000..45fe5e5
--- /dev/null
+++ b/debian/libsvgsalamander-java.poms
@@ -0,0 +1 @@
+svg-core/pom.xml
diff --git a/debian/patches/0004-Use-system-awt-gradient-instead-of-the-embedded-bati.patch b/debian/patches/0004-Use-system-awt-gradient-instead-of-the-embedded-bati.patch
new file mode 100644
index 0000000..0bdb6b0
--- /dev/null
+++ b/debian/patches/0004-Use-system-awt-gradient-instead-of-the-embedded-bati.patch
@@ -0,0 +1,154 @@
+From: Nicolas Dandrimont <Nicolas.Dandrimont at crans.org>
+Date: Mon, 7 Mar 2011 00:13:13 +0100
+Subject: Use system awt gradient instead of the embedded batik code copy
+
+Upstream embeds batik as a backwards-compatibility measure, as the
+Gradient classes used were added to java.awt in JDK6.
+---
+ .../main/java/com/kitfox/svg/LinearGradient.java | 21 ++++++++-----------
+ .../main/java/com/kitfox/svg/RadialGradient.java | 21 ++++++++-----------
+ 2 files changed, 18 insertions(+), 24 deletions(-)
+
+diff --git a/svg-core/src/main/java/com/kitfox/svg/LinearGradient.java b/svg-core/src/main/java/com/kitfox/svg/LinearGradient.java
+index 06a1503..bdfe724 100644
+--- a/svg-core/src/main/java/com/kitfox/svg/LinearGradient.java
++++ b/svg-core/src/main/java/com/kitfox/svg/LinearGradient.java
+@@ -34,9 +34,6 @@ import java.awt.*;
+ import com.kitfox.svg.xml.*;
+ import org.xml.sax.*;
+
+-//import org.apache.batik.ext.awt.*;
+-import com.kitfox.svg.batik.*;
+-
+
+ /**
+ * @author Mark McKay
+@@ -95,32 +92,32 @@ public class LinearGradient extends Gradient {
+
+ public Paint getPaint(Rectangle2D bounds, AffineTransform xform)
+ {
+- com.kitfox.svg.batik.MultipleGradientPaint.CycleMethodEnum method;
++ MultipleGradientPaint.CycleMethod method;
+ switch (spreadMethod)
+ {
+ default:
+ case SM_PAD:
+- method = com.kitfox.svg.batik.MultipleGradientPaint.NO_CYCLE;
++ method = MultipleGradientPaint.CycleMethod.NO_CYCLE;
+ break;
+ case SM_REPEAT:
+- method = com.kitfox.svg.batik.MultipleGradientPaint.REPEAT;
++ method = MultipleGradientPaint.CycleMethod.REPEAT;
+ break;
+ case SM_REFLECT:
+- method = com.kitfox.svg.batik.MultipleGradientPaint.REFLECT;
++ method = MultipleGradientPaint.CycleMethod.REFLECT;
+ break;
+ }
+
+- com.kitfox.svg.batik.LinearGradientPaint paint;
++ LinearGradientPaint paint;
+ if (gradientUnits == GU_USER_SPACE_ON_USE)
+ {
+ // paint = new LinearGradientPaint(x1, y1, x2, y2, getStopFractions(), getStopColors(), method);
+- paint = new com.kitfox.svg.batik.LinearGradientPaint(
++ paint = new LinearGradientPaint(
+ new Point2D.Float(x1, y1),
+ new Point2D.Float(x2, y2),
+ getStopFractions(),
+ getStopColors(),
+ method,
+- com.kitfox.svg.batik.MultipleGradientPaint.SRGB,
++ MultipleGradientPaint.ColorSpaceType.SRGB,
+ gradientTransform);
+ }
+ else
+@@ -137,13 +134,13 @@ public class LinearGradient extends Gradient {
+
+ viewXform.concatenate(gradientTransform);
+
+- paint = new com.kitfox.svg.batik.LinearGradientPaint(
++ paint = new LinearGradientPaint(
+ new Point2D.Float(x1, y1),
+ new Point2D.Float(x2, y2),
+ getStopFractions(),
+ getStopColors(),
+ method,
+- com.kitfox.svg.batik.MultipleGradientPaint.SRGB,
++ MultipleGradientPaint.ColorSpaceType.SRGB,
+ viewXform);
+ }
+
+diff --git a/svg-core/src/main/java/com/kitfox/svg/RadialGradient.java b/svg-core/src/main/java/com/kitfox/svg/RadialGradient.java
+index 37b9414..52521cc 100644
+--- a/svg-core/src/main/java/com/kitfox/svg/RadialGradient.java
++++ b/svg-core/src/main/java/com/kitfox/svg/RadialGradient.java
+@@ -34,9 +34,6 @@ import java.awt.*;
+ import com.kitfox.svg.xml.*;
+ import org.xml.sax.*;
+
+-//import org.apache.batik.ext.awt.*;
+-import com.kitfox.svg.batik.*;
+-
+
+ /**
+ * @author Mark McKay
+@@ -101,33 +98,33 @@ public class RadialGradient extends Gradient {
+
+ public Paint getPaint(Rectangle2D bounds, AffineTransform xform)
+ {
+- com.kitfox.svg.batik.MultipleGradientPaint.CycleMethodEnum method;
++ MultipleGradientPaint.CycleMethod method;
+ switch (spreadMethod)
+ {
+ default:
+ case SM_PAD:
+- method = com.kitfox.svg.batik.MultipleGradientPaint.NO_CYCLE;
++ method = MultipleGradientPaint.CycleMethod.NO_CYCLE;
+ break;
+ case SM_REPEAT:
+- method = com.kitfox.svg.batik.MultipleGradientPaint.REPEAT;
++ method = MultipleGradientPaint.CycleMethod.REPEAT;
+ break;
+ case SM_REFLECT:
+- method = com.kitfox.svg.batik.MultipleGradientPaint.REFLECT;
++ method = MultipleGradientPaint.CycleMethod.REFLECT;
+ break;
+ }
+
+- com.kitfox.svg.batik.RadialGradientPaint paint;
++ RadialGradientPaint paint;
+
+ if (gradientUnits == GU_USER_SPACE_ON_USE)
+ {
+- paint = new com.kitfox.svg.batik.RadialGradientPaint(
++ paint = new RadialGradientPaint(
+ new Point2D.Float(cx, cy),
+ r,
+ new Point2D.Float(fx, fy),
+ getStopFractions(),
+ getStopColors(),
+ method,
+- com.kitfox.svg.batik.MultipleGradientPaint.SRGB,
++ MultipleGradientPaint.ColorSpaceType.SRGB,
+ gradientTransform);
+ }
+ else
+@@ -138,14 +135,14 @@ public class RadialGradient extends Gradient {
+
+ viewXform.concatenate(gradientTransform);
+
+- paint = new com.kitfox.svg.batik.RadialGradientPaint(
++ paint = new RadialGradientPaint(
+ new Point2D.Float(cx, cy),
+ r,
+ new Point2D.Float(fx, fy),
+ getStopFractions(),
+ getStopColors(),
+ method,
+- com.kitfox.svg.batik.MultipleGradientPaint.SRGB,
++ MultipleGradientPaint.ColorSpaceType.SRGB,
+ viewXform);
+ }
+
+--
diff --git a/debian/patches/series b/debian/patches/series
index acfc071..a1749da 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
0001-Make-build-use-system-libraries.patch
0002-Disable-useless-automated-jar-signing.patch
0003-Modify-javadoc-target-to-add-links-to-system-API-doc.patch
+0004-Use-system-awt-gradient-instead-of-the-embedded-bati.patch
diff --git a/debian/rules b/debian/rules
index 70ea683..54f6924 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,7 +14,7 @@ TARBALL = $(PACKAGE)_$(SRC_VERSION).orig.tar.gz
%:
- dh $@ --with javahelper
+ dh $@ --with javahelper,maven_repo_helper
override_dh_auto_build:
-mkdir $(CURDIR)/svg-core/src/gen/res
diff --git a/svg-core/pom.xml b/svg-core/pom.xml
new file mode 100644
index 0000000..f56f7f9
--- /dev/null
+++ b/svg-core/pom.xml
@@ -0,0 +1,222 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.sonatype.oss</groupId>
+ <artifactId>oss-parent</artifactId>
+ <version>7</version>
+ </parent>
+
+ <!-- TODO Mark: replace with com.kitfox -->
+ <groupId>com.kitfox</groupId>
+ <artifactId>kitfox-svg-salamander</artifactId>
+ <version>1.0.8</version>
+ <packaging>jar</packaging>
+
+ <name>${project.artifactId}</name>
+
+ <description>${project.name} SVGSalamander is a popular, small and fast
+ SVG renderer and animator for Java.</description>
+
+ <!-- TODO Mark: set actual year -->
+ <inceptionYear>2011</inceptionYear>
+
+ <url>http://java.net/projects/svgsalamander</url>
+
+ <organization>
+ <name>Kitfox Studios</name>
+ <url>http://www.kitfox.com/</url>
+ </organization>
+
+ <!-- TODO Mark: replace with your repo url paths -->
+ <scm>
+ <url>http://svgsalamander.java.net/tags/kitfox-svg-salamander-1.0.8</url>
+ <connection>scm:svn:https://svn.java.net/svn/svgsalamander~svn/tags/kitfox-svg-salamander-1.0.8</connection>
+ <developerConnection>scm:svn:https://svn.java.net/svn/svgsalamander~svn/tags/kitfox-svg-salamander-1.0.8</developerConnection>
+ </scm>
+
+ <!-- TODO Mark: replace with your license -->
+ <licenses>
+
+ <license>
+ <name>BSD</name>
+ <url>http://www.opensource.org/licenses/bsd-license.php</url>
+ <distribution>repo</distribution>
+ </license>
+ <license>
+ <name>GNU Lesser General Public License, version 2.1</name>
+ <url>http://www.gnu.org/licenses/lgpl-2.1.html</url>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
+
+ <developers>
+
+ <developer>
+ <id>mark-mckay</id>
+ <name>Mark McKay</name>
+ <email>mark at kitfox.com</email>
+ <roles>
+ <role>owner</role>
+ </roles>
+ <properties>
+ <credits>the creator</credits>
+ </properties>
+ </developer>
+
+ </developers>
+
+ <properties>
+
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+
+ <!-- must be provided by settingx.xml -->
+ <scmServerId>kitfox-source-repo</scmServerId>
+
+ </properties>
+
+ <dependencies>
+
+ <!-- TODO Mark: do you really need to depend on this? -->
+ <dependency>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant</artifactId>
+ <version>1.8.1</version>
+ </dependency>
+
+ </dependencies>
+
+ <build>
+
+ <!-- location of MAIN sources & resources -->
+ <sourceDirectory>${basedir}/src/main/java</sourceDirectory>
+ <resources>
+ <resource>
+ <directory>${basedir}/src/main/res</directory>
+ </resource>
+ </resources>
+
+ <!-- location of TEST sources & resources -->
+ <testSourceDirectory>${basedir}/src/test/java</testSourceDirectory>
+ <testResources>
+ <testResource>
+ <directory>${basedir}/src/test/res</directory>
+ </testResource>
+ </testResources>
+
+ <plugins>
+
+ <!-- generated code: animation parser; see for more settings: http://mojo.codehaus.org/javacc-maven-plugin/javacc-mojo.html -->
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>javacc-maven-plugin</artifactId>
+ <version>2.6</version>
+ <executions>
+ <execution>
+ <id>javacc</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>javacc</goal>
+ </goals>
+ <configuration>
+ <sourceDirectory>${basedir}/src/main/java</sourceDirectory>
+ <includes>
+ <include>**/*.jjt</include>
+ </includes>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ <!-- enforce java version -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>2.3.2</version>
+ <configuration>
+ <source>1.6</source>
+ <target>1.6</target>
+ </configuration>
+ </plugin>
+
+ <!-- enforce maven version -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <version>1.0</version>
+ <executions>
+ <execution>
+ <id>enforce-maven-version</id>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ <configuration>
+ <rules>
+ <requireMavenVersion>
+ <version>[3.0,)</version>
+ <message>you-must-run-maven-3.0-or-above</message>
+ </requireMavenVersion>
+ </rules>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+
+ <plugin>
+ <!-- generate javadoc -->
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.7</version>
+ <configuration>
+ <quiet>true</quiet>
+ <verbose>false</verbose>
+ <links>
+ <show>public</show>
+ <link>http://java.sun.com/javase/1.6.0/docs/api</link>
+ </links>
+ <linksource>true</linksource>
+ <detectLinks>true</detectLinks>
+ <windowtitle>${project.name} API ${project.version} /
+ ${maven.build.timestamp}</windowtitle>
+ <doctitle>${project.name} API ${project.version} /
+ ${maven.build.timestamp}</doctitle>
+ <header><![CDATA[<a href="${project.organization.url}" target="_blank">${project.organization.name}</a>]]></header>
+ <footer><![CDATA[<a href="${project.organization.url}" target="_blank">${project.organization.name}</a>]]></footer>
+ <bottom>
+ <!-- note: these "years" are internal javadoc plugin tags -->
+ Copyright © {inceptionYear}-{currentYear}
+ <![CDATA[<a href="${project.organization.url}" target="_blank">${project.organization.name}</a>]]>.
+ All Rights Reserved.
+ </bottom>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <!-- generate source -->
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ <version>2.1.2</version>
+ <configuration>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <!-- release to sonaytype staging repo -->
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-release-plugin</artifactId>
+ <configuration>
+ <!-- used by release:prepare -->
+ <preparationGoals>clean verify</preparationGoals>
+ <!-- used by release:perform -->
+ <goals>deploy</goals>
+ </configuration>
+ </plugin>
+
+ </plugins>
+
+ </build>
+
+</project>
diff --git a/svg-core/src/main/java/com/kitfox/svg/SVGLoader.java b/svg-core/src/main/java/com/kitfox/svg/SVGLoader.java
index ecace13..c86978d 100644
--- a/svg-core/src/main/java/com/kitfox/svg/SVGLoader.java
+++ b/svg-core/src/main/java/com/kitfox/svg/SVGLoader.java
@@ -168,7 +168,10 @@ public class SVGLoader extends DefaultHandler
{
if (!ignoreClasses.contains(sName))
{
- System.err.println("SVGLoader: Could not identify tag '" + sName + "'");
+ if (verbose)
+ {
+ System.err.println("SVGLoader: Could not identify tag '" + sName + "'");
+ }
}
return;
}
hooks/post-receive
--
SVGSalamander: SVG Library for Java
More information about the pkg-java-commits
mailing list