[SCM] SVGSalamander: SVG Library for Java branch, master, updated. 2052e6ba6c9901c2f16ee74a8f8ce14237424df7

Nicolas Dandrimont dandrimont-guest at alioth.debian.org
Sun Mar 6 13:54:13 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  2052e6ba6c9901c2f16ee74a8f8ce14237424df7 (commit)
       via  5a478467c4d6a05de578673e491c335f0d6e209e (commit)
       via  20cf3b359567f4164a438106849ff89e1170dcf5 (commit)
       via  d580813f9ffd3f595821f8614d00922bf8a9d819 (commit)
       via  825f284a40a702fb8e09dfd9051784b5b65ba259 (commit)
       via  6a4531989b656b47c4983074f0971c6cc3003621 (commit)
      from  f47e1187a469fd3ca347ead22c2d14517285b2a5 (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 2052e6ba6c9901c2f16ee74a8f8ce14237424df7
Author: Nicolas Dandrimont <Nicolas.Dandrimont at crans.org>
Date:   Sun Mar 6 11:44:34 2011 +0100

    Update copyright file with infos for the batik files

commit 5a478467c4d6a05de578673e491c335f0d6e209e
Author: Nicolas Dandrimont <Nicolas.Dandrimont at crans.org>
Date:   Sun Mar 6 11:30:57 2011 +0100

    Remove empty debian/docs file

commit 20cf3b359567f4164a438106849ff89e1170dcf5
Author: Nicolas Dandrimont <Nicolas.Dandrimont at crans.org>
Date:   Sun Mar 6 11:30:25 2011 +0100

    Split the javadoc in a -doc package

commit d580813f9ffd3f595821f8614d00922bf8a9d819
Author: Nicolas Dandrimont <Nicolas.Dandrimont at crans.org>
Date:   Sun Mar 6 11:37:38 2011 +0100

    Add patch for javadoc linking

commit 825f284a40a702fb8e09dfd9051784b5b65ba259
Author: Nicolas Dandrimont <Nicolas.Dandrimont at crans.org>
Date:   Sun Mar 6 11:26:07 2011 +0100

    Set debian/control up for team-maintainance

commit 6a4531989b656b47c4983074f0971c6cc3003621
Author: Nicolas Dandrimont <Nicolas.Dandrimont at crans.org>
Date:   Sun Mar 6 11:12:07 2011 +0100

    Add patch to disable automated jar signing

-----------------------------------------------------------------------

Summary of changes:
 debian/control                                     |   24 +++++++-
 debian/copyright                                   |   63 +++++++++++++++++++-
 ...a.javadoc => libsvgsalamander-java-doc.javadoc} |    0
 ...002-Disable-useless-automated-jar-signing.patch |   34 +++++++++++
 ...doc-target-to-add-links-to-system-API-doc.patch |   22 +++++++
 debian/patches/series                              |    2 +
 6 files changed, 141 insertions(+), 4 deletions(-)

diff --git a/debian/control b/debian/control
index 30723ca..21b028b 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,9 @@
 Source: svgsalamander
 Priority: extra
-Maintainer: Nicolas Dandrimont <nicolas.dandrimont at crans.org>
-Build-Depends: debhelper (>= 7.0.50~), javahelper, default-jdk, ant, ant-optional, javacc
+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-Indep: default-jdk, default-jdk-doc, ant, ant-optional, ant-doc, javacc
 Standards-Version: 3.9.1
 Section: java
 Homepage: http://svgsalamander.java.net/
@@ -9,9 +11,9 @@ Vcs-Git: git://git.debian.org/pkg-java/svgsalamander.git
 Vcs-Browser: http://git.debian.org/?p=pkg-java/svgsalamander.git;a=summary
 
 Package: libsvgsalamander-java
-Section: java
 Architecture: all
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${java:Depends}
+Recommends: ${java:Recommends}
 Description: SVG engine for Java
  SVG Salamander is an SVG engine for Java that's designed to be small,
  fast, and allow programmers to use it with a minimum of fuss.
@@ -20,3 +22,19 @@ Description: SVG engine for Java
  Java games and making it much easier for artists to design 2D game
  content - from rich interactive menus to charts and graphcs to
  complex animations.
+
+Package: libsvgsalamander-java-doc
+Architecture: all
+Section: doc
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${java:Depends}
+Recommends: ${java:Recommends}
+Description: SVG engine for Java (documentation)
+ SVG Salamander is an SVG engine for Java that's designed to be small,
+ fast, and allow programmers to use it with a minimum of fuss.
+ .
+ It's in particular targeted for making it easy to integrate SVG into
+ Java games and making it much easier for artists to design 2D game
+ content - from rich interactive menus to charts and graphcs to
+ complex animations.
+ .
+ This package includes the javadoc API documentation for svgsalamander.
diff --git a/debian/copyright b/debian/copyright
index d0a7298..e3d1f56 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -6,6 +6,10 @@ Files: *
 Copyright: 2010, Mark McKay <mark at kitfox.com>
 License: LGPL-2.0 or BSD
 
+Files: svg-core/src/main/java/com/kitfox/svg/batik/*
+Copyright: The Apache Software Foundation
+License: ASL-1.1
+
 Files: debian/*
 Copyright: 2011 Nicolas Dandrimont <nicolas.dandrimont at crans.org>
 License: BSD
@@ -55,4 +59,61 @@ License: BSD
  AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY
  WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- POSSIBILITY OF SUCH DAMAGE.
\ No newline at end of file
+ POSSIBILITY OF SUCH DAMAGE.
+
+License: ASL-1.1
+ The Apache Software License, Version 1.1
+ .
+ Copyright (c) 2000 The Apache Software Foundation.  All rights
+ reserved.
+ .
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+ .
+ 1. Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+ .
+ 2. Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in
+    the documentation and/or other materials provided with the
+    distribution.
+ .
+ 3. The end-user documentation included with the redistribution,
+    if any, must include the following acknowledgment:
+       "This product includes software developed by the
+        Apache Software Foundation (http://www.apache.org/)."
+    Alternately, this acknowledgment may appear in the software itself,
+    if and wherever such third-party acknowledgments normally appear.
+ .
+ 4. The names "Apache" and "Apache Software Foundation" must
+    not be used to endorse or promote products derived from this
+    software without prior written permission. For written
+    permission, please contact apache at apache.org.
+ .
+ 5. Products derived from this software may not be called "Apache",
+    nor may "Apache" appear in their name, without prior written
+    permission of the Apache Software Foundation.
+ .
+ THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
+ ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ SUCH DAMAGE.
+ ====================================================================
+ .
+ This software consists of voluntary contributions made by many
+ individuals on behalf of the Apache Software Foundation.  For more
+ information on the Apache Software Foundation, please see
+ <http://www.apache.org/>.
+ .
+ Portions of this software are based upon public domain software
+ originally written at the National Center for Supercomputing Applications,
+ University of Illinois, Urbana-Champaign.
diff --git a/debian/docs b/debian/docs
deleted file mode 100644
index e69de29..0000000
diff --git a/debian/libsvgsalamander-java.javadoc b/debian/libsvgsalamander-java-doc.javadoc
similarity index 100%
rename from debian/libsvgsalamander-java.javadoc
rename to debian/libsvgsalamander-java-doc.javadoc
diff --git a/debian/patches/0002-Disable-useless-automated-jar-signing.patch b/debian/patches/0002-Disable-useless-automated-jar-signing.patch
new file mode 100644
index 0000000..6d4fb7b
--- /dev/null
+++ b/debian/patches/0002-Disable-useless-automated-jar-signing.patch
@@ -0,0 +1,34 @@
+From: Nicolas Dandrimont <Nicolas.Dandrimont at crans.org>
+Date: Sun, 6 Mar 2011 11:10:29 +0100
+Subject: Disable useless automated jar signing.
+
+---
+ svg-core/build.xml |   14 --------------
+ 1 files changed, 0 insertions(+), 14 deletions(-)
+
+diff --git a/svg-core/build.xml b/svg-core/build.xml
+index 74e3fed..05d3dc6 100755
+--- a/svg-core/build.xml
++++ b/svg-core/build.xml
+@@ -109,20 +109,6 @@
+             </fileset>
+         </jar>
+         
+-        <delete file="${key.location}"/>
+-        <genkey alias="${key.user}" storepass="${key.password}" keystore="${key.location}" validity="1000" verbose="true">
+-            <dname>
+-                <param name="CN" value="Mark McKay, mark at kitfox.com"/>
+-                <param name="OU" value="kitfox.com"/>
+-                <param name="O"  value="kitfox"/>
+-                <param name="L"  value="Toronto"/>
+-                <param name="S"  value="Ontario"/>
+-                <param name="C"  value="CA"/>
+-            </dname>
+-        </genkey>
+-        
+-        <signjar jar="${dist.jar}" alias="${key.user}" storepass="${key.password}" keystore="${key.location}"/>
+-        
+         <copy file="${dist.jar}" toFile="${project.www.jar}"/>
+ 
+         <delete file="${project.tiny.jar}"/>
+-- 
diff --git a/debian/patches/0003-Modify-javadoc-target-to-add-links-to-system-API-doc.patch b/debian/patches/0003-Modify-javadoc-target-to-add-links-to-system-API-doc.patch
new file mode 100644
index 0000000..54a6e70
--- /dev/null
+++ b/debian/patches/0003-Modify-javadoc-target-to-add-links-to-system-API-doc.patch
@@ -0,0 +1,22 @@
+From: Nicolas Dandrimont <Nicolas.Dandrimont at crans.org>
+Date: Sun, 6 Mar 2011 11:36:54 +0100
+Subject: Modify javadoc target to add links to system API docs
+
+---
+ svg-core/nbproject/build-impl.xml |    2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+diff --git a/svg-core/nbproject/build-impl.xml b/svg-core/nbproject/build-impl.xml
+index 3a71c95..56d5331 100755
+--- a/svg-core/nbproject/build-impl.xml
++++ b/svg-core/nbproject/build-impl.xml
+@@ -756,6 +756,8 @@ is divided into following sections:
+             <fileset dir="${build.generated.sources.dir}" erroronmissingdir="false">
+                 <include name="**/*.java"/>
+             </fileset>
++            <link href="/usr/share/doc/default-jdk-doc/api" />
++            <link href="/usr/share/doc/ant/api" />
+         </javadoc>
+         <copy todir="${dist.javadoc.dir}">
+             <fileset dir="${src.www.dir}" excludes="${excludes}" includes="${includes}">
+-- 
diff --git a/debian/patches/series b/debian/patches/series
index 944691a..acfc071 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,3 @@
 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


hooks/post-receive
-- 
SVGSalamander: SVG Library for Java



More information about the pkg-java-commits mailing list