This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository jcharts.
commit f3f41691e6af73a484df5414178c4582576956e8
Author: Emmanuel Bourg <ebo...@apache.org>
Date: Fri Nov 17 15:53:02 2017 +0100
Wrap and sort
---
debian/control | 12 ++++++++++--
debian/copyright | 34 +++++++++++++++++-----------------
2 files changed, 27 insertions(+), 19 deletions(-)
diff --git a/debian/control b/debian/control
index 3b7e53b..eaf988f 100644
--- a/debian/control
+++ b/debian/control
@@ -3,8 +3,16 @@ Section: java
Priority: optional
Maintainer: Debian Java Maintainers
<pkg-java-maintainers@lists.alioth.debian.org>
Uploaders: Onkar Shinde <onkarshi...@ubuntu.com>
-Build-Depends: debhelper (>= 10), cdbs, ant, ant-optional
-Build-Depends-Indep: default-jdk, default-jdk-doc, libbatik-java,
libservlet3.1-java, libservlet3.1-java-doc
+Build-Depends:
+ ant,
+ ant-optional,
+ cdbs,
+ debhelper (>= 10),
+ default-jdk,
+ default-jdk-doc,
+ libbatik-java,
+ libservlet3.1-java,
+ libservlet3.1-java-doc
Standards-Version: 4.1.1
Vcs-Git: https://anonscm.debian.org/git/pkg-java/jcharts.git
Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/jcharts.git
diff --git a/debian/copyright b/debian/copyright
index 7577f56..fb91ab2 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -6,42 +6,42 @@ Source: http://jcharts.sourceforge.net
Files: *
Copyright: 2002, Nathaniel G. Auvil <nathaniel_au...@users.sourceforge.net>
License: jCharts-License
- Redistribution and use of this software and associated documentation
- ("Software"), with or without modification, are permitted provided that the
+ Redistribution and use of this software and associated documentation
+ ("Software"), with or without modification, are permitted provided that the
following conditions are met:
.
1. Redistributions of source code must retain copyright statements and
notices.
Redistributions must also contain a copy of this document.
.
2. Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation
+ this list of conditions and the following disclaimer in the documentation
and/or other materials provided with the distribution.
.
- 3. The name "jCharts" or "Nathaniel G. Auvil" must not be used to endorse or
- promote products derived from this Software without prior written permission
+ 3. The name "jCharts" or "Nathaniel G. Auvil" must not be used to endorse or
+ promote products derived from this Software without prior written permission
of Nathaniel G. Auvil.
For written permission, please contact nathaniel_au...@users.sourceforge.net
.
- 4. Products derived from this Software may not be called "jCharts" nor may
+ 4. Products derived from this Software may not be called "jCharts" nor may
"jCharts" appear in their names without prior written permission of Nathaniel
G. Auvil. jCharts is a registered trademark of Nathaniel G. Auvil.
.
5. Due credit should be given to the jCharts Project
(http://jcharts.krysalis.org).
.
- THIS SOFTWARE IS PROVIDED BY Nathaniel G. Auvil AND CONTRIBUTORS ``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 jCharts 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
+ THIS SOFTWARE IS PROVIDED BY Nathaniel G. Auvil AND CONTRIBUTORS ``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 jCharts 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
-
+
Files: debian/*
Copyright: 2009, Onkar Shinde <onkarshi...@ubuntu.com>
-License: GPL-3+
+License: GPL-3+
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-java/jcharts.git
_______________________________________________
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
