You are viewing a plain text version of this content. The canonical link for it is here.
Posted to batik-commits@xmlgraphics.apache.org by lb...@apache.org on 2015/03/10 10:58:29 UTC
svn commit: r1665427 - in /xmlgraphics/batik/branches/batik-1_8: KEYS
build.xml
Author: lbernardo
Date: Tue Mar 10 09:58:29 2015
New Revision: 1665427
URL: http://svn.apache.org/r1665427
Log:
merged recent trunk changes
Modified:
xmlgraphics/batik/branches/batik-1_8/KEYS
xmlgraphics/batik/branches/batik-1_8/build.xml
Modified: xmlgraphics/batik/branches/batik-1_8/KEYS
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/batik-1_8/KEYS?rev=1665427&r1=1665426&r2=1665427&view=diff
==============================================================================
--- xmlgraphics/batik/branches/batik-1_8/KEYS (original)
+++ xmlgraphics/batik/branches/batik-1_8/KEYS Tue Mar 10 09:58:29 2015
@@ -220,3 +220,39 @@ numenORuE0/O7DgoihMrYzTTaRBkHLssIzfaPu96
EaWfWeQZ4Q==
=b8+3
-----END PGP PUBLIC KEY BLOCK-----
+pub 2048R/D56B5F17 2012-10-30 [expires: 2017-10-29]
+uid Luis Bernardo <lb...@apache.org>
+sig 3 D56B5F17 2012-10-30 Luis Bernardo <lb...@apache.org>
+sub 2048R/A83AC321 2012-10-30 [expires: 2017-10-29]
+sig D56B5F17 2012-10-30 Luis Bernardo <lb...@apache.org>
+
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1.4.12 (Darwin)
+
+mQENBFCQVQIBCADLgf95foKzcNUQMOoQOz9xtX3V4lYVy797am5GwHD2TdWNCma4
+QzwmcNSbxhOvs1tinYw/RTg7k05TPcinPDdRRrOAzS0NRh4G8rfFhs7j+/Eyz84R
+0lsclF0IXMunbQQP/XQHcTm8huz2PDPrqzgRM65XC3mBasFjbUL6UnYk40AEq22M
+ZTIAwIXjvO5G8w4Xgj8goN96wX57P00LYNJBDTyflUAvM8U5C7C2BposgBy1shsM
+wHKiitmjrlUpFM2ImCoIiKCHfaxUfxgnn8/sERll8Nq9k82UOSNGLtIWIZskpVBc
+LRC8pKpB/SqAppsCjw0whSivB81DiaFZkbOlABEBAAG0JEx1aXMgQmVybmFyZG8g
+PGxiZXJuYXJkb0BhcGFjaGUub3JnPokBPgQTAQIAKAUCUJBVAgIbAwUJCWYBgAYL
+CQgHAwIGFQgCCQoLBBYCAwECHgECF4AACgkQggNpidVrXxfjAQgAgqyUd8dWzyp6
+v0x+ae2JuevL2YyePbQONxcxnttGz6COYmTmcR7P4UBrbo2IIfd1MwgKYMlQjhjy
+GdBYReroBh43p9x1q5/XqCNpEYrOPPw8kefs1DuMVN+/3VeyWGjHBOxGmG/lBmrb
+uo+UlIsFHJyS1SCi3s8Wz4Xqh+2/TCpiWEnBjoxv/h01nGb3uH8uCD52wMwDdmap
+ITT4vwbo5168iAcFNKJmMMZbMiSItPG4Xjnl09mkjsxGbzTKIaF5UYkCuKlbQyHY
+hWaWq21Nf3/z+5R0Ck8sGqAvJtMncQgkeFFRCVIPQDve+80AJNvaE2bdo1mliPJU
+Nr/6gKS+erkBDQRQkFUCAQgA1aUuCpYBJtnUgyW/spjxV1iff20XNlu+cko2rhu/
+GgV91l0LE7x7lKvQrOi8ZJ24F8bPUGwUyQFr7IVQZfBrLt+coFc2BvousU+7hHCq
+oAGoxQmJQnIySV//sOaYqLOhj/Bzi39K8wiuR6xSpWfv9dWf8i5UAXVzQNixzn1Z
+lNrQlbko7zHF//iAiz/jhkdir8Sl5/Kc9VY5JuR9HPugnYTutmh1kX88ywjhB01K
+gJhaeH2Fx2T1xWctC3/aw8voe8SK+BZJCwRkWTzcixxgsB4ypfm16uD8tHsPHJf5
+33KPVDlMqm9bELo4ZiiqGgYbBllKmvkntcDN6bCvBFxh+wARAQABiQElBBgBAgAP
+BQJQkFUCAhsMBQkJZgGAAAoJEIIDaYnVa18XwYEIALNzDt09MMDBJqM+GxrygYte
++E+C++hMW4i/txaTcSwyWyy8jaukPlPvPkrulEAQk4cvSMS4Ei88+9LmxPNWR+ZH
+2R2SfmK6IeRW+EJ7XPrHDhl/2aYXtT+CxjMaT7Bccx8ttv08286U+AWveSOmUW7k
+P61lZzW4xesosbmKp0s08cUkXhz9Zv/bIDnxTZgVGmNmwS4wiP1kFztXTt7bGUva
+wwvdUvINMp/lF1ZVPM6KCncfyokQG/9G7bV122RCPKMcBOljNM+q6KZVA1Zx9dSt
+c1NM5vOYQhGd4wRYE2+xqjAC1VJz0fdLUBkv2qqBYVyXAAXMUpDdgrJsutms5pY=
+=C/Js
+-----END PGP PUBLIC KEY BLOCK-----
Modified: xmlgraphics/batik/branches/batik-1_8/build.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/batik-1_8/build.xml?rev=1665427&r1=1665426&r2=1665427&view=diff
==============================================================================
--- xmlgraphics/batik/branches/batik-1_8/build.xml (original)
+++ xmlgraphics/batik/branches/batik-1_8/build.xml Tue Mar 10 09:58:29 2015
@@ -362,8 +362,8 @@ To display the available targets type:
<delete dir="${build}/docs/javadoc"/>
</target>
- <target name="bin-zip" depends="init, jars, htmldoc, bundle-script">
- <zip zipfile="${project}-${completeVersion}.zip">
+ <target name="bin-zip" depends="init, jars, bundle-script">
+ <zip zipfile="${project}-bin-${completeVersion}.zip">
<zipfileset dir="." prefix="${project}-${completeVersion}">
<include name="LICENSE"/>
<include name="NOTICE"/>
@@ -429,8 +429,8 @@ To display the available targets type:
<delete dir="${build}/docs/javadoc"/>
</target>
- <target name="bin-tgz" depends="init, jars, htmldoc, bundle-script">
- <tar tarfile="${project}-${completeVersion}.tar.gz" compression="gzip">
+ <target name="bin-tgz" depends="init, jars, bundle-script">
+ <tar tarfile="${project}-bin-${completeVersion}.tar.gz" compression="gzip">
<tarfileset dir="." prefix="${project}-${completeVersion}">
<include name="LICENSE"/>
<include name="NOTICE"/>
@@ -2160,9 +2160,9 @@ JAVA=/usr/bin/java
</target>
<!-- Documentation ...................................................... -->
- <target name="html" depends="javadoc, htmldoc"
+ <target name="html" depends="javadoc"
description="Generates the HTML documentation, including javadocs, in ${build}/docs/"/>
- <target name="htmldoc" depends="init, forrest"
+ <target name="htmldoc" depends="init"
description="Generates HTML documentation">
<mkdir dir="${docs}"/>
<copy todir="${docs}">
@@ -2171,7 +2171,7 @@ JAVA=/usr/bin/java
</target>
<target name="site" depends="site-javadoc, sitedoc"/>
- <target name="sitedoc" depends="init, forrest"
+ <target name="sitedoc" depends="init"
description="Generates the http://xmlgraphics.apache.org/batik/ site">
<mkdir dir="${site}"/>
<copy todir="${site}">
@@ -2340,10 +2340,10 @@ JAVA=/usr/bin/java
depends="init, clean-compile, clean-docs, clean-test"
description="Cleans everything">
<delete dir="${build}"/>
- <delete file="${project}-${completeVersion}.zip"/>
+ <delete file="${project}-bin-${completeVersion}.zip"/>
<delete file="${project}-docs-${completeVersion}.zip"/>
<delete file="${project}-src-${completeVersion}.zip"/>
- <delete file="${project}-${completeVersion}.tar.gz"/>
+ <delete file="${project}-bin-${completeVersion}.tar.gz"/>
<delete file="${project}-docs-${completeVersion}.tar.gz"/>
<delete file="${project}-src-${completeVersion}.tar.gz"/>
</target>