[SCM] SVGSalamander: SVG Library for Java branch, master, updated. 6a947d107de5241d1ae24e7e48a9ff05748564ca
Nicolas Dandrimont
dandrimont-guest at alioth.debian.org
Tue May 10 18:28:38 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 6a947d107de5241d1ae24e7e48a9ff05748564ca (commit)
via 611161b4cb4b1f5a2669aa2e0f1bb150e7e4ef63 (commit)
via e3244aef61f04b674fb27c9cc70b777766438a5b (commit)
via 3df306590da99434e1e88627c4da4686560bebf6 (commit)
via d7409786c093ea46a63140b472d88fe2df8219a6 (commit)
from 680352d1fc3a384af2b3e5348e0df3a423ecad0c (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 6a947d107de5241d1ae24e7e48a9ff05748564ca
Author: Nicolas Dandrimont <Nicolas.Dandrimont at crans.org>
Date: Tue May 10 00:04:09 2011 +0200
Bump Standards-Version to 3.9.2
commit 611161b4cb4b1f5a2669aa2e0f1bb150e7e4ef63
Author: Nicolas Dandrimont <Nicolas.Dandrimont at crans.org>
Date: Tue May 10 00:00:04 2011 +0200
Allow easy backports depending on a recent enough javahelper
commit e3244aef61f04b674fb27c9cc70b777766438a5b
Author: Nicolas Dandrimont <Nicolas.Dandrimont at crans.org>
Date: Mon May 9 23:59:49 2011 +0200
Unpatch after building
commit 3df306590da99434e1e88627c4da4686560bebf6
Author: Nicolas Dandrimont <Nicolas.Dandrimont at crans.org>
Date: Mon May 9 23:59:06 2011 +0200
Create the svg-core/src/gen/java directory before building
commit d7409786c093ea46a63140b472d88fe2df8219a6
Author: Nicolas Dandrimont <Nicolas.Dandrimont at crans.org>
Date: Mon May 9 23:58:44 2011 +0200
Update debian/copyright to get rid of batik
-----------------------------------------------------------------------
Summary of changes:
debian/control | 4 +-
debian/copyright | 61 -------------------------------------------
debian/rules | 6 +++-
debian/source/local-options | 1 +
4 files changed, 7 insertions(+), 65 deletions(-)
diff --git a/debian/control b/debian/control
index 5bcf269..c08c67e 100644
--- a/debian/control
+++ b/debian/control
@@ -2,9 +2,9 @@ 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, maven-repo-helper
+Build-Depends: debhelper (>= 7.0.50~), javahelper (>= 0.32~), maven-repo-helper
Build-Depends-Indep: default-jdk, default-jdk-doc, ant, ant-optional, ant-doc, javacc
-Standards-Version: 3.9.1
+Standards-Version: 3.9.2
Section: java
Homepage: http://svgsalamander.java.net/
Vcs-Git: git://git.debian.org/pkg-java/svgsalamander.git
diff --git a/debian/copyright b/debian/copyright
index e3d1f56..8d67d0d 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -6,10 +6,6 @@ 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
@@ -60,60 +56,3 @@ License: BSD
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.
-
-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/rules b/debian/rules
index c7a4014..ba36eec 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,11 +17,13 @@ TARBALL = $(PACKAGE)_$(SRC_VERSION).orig.tar.gz
dh $@ --with javahelper,maven-repo-helper
override_dh_auto_build:
- -mkdir $(CURDIR)/svg-core/src/gen/res
+ -mkdir -p $(CURDIR)/svg-core/src/gen/res
+ -mkdir -p $(CURDIR)/svg-core/src/gen/java
cd $(CURDIR)/svg-core && $(ANT) jar && $(ANT) javadoc
override_dh_clean:
- -mkdir $(CURDIR)/svg-core/src/gen/res
+ -mkdir -p $(CURDIR)/svg-core/src/gen/res
+ -mkdir -p $(CURDIR)/svg-core/src/gen/java
cd $(CURDIR)/svg-core && $(ANT) clean
-rm www/binaries/*.jar
dh_clean
diff --git a/debian/source/local-options b/debian/source/local-options
new file mode 100644
index 0000000..4aceb10
--- /dev/null
+++ b/debian/source/local-options
@@ -0,0 +1 @@
+unapply-patches
hooks/post-receive
--
SVGSalamander: SVG Library for Java
More information about the pkg-java-commits
mailing list